diff --git a/API.md b/API.md
index 9623b7aa89..fba53177b4 100644
--- a/API.md
+++ b/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
 
diff --git a/data/intro_rapid_graph.json b/data/intro_rapid_graph.json
index 7afb19c90d..ab2214cb9b 100644
--- a/data/intro_rapid_graph.json
+++ b/data/intro_rapid_graph.json
@@ -2,7 +2,7 @@
     "n-2852": {
       "__fbid__": "-2852",
       "__origid__": "-2852",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-2852",
       "loc": [-85.6297512, 41.9561476]
@@ -10,7 +10,7 @@
     "n-2805": {
       "__fbid__": "-2805",
       "__origid__": "-2805",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-2805",
       "loc": [-85.6282000, 41.9561500]
@@ -18,7 +18,7 @@
     "n-5150": {
       "__fbid__": "-5150",
       "__origid__": "-5150",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-5150",
       "loc": [-85.6281089, 41.9561288]
@@ -26,7 +26,7 @@
     "n-5151": {
       "__fbid__": "-5151",
       "__origid__": "-5151",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-5151",
       "loc": [-85.6278017, 41.9560522]
@@ -34,7 +34,7 @@
     "n-5152": {
       "__fbid__": "-5152",
       "__origid__": "-5152",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-5152",
       "loc": [-85.6272470, 41.9558580]
@@ -42,7 +42,7 @@
     "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"
       }
     }
-}
+}
\ No newline at end of file
diff --git a/dist/index.html b/dist/index.html
index 8d7be73ef5..167f532962 100644
--- a/dist/index.html
+++ b/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();
         }
       }
diff --git a/docs/statistics.html b/docs/statistics.html
index aeaee6f92a..25ef4b699f 100644
--- a/docs/statistics.html
+++ b/docs/statistics.html
@@ -21,7 +21,7 @@
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"dist/rapid.js.map","children":[]},{"name":"dist/rapid.js","children":[{"name":"node_modules","children":[{"name":"aes-js/index.js","uid":"4e31-1"},{"name":"diacritics/index.js","uid":"4e31-3"},{"name":"eventemitter3/index.js","uid":"4e31-5"},{"name":"earcut/src/earcut.js","uid":"4e31-7"},{"name":"url","children":[{"name":"node_modules","children":[{"name":"punycode/punycode.js","uid":"4e31-9"},{"name":"querystring","children":[{"uid":"4e31-13","name":"decode.js"},{"uid":"4e31-15","name":"encode.js"},{"uid":"4e31-17","name":"index.js"}]}]},{"uid":"4e31-11","name":"util.js"},{"uid":"4e31-19","name":"url.js"}]},{"name":"which-polygon","children":[{"name":"node_modules","children":[{"name":"quickselect/quickselect.js","uid":"4e31-21"},{"name":"rbush/index.js","uid":"4e31-23"}]},{"uid":"4e31-27","name":"index.js"}]},{"name":"lineclip/index.js","uid":"4e31-25"},{"name":"wgs84/index.js","uid":"4e31-29"},{"name":"@mapbox","children":[{"name":"geojson-area/index.js","uid":"4e31-31"},{"name":"polylabel/polylabel.js","uid":"4e31-59"},{"name":"geojson-rewind/index.js","uid":"4e31-61"},{"name":"sexagesimal/index.js","uid":"4e31-65"},{"name":"point-geometry/index.js","uid":"4e31-67"},{"name":"vector-tile","children":[{"name":"lib","children":[{"uid":"4e31-69","name":"vectortilefeature.js"},{"uid":"4e31-71","name":"vectortilelayer.js"},{"uid":"4e31-73","name":"vectortile.js"}]},{"uid":"4e31-75","name":"index.js"}]}]},{"name":"circle-to-polygon","children":[{"name":"input-validation","children":[{"uid":"4e31-33","name":"validateCenter.js"},{"uid":"4e31-35","name":"validateRadius.js"},{"uid":"4e31-37","name":"validateNumberOfEdges.js"},{"uid":"4e31-39","name":"validateEarthRadius.js"},{"uid":"4e31-41","name":"validateBearing.js"},{"uid":"4e31-43","name":"index.js"}]},{"uid":"4e31-45","name":"index.js"}]},{"name":"polygon-clipping/dist/polygon-clipping.umd.js","uid":"4e31-47"},{"name":"geojson-precision/index.js","uid":"4e31-49"},{"name":"@aitodotai/json-stringify-pretty-compact/index.js","uid":"4e31-51"},{"name":"fast-deep-equal/index.js","uid":"4e31-53"},{"name":"rbush/rbush.min.js","uid":"4e31-55"},{"name":"tinyqueue/index.js","uid":"4e31-57"},{"name":"fast-json-stable-stringify/index.js","uid":"4e31-63"},{"name":"ieee754/index.js","uid":"4e31-77"},{"name":"pbf/index.js","uid":"4e31-79"},{"name":"store","children":[{"name":"src","children":[{"uid":"4e31-81","name":"util.js"},{"uid":"4e31-83","name":"store-engine.js"}]},{"name":"storages","children":[{"uid":"4e31-85","name":"localStorage.js"},{"uid":"4e31-87","name":"oldFF-globalStorage.js"},{"uid":"4e31-89","name":"oldIE-userDataStorage.js"},{"uid":"4e31-91","name":"cookieStorage.js"},{"uid":"4e31-93","name":"sessionStorage.js"},{"uid":"4e31-95","name":"memoryStorage.js"},{"uid":"4e31-97","name":"all.js"}]},{"name":"plugins","children":[{"name":"lib/json2.js","uid":"4e31-99"},{"uid":"4e31-101","name":"json2.js"}]},{"name":"dist/store.legacy.js","uid":"4e31-103"}]},{"name":"@rapid-sdk","children":[{"name":"util/built/util.mjs","uid":"4e31-111"},{"name":"math/built/math.mjs","uid":"4e31-407"}]},{"name":"d3-array/src","children":[{"uid":"4e31-117","name":"ascending.js"},{"uid":"4e31-119","name":"descending.js"},{"uid":"4e31-121","name":"number.js"},{"uid":"4e31-123","name":"index.js"},{"uid":"4e31-125","name":"fsum.js"},{"uid":"4e31-127","name":"sort.js"},{"uid":"4e31-129","name":"max.js"},{"uid":"4e31-131","name":"min.js"},{"uid":"4e31-133","name":"quickselect.js"},{"uid":"4e31-135","name":"quantile.js"},{"uid":"4e31-137","name":"median.js"}]},{"name":"d3-geo/src","children":[{"uid":"4e31-139","name":"math.js"},{"uid":"4e31-141","name":"noop.js"},{"uid":"4e31-143","name":"stream.js"},{"uid":"4e31-145","name":"area.js"},{"uid":"4e31-147","name":"index.js"},{"uid":"4e31-149","name":"cartesian.js"},{"uid":"4e31-151","name":"bounds.js"},{"uid":"4e31-153","name":"centroid.js"},{"uid":"4e31-155","name":"length.js"},{"uid":"4e31-157","name":"transform.js"},{"name":"projection/mercator.js","uid":"4e31-159"}]},{"name":"d3-polygon/src","children":[{"uid":"4e31-161","name":"area.js"},{"uid":"4e31-163","name":"index.js"},{"uid":"4e31-165","name":"centroid.js"},{"uid":"4e31-167","name":"cross.js"},{"uid":"4e31-169","name":"hull.js"}]},{"name":"d3-dispatch/src","children":[{"uid":"4e31-171","name":"dispatch.js"},{"uid":"4e31-173","name":"index.js"}]},{"name":"d3-selection/src","children":[{"uid":"4e31-175","name":"namespaces.js"},{"uid":"4e31-177","name":"namespace.js"},{"uid":"4e31-179","name":"creator.js"},{"uid":"4e31-181","name":"selector.js"},{"name":"selection","children":[{"uid":"4e31-183","name":"select.js"},{"uid":"4e31-189","name":"selectAll.js"},{"uid":"4e31-193","name":"selectChild.js"},{"uid":"4e31-195","name":"selectChildren.js"},{"uid":"4e31-197","name":"filter.js"},{"uid":"4e31-199","name":"sparse.js"},{"uid":"4e31-201","name":"enter.js"},{"uid":"4e31-205","name":"data.js"},{"uid":"4e31-207","name":"exit.js"},{"uid":"4e31-209","name":"join.js"},{"uid":"4e31-211","name":"merge.js"},{"uid":"4e31-213","name":"order.js"},{"uid":"4e31-215","name":"sort.js"},{"uid":"4e31-217","name":"call.js"},{"uid":"4e31-219","name":"nodes.js"},{"uid":"4e31-221","name":"node.js"},{"uid":"4e31-223","name":"size.js"},{"uid":"4e31-225","name":"empty.js"},{"uid":"4e31-227","name":"each.js"},{"uid":"4e31-229","name":"attr.js"},{"uid":"4e31-233","name":"style.js"},{"uid":"4e31-235","name":"property.js"},{"uid":"4e31-237","name":"classed.js"},{"uid":"4e31-239","name":"text.js"},{"uid":"4e31-241","name":"html.js"},{"uid":"4e31-243","name":"raise.js"},{"uid":"4e31-245","name":"lower.js"},{"uid":"4e31-247","name":"append.js"},{"uid":"4e31-249","name":"insert.js"},{"uid":"4e31-251","name":"remove.js"},{"uid":"4e31-253","name":"clone.js"},{"uid":"4e31-255","name":"datum.js"},{"uid":"4e31-257","name":"on.js"},{"uid":"4e31-259","name":"dispatch.js"},{"uid":"4e31-261","name":"iterator.js"},{"uid":"4e31-263","name":"index.js"}]},{"uid":"4e31-185","name":"array.js"},{"uid":"4e31-187","name":"selectorAll.js"},{"uid":"4e31-191","name":"matcher.js"},{"uid":"4e31-203","name":"constant.js"},{"uid":"4e31-231","name":"window.js"},{"uid":"4e31-265","name":"select.js"},{"uid":"4e31-267","name":"index.js"},{"uid":"4e31-269","name":"sourceEvent.js"},{"uid":"4e31-271","name":"pointer.js"},{"uid":"4e31-273","name":"selectAll.js"}]},{"name":"d3-drag/src","children":[{"uid":"4e31-275","name":"noevent.js"},{"uid":"4e31-277","name":"nodrag.js"},{"uid":"4e31-279","name":"constant.js"},{"uid":"4e31-281","name":"event.js"},{"uid":"4e31-283","name":"drag.js"},{"uid":"4e31-285","name":"index.js"}]},{"name":"d3-color/src","children":[{"uid":"4e31-287","name":"define.js"},{"uid":"4e31-289","name":"color.js"},{"uid":"4e31-291","name":"index.js"}]},{"name":"d3-interpolate/src","children":[{"uid":"4e31-293","name":"basis.js"},{"uid":"4e31-295","name":"basisClosed.js"},{"uid":"4e31-297","name":"constant.js"},{"uid":"4e31-299","name":"color.js"},{"uid":"4e31-301","name":"rgb.js"},{"uid":"4e31-303","name":"numberArray.js"},{"uid":"4e31-305","name":"array.js"},{"uid":"4e31-307","name":"date.js"},{"uid":"4e31-309","name":"number.js"},{"uid":"4e31-311","name":"object.js"},{"uid":"4e31-313","name":"string.js"},{"uid":"4e31-315","name":"value.js"},{"uid":"4e31-317","name":"index.js"},{"name":"transform","children":[{"uid":"4e31-319","name":"decompose.js"},{"uid":"4e31-321","name":"parse.js"},{"uid":"4e31-323","name":"index.js"}]},{"uid":"4e31-325","name":"zoom.js"}]},{"name":"d3-timer/src","children":[{"uid":"4e31-327","name":"timer.js"},{"uid":"4e31-329","name":"index.js"},{"uid":"4e31-331","name":"timeout.js"}]},{"name":"d3-transition/src","children":[{"name":"transition","children":[{"uid":"4e31-333","name":"schedule.js"},{"uid":"4e31-339","name":"tween.js"},{"uid":"4e31-341","name":"interpolate.js"},{"uid":"4e31-343","name":"attr.js"},{"uid":"4e31-345","name":"attrTween.js"},{"uid":"4e31-347","name":"delay.js"},{"uid":"4e31-349","name":"duration.js"},{"uid":"4e31-351","name":"ease.js"},{"uid":"4e31-353","name":"easeVarying.js"},{"uid":"4e31-355","name":"filter.js"},{"uid":"4e31-357","name":"merge.js"},{"uid":"4e31-359","name":"on.js"},{"uid":"4e31-361","name":"remove.js"},{"uid":"4e31-363","name":"select.js"},{"uid":"4e31-365","name":"selectAll.js"},{"uid":"4e31-367","name":"selection.js"},{"uid":"4e31-369","name":"style.js"},{"uid":"4e31-371","name":"styleTween.js"},{"uid":"4e31-373","name":"text.js"},{"uid":"4e31-375","name":"textTween.js"},{"uid":"4e31-377","name":"transition.js"},{"uid":"4e31-379","name":"end.js"},{"uid":"4e31-381","name":"index.js"}]},{"uid":"4e31-335","name":"interrupt.js"},{"name":"selection","children":[{"uid":"4e31-337","name":"interrupt.js"},{"uid":"4e31-389","name":"transition.js"},{"uid":"4e31-391","name":"index.js"}]},{"uid":"4e31-393","name":"index.js"}]},{"name":"d3-ease/src","children":[{"uid":"4e31-383","name":"linear.js"},{"uid":"4e31-385","name":"index.js"},{"uid":"4e31-387","name":"cubic.js"}]},{"name":"d3-zoom/src","children":[{"uid":"4e31-395","name":"constant.js"},{"uid":"4e31-397","name":"event.js"},{"uid":"4e31-399","name":"transform.js"},{"uid":"4e31-401","name":"noevent.js"},{"uid":"4e31-403","name":"zoom.js"},{"uid":"4e31-405","name":"index.js"}]},{"name":"@pixi","children":[{"name":"utils","children":[{"name":"lib","children":[{"uid":"4e31-421","name":"index.mjs"},{"uid":"4e31-435","name":"settings.mjs"},{"uid":"4e31-437","name":"url.mjs"},{"uid":"4e31-439","name":"path.mjs"},{"name":"logging/deprecation.mjs","uid":"4e31-441"},{"name":"browser","children":[{"uid":"4e31-443","name":"hello.mjs"},{"uid":"4e31-445","name":"isWebGLSupported.mjs"}]},{"name":"color","children":[{"uid":"4e31-455","name":"hex.mjs"},{"uid":"4e31-459","name":"premultiply.mjs"}]},{"uid":"4e31-461","name":"const.mjs"},{"name":"data","children":[{"uid":"4e31-463","name":"createIndicesForQuads.mjs"},{"uid":"4e31-465","name":"getBufferType.mjs"},{"uid":"4e31-467","name":"interleaveTypedArrays.mjs"},{"uid":"4e31-469","name":"pow2.mjs"},{"uid":"4e31-471","name":"removeItems.mjs"},{"uid":"4e31-473","name":"sign.mjs"},{"uid":"4e31-475","name":"uid.mjs"}]},{"name":"media","children":[{"uid":"4e31-477","name":"BoundingBox.mjs"},{"uid":"4e31-479","name":"caches.mjs"},{"uid":"4e31-481","name":"CanvasRenderTarget.mjs"},{"uid":"4e31-483","name":"getCanvasBoundingBox.mjs"},{"uid":"4e31-485","name":"trimCanvas.mjs"}]},{"name":"network","children":[{"uid":"4e31-487","name":"decomposeDataUri.mjs"},{"uid":"4e31-489","name":"determineCrossOrigin.mjs"},{"uid":"4e31-491","name":"getResolutionOfUrl.mjs"}]}]},{"name":"node_modules/@pixi/color/lib","children":[{"uid":"4e31-451","name":"Color.mjs"},{"uid":"4e31-453","name":"index.mjs"}]}]},{"name":"settings/lib","children":[{"uid":"4e31-423","name":"adapter.mjs"},{"uid":"4e31-425","name":"index.mjs"},{"uid":"4e31-427","name":"settings.mjs"},{"name":"utils/isMobile.mjs","uid":"4e31-433"}]},{"name":"constants/lib/index.mjs","uid":"4e31-457"},{"name":"core","children":[{"name":"node_modules/@pixi/color/lib","children":[{"uid":"4e31-835","name":"Color.mjs"},{"uid":"4e31-837","name":"index.mjs"}]},{"name":"lib","children":[{"name":"geometry","children":[{"uid":"4e31-841","name":"ViewableBuffer.mjs"},{"uid":"4e31-861","name":"Buffer.mjs"},{"uid":"4e31-863","name":"Attribute.mjs"},{"name":"utils/interleaveTypedArrays.mjs","uid":"4e31-865"},{"uid":"4e31-867","name":"Geometry.mjs"},{"uid":"4e31-989","name":"GeometrySystem.mjs"},{"uid":"4e31-1075","name":"GLBuffer.mjs"},{"uid":"4e31-1077","name":"BufferSystem.mjs"}]},{"name":"shader","children":[{"name":"utils","children":[{"uid":"4e31-843","name":"checkMaxIfStatementsInShader.mjs"},{"uid":"4e31-899","name":"index.mjs"},{"uid":"4e31-901","name":"compileShader.mjs"},{"uid":"4e31-903","name":"defaultValue.mjs"},{"uid":"4e31-905","name":"uniformParsers.mjs"},{"uid":"4e31-907","name":"generateUniformsSync.mjs"},{"uid":"4e31-909","name":"getTestContext.mjs"},{"uid":"4e31-911","name":"getMaxFragmentPrecision.mjs"},{"uid":"4e31-913","name":"logProgramError.mjs"},{"uid":"4e31-915","name":"mapSize.mjs"},{"uid":"4e31-917","name":"mapType.mjs"},{"uid":"4e31-919","name":"setPrecision.mjs"},{"uid":"4e31-921","name":"unsafeEvalSupported.mjs"},{"uid":"4e31-1019","name":"getAttributeData.mjs"},{"uid":"4e31-1021","name":"getUniformData.mjs"},{"uid":"4e31-1023","name":"generateProgram.mjs"},{"uid":"4e31-1025","name":"generateUniformBufferSync.mjs"}]},{"uid":"4e31-895","name":"defaultProgram.mjs"},{"uid":"4e31-897","name":"defaultProgram2.mjs"},{"uid":"4e31-923","name":"Program.mjs"},{"uid":"4e31-925","name":"UniformGroup.mjs"},{"uid":"4e31-927","name":"Shader.mjs"},{"uid":"4e31-1017","name":"GLProgram.mjs"},{"uid":"4e31-1027","name":"ShaderSystem.mjs"}]},{"name":"state","children":[{"uid":"4e31-845","name":"State.mjs"},{"name":"utils/mapWebGLBlendModesToPixi.mjs","uid":"4e31-1031"},{"uid":"4e31-1033","name":"StateSystem.mjs"}]},{"name":"textures","children":[{"name":"resources","children":[{"uid":"4e31-847","name":"autoDetectResource.mjs"},{"uid":"4e31-853","name":"Resource.mjs"},{"uid":"4e31-855","name":"BufferResource.mjs"},{"uid":"4e31-959","name":"DepthResource.mjs"},{"uid":"4e31-965","name":"BaseImageResource.mjs"},{"uid":"4e31-967","name":"ImageResource.mjs"},{"uid":"4e31-1083","name":"AbstractMultiResource.mjs"},{"uid":"4e31-1085","name":"ArrayResource.mjs"},{"uid":"4e31-1087","name":"index.mjs"},{"uid":"4e31-1089","name":"CanvasResource.mjs"},{"uid":"4e31-1091","name":"CubeResource.mjs"},{"uid":"4e31-1093","name":"ImageBitmapResource.mjs"},{"uid":"4e31-1095","name":"SVGResource.mjs"},{"uid":"4e31-1097","name":"VideoResource.mjs"}]},{"uid":"4e31-857","name":"BaseTexture.mjs"},{"uid":"4e31-969","name":"TextureUvs.mjs"},{"uid":"4e31-971","name":"Texture.mjs"},{"uid":"4e31-991","name":"TextureMatrix.mjs"},{"uid":"4e31-1037","name":"TextureGCSystem.mjs"},{"uid":"4e31-1039","name":"GLTexture.mjs"},{"name":"utils/mapTypeAndFormatToInternalFormat.mjs","uid":"4e31-1041"},{"uid":"4e31-1043","name":"TextureSystem.mjs"}]},{"name":"batch","children":[{"uid":"4e31-859","name":"BatchDrawCall.mjs"},{"uid":"4e31-869","name":"BatchGeometry.mjs"},{"uid":"4e31-929","name":"BatchShaderGenerator.mjs"},{"uid":"4e31-931","name":"BatchTextureArray.mjs"},{"uid":"4e31-933","name":"canUploadSameBuffer.mjs"},{"uid":"4e31-935","name":"maxRecommendedTextures.mjs"},{"uid":"4e31-937","name":"ObjectRenderer.mjs"},{"uid":"4e31-939","name":"texture.mjs"},{"uid":"4e31-941","name":"texture2.mjs"},{"uid":"4e31-943","name":"BatchRenderer.mjs"},{"uid":"4e31-955","name":"BatchSystem.mjs"}]},{"name":"filters","children":[{"uid":"4e31-945","name":"defaultFilter.mjs"},{"uid":"4e31-947","name":"defaultFilter2.mjs"},{"uid":"4e31-949","name":"Filter.mjs"},{"uid":"4e31-981","name":"FilterState.mjs"},{"uid":"4e31-983","name":"FilterSystem.mjs"},{"name":"spriteMask","children":[{"uid":"4e31-993","name":"spriteMaskFilter2.mjs"},{"uid":"4e31-995","name":"spriteMaskFilter3.mjs"},{"uid":"4e31-997","name":"SpriteMaskFilter.mjs"}]}]},{"name":"background/BackgroundSystem.mjs","uid":"4e31-951"},{"uid":"4e31-953","name":"systems.mjs"},{"name":"context/ContextSystem.mjs","uid":"4e31-957"},{"name":"framebuffer","children":[{"uid":"4e31-961","name":"Framebuffer.mjs"},{"uid":"4e31-985","name":"GLFramebuffer.mjs"},{"uid":"4e31-987","name":"FramebufferSystem.mjs"},{"uid":"4e31-1073","name":"MultisampleSystem.mjs"}]},{"name":"renderTexture","children":[{"uid":"4e31-963","name":"BaseRenderTexture.mjs"},{"uid":"4e31-973","name":"RenderTexture.mjs"},{"uid":"4e31-975","name":"RenderTexturePool.mjs"},{"uid":"4e31-1013","name":"GenerateTextureSystem.mjs"},{"uid":"4e31-1015","name":"RenderTextureSystem.mjs"}]},{"name":"utils","children":[{"uid":"4e31-977","name":"Quad.mjs"},{"uid":"4e31-979","name":"QuadUv.mjs"}]},{"name":"mask","children":[{"uid":"4e31-999","name":"MaskData.mjs"},{"uid":"4e31-1001","name":"MaskSystem.mjs"},{"uid":"4e31-1003","name":"AbstractMaskSystem.mjs"},{"uid":"4e31-1005","name":"ScissorSystem.mjs"},{"uid":"4e31-1007","name":"StencilSystem.mjs"}]},{"name":"plugin/PluginSystem.mjs","uid":"4e31-1009"},{"name":"projection/ProjectionSystem.mjs","uid":"4e31-1011"},{"name":"startup/StartupSystem.mjs","uid":"4e31-1029"},{"name":"system/SystemManager.mjs","uid":"4e31-1035"},{"name":"transformFeedback/TransformFeedbackSystem.mjs","uid":"4e31-1045"},{"name":"view/ViewSystem.mjs","uid":"4e31-1047"},{"uid":"4e31-1049","name":"settings.mjs"},{"uid":"4e31-1051","name":"index.mjs"},{"uid":"4e31-1065","name":"autoDetectRenderer.mjs"},{"name":"fragments","children":[{"uid":"4e31-1067","name":"default.mjs"},{"uid":"4e31-1069","name":"defaultFilter.mjs"},{"uid":"4e31-1071","name":"index.mjs"}]},{"name":"render/ObjectRendererSystem.mjs","uid":"4e31-1079"},{"uid":"4e31-1081","name":"Renderer.mjs"}]}]},{"name":"extensions/lib/index.mjs","uid":"4e31-839"},{"name":"runner/lib","children":[{"uid":"4e31-849","name":"Runner.mjs"},{"uid":"4e31-851","name":"index.mjs"}]},{"name":"math/lib","children":[{"uid":"4e31-871","name":"const.mjs"},{"uid":"4e31-873","name":"Point.mjs"},{"name":"shapes","children":[{"uid":"4e31-875","name":"Rectangle.mjs"},{"uid":"4e31-877","name":"Circle.mjs"},{"uid":"4e31-881","name":"Ellipse.mjs"},{"uid":"4e31-883","name":"Polygon.mjs"},{"uid":"4e31-885","name":"RoundedRectangle.mjs"}]},{"uid":"4e31-879","name":"index.mjs"},{"uid":"4e31-887","name":"Matrix.mjs"},{"uid":"4e31-889","name":"groupD8.mjs"},{"uid":"4e31-891","name":"ObservablePoint.mjs"},{"uid":"4e31-893","name":"Transform.mjs"}]},{"name":"ticker/lib","children":[{"uid":"4e31-1053","name":"settings.mjs"},{"uid":"4e31-1055","name":"const.mjs"},{"uid":"4e31-1057","name":"TickerListener.mjs"},{"uid":"4e31-1059","name":"Ticker.mjs"},{"uid":"4e31-1061","name":"index.mjs"},{"uid":"4e31-1063","name":"TickerPlugin.mjs"}]},{"name":"display/lib","children":[{"uid":"4e31-1099","name":"settings.mjs"},{"uid":"4e31-1101","name":"Bounds.mjs"},{"uid":"4e31-1103","name":"DisplayObject.mjs"},{"uid":"4e31-1105","name":"Container.mjs"},{"uid":"4e31-1107","name":"index.mjs"}]},{"name":"sprite/lib","children":[{"uid":"4e31-1109","name":"Sprite.mjs"},{"uid":"4e31-1111","name":"index.mjs"}]},{"name":"mixin-cache-as-bitmap/lib/index.mjs","uid":"4e31-1113"},{"name":"mixin-get-child-by-name/lib/index.mjs","uid":"4e31-1115"},{"name":"mixin-get-global-position/lib/index.mjs","uid":"4e31-1117"},{"name":"filter-alpha/lib","children":[{"uid":"4e31-1119","name":"alpha.mjs"},{"uid":"4e31-1121","name":"AlphaFilter.mjs"},{"uid":"4e31-1123","name":"index.mjs"}]},{"name":"filter-blur/lib","children":[{"uid":"4e31-1125","name":"generateBlurFragSource.mjs"},{"uid":"4e31-1127","name":"generateBlurVertSource.mjs"},{"uid":"4e31-1129","name":"BlurFilterPass.mjs"},{"uid":"4e31-1131","name":"BlurFilter.mjs"},{"uid":"4e31-1133","name":"index.mjs"}]},{"name":"filter-color-matrix/lib","children":[{"uid":"4e31-1135","name":"colorMatrix.mjs"},{"uid":"4e31-1137","name":"ColorMatrixFilter.mjs"},{"uid":"4e31-1139","name":"index.mjs"}]},{"name":"filter-displacement/lib","children":[{"uid":"4e31-1141","name":"displacement.mjs"},{"uid":"4e31-1143","name":"displacement2.mjs"},{"uid":"4e31-1145","name":"DisplacementFilter.mjs"},{"uid":"4e31-1147","name":"index.mjs"}]},{"name":"filter-fxaa/lib","children":[{"uid":"4e31-1149","name":"fxaa.mjs"},{"uid":"4e31-1151","name":"fxaa2.mjs"},{"uid":"4e31-1153","name":"FXAAFilter.mjs"},{"uid":"4e31-1155","name":"index.mjs"}]},{"name":"filter-noise/lib","children":[{"uid":"4e31-1157","name":"noise.mjs"},{"uid":"4e31-1159","name":"NoiseFilter.mjs"},{"uid":"4e31-1161","name":"index.mjs"}]},{"name":"events/lib","children":[{"uid":"4e31-1167","name":"EventTicker.mjs"},{"uid":"4e31-1169","name":"FederatedEvent.mjs"},{"uid":"4e31-1171","name":"FederatedMouseEvent.mjs"},{"uid":"4e31-1173","name":"FederatedPointerEvent.mjs"},{"uid":"4e31-1175","name":"FederatedWheelEvent.mjs"},{"uid":"4e31-1177","name":"EventBoundary.mjs"},{"uid":"4e31-1179","name":"index.mjs"},{"uid":"4e31-1181","name":"EventSystem.mjs"},{"uid":"4e31-1183","name":"FederatedEventTarget.mjs"}]},{"name":"accessibility/lib","children":[{"uid":"4e31-1185","name":"accessibleTarget.mjs"},{"uid":"4e31-1187","name":"AccessibilityManager.mjs"},{"uid":"4e31-1189","name":"index.mjs"}]},{"name":"app/lib","children":[{"uid":"4e31-1191","name":"Application.mjs"},{"uid":"4e31-1193","name":"index.mjs"},{"uid":"4e31-1195","name":"ResizePlugin.mjs"}]},{"name":"assets/lib","children":[{"uid":"4e31-1197","name":"AssetExtension.mjs"},{"uid":"4e31-1199","name":"BackgroundLoader.mjs"},{"name":"utils","children":[{"uid":"4e31-1201","name":"checkDataUrl.mjs"},{"uid":"4e31-1203","name":"index.mjs"},{"uid":"4e31-1205","name":"checkExtension.mjs"},{"uid":"4e31-1207","name":"convertToList.mjs"},{"uid":"4e31-1209","name":"copySearchParams.mjs"},{"uid":"4e31-1211","name":"createStringVariations.mjs"},{"uid":"4e31-1213","name":"isSingleItem.mjs"}]},{"name":"cache","children":[{"uid":"4e31-1215","name":"Cache.mjs"},{"uid":"4e31-1247","name":"index.mjs"},{"name":"parsers","children":[{"uid":"4e31-1249","name":"cacheTextureArray.mjs"},{"uid":"4e31-1251","name":"index.mjs"}]}]},{"name":"loader","children":[{"uid":"4e31-1217","name":"Loader.mjs"},{"name":"parsers","children":[{"uid":"4e31-1219","name":"LoaderParser.mjs"},{"uid":"4e31-1221","name":"index.mjs"},{"uid":"4e31-1223","name":"loadJson.mjs"},{"uid":"4e31-1225","name":"loadTxt.mjs"},{"uid":"4e31-1227","name":"loadWebFont.mjs"},{"uid":"4e31-1229","name":"WorkerManager.mjs"},{"name":"textures","children":[{"name":"utils","children":[{"uid":"4e31-1231","name":"createTexture.mjs"},{"uid":"4e31-1239","name":"index.mjs"}]},{"uid":"4e31-1233","name":"loadTextures.mjs"},{"uid":"4e31-1235","name":"loadSVG.mjs"},{"uid":"4e31-1237","name":"index.mjs"}]}]}]},{"name":"resolver","children":[{"uid":"4e31-1241","name":"Resolver.mjs"},{"name":"parsers","children":[{"uid":"4e31-1261","name":"resolveTextureUrl.mjs"},{"uid":"4e31-1263","name":"index.mjs"}]}]},{"uid":"4e31-1243","name":"Assets.mjs"},{"uid":"4e31-1245","name":"index.mjs"},{"name":"detections/parsers","children":[{"uid":"4e31-1253","name":"detectAvif.mjs"},{"uid":"4e31-1255","name":"index.mjs"},{"uid":"4e31-1257","name":"detectWebp.mjs"},{"uid":"4e31-1259","name":"detectDefaults.mjs"}]}]},{"name":"compressed-textures/lib","children":[{"uid":"4e31-1265","name":"const.mjs"},{"uid":"4e31-1267","name":"index.mjs"},{"name":"loaders","children":[{"uid":"4e31-1269","name":"detectCompressedTextures.mjs"},{"uid":"4e31-1271","name":"index.mjs"},{"uid":"4e31-1285","name":"loadDDS.mjs"},{"uid":"4e31-1287","name":"loadKTX.mjs"},{"uid":"4e31-1289","name":"resolveCompressedTextureUrl.mjs"}]},{"name":"resources","children":[{"uid":"4e31-1273","name":"BlobResource.mjs"},{"uid":"4e31-1275","name":"index.mjs"},{"uid":"4e31-1277","name":"CompressedTextureResource.mjs"}]},{"name":"parsers","children":[{"uid":"4e31-1279","name":"parseDDS.mjs"},{"uid":"4e31-1281","name":"index.mjs"},{"uid":"4e31-1283","name":"parseKTX.mjs"}]}]},{"name":"extract/lib","children":[{"uid":"4e31-1291","name":"Extract.mjs"},{"uid":"4e31-1293","name":"index.mjs"}]},{"name":"graphics/lib","children":[{"name":"utils","children":[{"uid":"4e31-1295","name":"buildCircle.mjs"},{"uid":"4e31-1297","name":"index.mjs"},{"uid":"4e31-1299","name":"buildPoly.mjs"},{"uid":"4e31-1301","name":"buildRectangle.mjs"},{"uid":"4e31-1303","name":"buildRoundedRectangle.mjs"},{"uid":"4e31-1307","name":"ArcUtils.mjs"},{"uid":"4e31-1309","name":"BatchPart.mjs"},{"uid":"4e31-1311","name":"BezierUtils.mjs"},{"uid":"4e31-1313","name":"buildLine.mjs"},{"uid":"4e31-1315","name":"QuadraticUtils.mjs"}]},{"uid":"4e31-1305","name":"const.mjs"},{"uid":"4e31-1317","name":"index.mjs"},{"uid":"4e31-1319","name":"GraphicsData.mjs"},{"uid":"4e31-1321","name":"GraphicsGeometry.mjs"},{"name":"styles","children":[{"uid":"4e31-1323","name":"FillStyle.mjs"},{"uid":"4e31-1325","name":"LineStyle.mjs"}]},{"uid":"4e31-1327","name":"Graphics.mjs"}]},{"name":"mesh/lib","children":[{"uid":"4e31-1329","name":"MeshBatchUvs.mjs"},{"uid":"4e31-1331","name":"Mesh.mjs"},{"uid":"4e31-1333","name":"index.mjs"},{"uid":"4e31-1335","name":"MeshGeometry.mjs"},{"name":"shader","children":[{"uid":"4e31-1337","name":"mesh.mjs"},{"uid":"4e31-1339","name":"mesh2.mjs"}]},{"uid":"4e31-1341","name":"MeshMaterial.mjs"}]},{"name":"mesh-extras/lib","children":[{"uid":"4e31-1343","name":"index.mjs"},{"name":"geometry/RopeGeometry.mjs","uid":"4e31-1345"},{"uid":"4e31-1347","name":"SimpleRope.mjs"}]},{"name":"particle-container/lib","children":[{"uid":"4e31-1349","name":"ParticleContainer.mjs"},{"uid":"4e31-1351","name":"index.mjs"},{"uid":"4e31-1353","name":"ParticleBuffer.mjs"},{"uid":"4e31-1355","name":"particles.mjs"},{"uid":"4e31-1357","name":"particles2.mjs"},{"uid":"4e31-1359","name":"ParticleRenderer.mjs"}]},{"name":"text/lib","children":[{"uid":"4e31-1363","name":"const.mjs"},{"uid":"4e31-1365","name":"index.mjs"},{"uid":"4e31-1367","name":"TextMetrics.mjs"},{"uid":"4e31-1369","name":"TextStyle.mjs"},{"uid":"4e31-1371","name":"Text.mjs"}]},{"name":"sprite-animated/lib/index.mjs","uid":"4e31-1381"},{"name":"sprite-tiling/lib","children":[{"uid":"4e31-1383","name":"TilingSprite.mjs"},{"uid":"4e31-1385","name":"index.mjs"},{"uid":"4e31-1387","name":"sprite-tiling.mjs"},{"uid":"4e31-1389","name":"sprite-tiling2.mjs"},{"uid":"4e31-1391","name":"sprite-tiling-fallback.mjs"},{"uid":"4e31-1393","name":"sprite-tiling-fallback2.mjs"},{"uid":"4e31-1395","name":"sprite-tiling-simple.mjs"},{"uid":"4e31-1397","name":"TilingSpriteRenderer.mjs"}]},{"name":"spritesheet/lib","children":[{"uid":"4e31-1399","name":"Spritesheet.mjs"},{"uid":"4e31-1401","name":"index.mjs"},{"uid":"4e31-1403","name":"spritesheetAsset.mjs"}]},{"name":"text-bitmap/lib","children":[{"uid":"4e31-1405","name":"BitmapFontData.mjs"},{"name":"formats","children":[{"uid":"4e31-1407","name":"TextFormat.mjs"},{"uid":"4e31-1409","name":"index.mjs"},{"uid":"4e31-1411","name":"XMLFormat.mjs"},{"uid":"4e31-1413","name":"XMLStringFormat.mjs"}]},{"name":"utils","children":[{"uid":"4e31-1415","name":"generateFillStyle.mjs"},{"uid":"4e31-1417","name":"drawGlyph.mjs"},{"uid":"4e31-1419","name":"index.mjs"},{"uid":"4e31-1421","name":"extractCharCode.mjs"},{"uid":"4e31-1423","name":"splitTextToCharacters.mjs"},{"uid":"4e31-1425","name":"resolveCharacters.mjs"}]},{"uid":"4e31-1427","name":"BitmapFont.mjs"},{"uid":"4e31-1429","name":"index.mjs"},{"name":"shader","children":[{"uid":"4e31-1431","name":"msdf.mjs"},{"uid":"4e31-1433","name":"msdf2.mjs"}]},{"uid":"4e31-1435","name":"BitmapText.mjs"},{"uid":"4e31-1437","name":"loadBitmapFont.mjs"}]},{"name":"text-html/lib","children":[{"uid":"4e31-1439","name":"HTMLTextStyle.mjs"},{"uid":"4e31-1441","name":"HTMLText.mjs"},{"uid":"4e31-1443","name":"index.mjs"}]},{"name":"filter-adjustment/dist/filter-adjustment.mjs","uid":"4e31-1523"},{"name":"filter-kawase-blur/dist/filter-kawase-blur.mjs","uid":"4e31-1527"},{"name":"filter-advanced-bloom/dist/filter-advanced-bloom.mjs","uid":"4e31-1529"},{"name":"filter-ascii/dist/filter-ascii.mjs","uid":"4e31-1531"},{"name":"filter-bevel/dist/filter-bevel.mjs","uid":"4e31-1533"},{"name":"color/lib","children":[{"uid":"4e31-1555","name":"Color.mjs"},{"uid":"4e31-1557","name":"index.mjs"}]},{"name":"filter-bulge-pinch/dist/filter-bulge-pinch.mjs","uid":"4e31-1825"},{"name":"filter-color-gradient/dist/filter-color-gradient.mjs","uid":"4e31-1827"},{"name":"filter-color-map/dist/filter-color-map.mjs","uid":"4e31-1829"},{"name":"filter-color-overlay/dist/filter-color-overlay.mjs","uid":"4e31-1831"},{"name":"filter-color-replace/dist/filter-color-replace.mjs","uid":"4e31-1833"},{"name":"filter-convolution/dist/filter-convolution.mjs","uid":"4e31-1835"},{"name":"filter-cross-hatch/dist/filter-cross-hatch.mjs","uid":"4e31-1837"},{"name":"filter-crt/dist/filter-crt.mjs","uid":"4e31-1839"},{"name":"filter-dot/dist/filter-dot.mjs","uid":"4e31-1841"},{"name":"filter-drop-shadow/dist/filter-drop-shadow.mjs","uid":"4e31-1843"},{"name":"filter-emboss/dist/filter-emboss.mjs","uid":"4e31-1845"},{"name":"filter-glitch/dist/filter-glitch.mjs","uid":"4e31-1847"},{"name":"filter-glow/dist/filter-glow.mjs","uid":"4e31-1849"},{"name":"filter-godray/dist/filter-godray.mjs","uid":"4e31-1851"},{"name":"filter-grayscale/dist/filter-grayscale.mjs","uid":"4e31-1853"},{"name":"filter-hsl-adjustment/dist/filter-hsl-adjustment.mjs","uid":"4e31-1855"},{"name":"filter-motion-blur/dist/filter-motion-blur.mjs","uid":"4e31-1857"},{"name":"filter-multi-color-replace/dist/filter-multi-color-replace.mjs","uid":"4e31-1859"},{"name":"filter-old-film/dist/filter-old-film.mjs","uid":"4e31-1861"},{"name":"filter-outline/dist/filter-outline.mjs","uid":"4e31-1863"},{"name":"filter-pixelate/dist/filter-pixelate.mjs","uid":"4e31-1865"},{"name":"filter-radial-blur/dist/filter-radial-blur.mjs","uid":"4e31-1867"},{"name":"filter-reflection/dist/filter-reflection.mjs","uid":"4e31-1869"},{"name":"filter-rgb-split/dist/filter-rgb-split.mjs","uid":"4e31-1871"},{"name":"filter-shockwave/dist/filter-shockwave.mjs","uid":"4e31-1873"},{"name":"filter-simple-lightmap/dist/filter-simple-lightmap.mjs","uid":"4e31-1875"},{"name":"filter-tilt-shift/dist/filter-tilt-shift.mjs","uid":"4e31-1877"},{"name":"filter-twist/dist/filter-twist.mjs","uid":"4e31-1879"},{"name":"filter-zoom-blur/dist/filter-zoom-blur.mjs","uid":"4e31-1881"}]},{"name":"ismobilejs/esm","children":[{"uid":"4e31-429","name":"isMobile.js"},{"uid":"4e31-431","name":"index.js"}]},{"name":"colord","children":[{"uid":"4e31-447","name":"index.mjs"},{"name":"plugins/names.mjs","uid":"4e31-449"}]},{"name":"@rapideditor","children":[{"name":"country-coder/dist/country-coder.mjs","uid":"4e31-493"},{"name":"location-conflation/index.mjs","uid":"4e31-495"},{"name":"pixi-texture-allocator/dist/pixi-texture-allocator.mjs","uid":"4e31-1521"},{"name":"pixi-dashed-line/dist/pixi-dashed-line.mjs","uid":"4e31-1887"}]},{"name":"d3-fetch/src","children":[{"uid":"4e31-543","name":"text.js"},{"uid":"4e31-545","name":"json.js"},{"uid":"4e31-547","name":"index.js"},{"uid":"4e31-549","name":"xml.js"}]},{"name":"lodash-es","children":[{"uid":"4e31-551","name":"isObject.js"},{"uid":"4e31-553","name":"_freeGlobal.js"},{"uid":"4e31-555","name":"_root.js"},{"uid":"4e31-557","name":"now.js"},{"uid":"4e31-559","name":"_trimmedEndIndex.js"},{"uid":"4e31-561","name":"_baseTrim.js"},{"uid":"4e31-563","name":"_Symbol.js"},{"uid":"4e31-565","name":"_getRawTag.js"},{"uid":"4e31-567","name":"_objectToString.js"},{"uid":"4e31-569","name":"_baseGetTag.js"},{"uid":"4e31-571","name":"isObjectLike.js"},{"uid":"4e31-573","name":"isSymbol.js"},{"uid":"4e31-575","name":"toNumber.js"},{"uid":"4e31-577","name":"debounce.js"},{"uid":"4e31-741","name":"throttle.js"}]},{"name":"@tmcw/togeojson/dist/togeojson.es.mjs","uid":"4e31-579"},{"name":"node-diff3/index.mjs","uid":"4e31-735"},{"name":"osm-community-index","children":[{"name":"lib","children":[{"uid":"4e31-817","name":"simplify.js"},{"uid":"4e31-819","name":"resolve_strings.js"}]},{"uid":"4e31-821","name":"index.mjs"}]},{"name":"pixi.js","children":[{"name":"lib","children":[{"uid":"4e31-1163","name":"filters.mjs"},{"uid":"4e31-1165","name":"index.mjs"}]},{"name":"node_modules/@pixi/prepare/lib","children":[{"uid":"4e31-1361","name":"settings.mjs"},{"uid":"4e31-1373","name":"CountLimiter.mjs"},{"uid":"4e31-1375","name":"BasePrepare.mjs"},{"uid":"4e31-1377","name":"index.mjs"},{"uid":"4e31-1379","name":"Prepare.mjs"}]}]},{"name":"pixi-filters","children":[{"name":"dist/esm/pixi-filters.mjs","uid":"4e31-1525"},{"name":"node_modules/@pixi","children":[{"name":"constants/lib/index.mjs","uid":"4e31-1535"},{"name":"settings/lib","children":[{"uid":"4e31-1537","name":"adapter.mjs"},{"uid":"4e31-1539","name":"index.mjs"},{"uid":"4e31-1541","name":"settings.mjs"},{"name":"utils/isMobile.mjs","uid":"4e31-1543"}]},{"name":"utils/lib","children":[{"uid":"4e31-1545","name":"settings.mjs"},{"uid":"4e31-1547","name":"index.mjs"},{"uid":"4e31-1549","name":"url.mjs"},{"name":"logging/deprecation.mjs","uid":"4e31-1551"},{"name":"browser/isWebGLSupported.mjs","uid":"4e31-1553"},{"name":"color/premultiply.mjs","uid":"4e31-1559"},{"name":"data","children":[{"uid":"4e31-1561","name":"getBufferType.mjs"},{"uid":"4e31-1563","name":"pow2.mjs"},{"uid":"4e31-1565","name":"removeItems.mjs"},{"uid":"4e31-1567","name":"uid.mjs"}]},{"name":"media","children":[{"uid":"4e31-1569","name":"BoundingBox.mjs"},{"uid":"4e31-1571","name":"caches.mjs"}]},{"name":"network","children":[{"uid":"4e31-1573","name":"determineCrossOrigin.mjs"},{"uid":"4e31-1575","name":"getResolutionOfUrl.mjs"}]}]},{"name":"extensions/lib/index.mjs","uid":"4e31-1577"},{"name":"core/lib","children":[{"name":"geometry","children":[{"uid":"4e31-1579","name":"ViewableBuffer.mjs"},{"uid":"4e31-1599","name":"Buffer.mjs"},{"uid":"4e31-1601","name":"Attribute.mjs"},{"name":"utils/interleaveTypedArrays.mjs","uid":"4e31-1603"},{"uid":"4e31-1605","name":"Geometry.mjs"},{"uid":"4e31-1719","name":"GeometrySystem.mjs"},{"uid":"4e31-1799","name":"GLBuffer.mjs"},{"uid":"4e31-1801","name":"BufferSystem.mjs"}]},{"name":"shader","children":[{"name":"utils","children":[{"uid":"4e31-1581","name":"checkMaxIfStatementsInShader.mjs"},{"uid":"4e31-1629","name":"index.mjs"},{"uid":"4e31-1631","name":"compileShader.mjs"},{"uid":"4e31-1633","name":"defaultValue.mjs"},{"uid":"4e31-1635","name":"uniformParsers.mjs"},{"uid":"4e31-1637","name":"generateUniformsSync.mjs"},{"uid":"4e31-1639","name":"getTestContext.mjs"},{"uid":"4e31-1641","name":"getMaxFragmentPrecision.mjs"},{"uid":"4e31-1643","name":"logProgramError.mjs"},{"uid":"4e31-1645","name":"mapSize.mjs"},{"uid":"4e31-1647","name":"mapType.mjs"},{"uid":"4e31-1649","name":"setPrecision.mjs"},{"uid":"4e31-1651","name":"unsafeEvalSupported.mjs"},{"uid":"4e31-1749","name":"getAttributeData.mjs"},{"uid":"4e31-1751","name":"getUniformData.mjs"},{"uid":"4e31-1753","name":"generateProgram.mjs"},{"uid":"4e31-1755","name":"generateUniformBufferSync.mjs"}]},{"uid":"4e31-1625","name":"defaultProgram.mjs"},{"uid":"4e31-1627","name":"defaultProgram2.mjs"},{"uid":"4e31-1653","name":"Program.mjs"},{"uid":"4e31-1655","name":"UniformGroup.mjs"},{"uid":"4e31-1657","name":"Shader.mjs"},{"uid":"4e31-1747","name":"GLProgram.mjs"},{"uid":"4e31-1757","name":"ShaderSystem.mjs"}]},{"name":"state","children":[{"uid":"4e31-1583","name":"State.mjs"},{"name":"utils/mapWebGLBlendModesToPixi.mjs","uid":"4e31-1761"},{"uid":"4e31-1763","name":"StateSystem.mjs"}]},{"name":"textures","children":[{"name":"resources","children":[{"uid":"4e31-1585","name":"autoDetectResource.mjs"},{"uid":"4e31-1591","name":"Resource.mjs"},{"uid":"4e31-1593","name":"BufferResource.mjs"},{"uid":"4e31-1689","name":"DepthResource.mjs"},{"uid":"4e31-1695","name":"BaseImageResource.mjs"},{"uid":"4e31-1697","name":"ImageResource.mjs"},{"uid":"4e31-1807","name":"AbstractMultiResource.mjs"},{"uid":"4e31-1809","name":"ArrayResource.mjs"},{"uid":"4e31-1811","name":"index.mjs"},{"uid":"4e31-1813","name":"CanvasResource.mjs"},{"uid":"4e31-1815","name":"CubeResource.mjs"},{"uid":"4e31-1817","name":"ImageBitmapResource.mjs"},{"uid":"4e31-1819","name":"SVGResource.mjs"},{"uid":"4e31-1821","name":"VideoResource.mjs"}]},{"uid":"4e31-1595","name":"BaseTexture.mjs"},{"uid":"4e31-1699","name":"TextureUvs.mjs"},{"uid":"4e31-1701","name":"Texture.mjs"},{"uid":"4e31-1721","name":"TextureMatrix.mjs"},{"uid":"4e31-1767","name":"TextureGCSystem.mjs"},{"uid":"4e31-1769","name":"GLTexture.mjs"},{"name":"utils/mapTypeAndFormatToInternalFormat.mjs","uid":"4e31-1771"},{"uid":"4e31-1773","name":"TextureSystem.mjs"}]},{"name":"batch","children":[{"uid":"4e31-1597","name":"BatchDrawCall.mjs"},{"uid":"4e31-1607","name":"BatchGeometry.mjs"},{"uid":"4e31-1659","name":"BatchShaderGenerator.mjs"},{"uid":"4e31-1661","name":"BatchTextureArray.mjs"},{"uid":"4e31-1663","name":"canUploadSameBuffer.mjs"},{"uid":"4e31-1665","name":"maxRecommendedTextures.mjs"},{"uid":"4e31-1667","name":"ObjectRenderer.mjs"},{"uid":"4e31-1669","name":"texture.mjs"},{"uid":"4e31-1671","name":"texture2.mjs"},{"uid":"4e31-1673","name":"BatchRenderer.mjs"},{"uid":"4e31-1685","name":"BatchSystem.mjs"}]},{"name":"filters","children":[{"uid":"4e31-1675","name":"defaultFilter.mjs"},{"uid":"4e31-1677","name":"defaultFilter2.mjs"},{"uid":"4e31-1679","name":"Filter.mjs"},{"uid":"4e31-1711","name":"FilterState.mjs"},{"uid":"4e31-1713","name":"FilterSystem.mjs"},{"name":"spriteMask","children":[{"uid":"4e31-1723","name":"spriteMaskFilter2.mjs"},{"uid":"4e31-1725","name":"spriteMaskFilter3.mjs"},{"uid":"4e31-1727","name":"SpriteMaskFilter.mjs"}]}]},{"name":"background/BackgroundSystem.mjs","uid":"4e31-1681"},{"uid":"4e31-1683","name":"systems.mjs"},{"name":"context/ContextSystem.mjs","uid":"4e31-1687"},{"name":"framebuffer","children":[{"uid":"4e31-1691","name":"Framebuffer.mjs"},{"uid":"4e31-1715","name":"GLFramebuffer.mjs"},{"uid":"4e31-1717","name":"FramebufferSystem.mjs"},{"uid":"4e31-1797","name":"MultisampleSystem.mjs"}]},{"name":"renderTexture","children":[{"uid":"4e31-1693","name":"BaseRenderTexture.mjs"},{"uid":"4e31-1703","name":"RenderTexture.mjs"},{"uid":"4e31-1705","name":"RenderTexturePool.mjs"},{"uid":"4e31-1743","name":"GenerateTextureSystem.mjs"},{"uid":"4e31-1745","name":"RenderTextureSystem.mjs"}]},{"name":"utils","children":[{"uid":"4e31-1707","name":"Quad.mjs"},{"uid":"4e31-1709","name":"QuadUv.mjs"}]},{"name":"mask","children":[{"uid":"4e31-1729","name":"MaskData.mjs"},{"uid":"4e31-1731","name":"MaskSystem.mjs"},{"uid":"4e31-1733","name":"AbstractMaskSystem.mjs"},{"uid":"4e31-1735","name":"ScissorSystem.mjs"},{"uid":"4e31-1737","name":"StencilSystem.mjs"}]},{"name":"plugin/PluginSystem.mjs","uid":"4e31-1739"},{"name":"projection/ProjectionSystem.mjs","uid":"4e31-1741"},{"name":"startup/StartupSystem.mjs","uid":"4e31-1759"},{"name":"system/SystemManager.mjs","uid":"4e31-1765"},{"name":"transformFeedback/TransformFeedbackSystem.mjs","uid":"4e31-1775"},{"name":"view/ViewSystem.mjs","uid":"4e31-1777"},{"uid":"4e31-1779","name":"settings.mjs"},{"uid":"4e31-1781","name":"index.mjs"},{"uid":"4e31-1795","name":"autoDetectRenderer.mjs"},{"name":"render/ObjectRendererSystem.mjs","uid":"4e31-1803"},{"uid":"4e31-1805","name":"Renderer.mjs"}]},{"name":"runner/lib","children":[{"uid":"4e31-1587","name":"Runner.mjs"},{"uid":"4e31-1589","name":"index.mjs"}]},{"name":"math/lib","children":[{"uid":"4e31-1609","name":"const.mjs"},{"uid":"4e31-1611","name":"Point.mjs"},{"name":"shapes/Rectangle.mjs","uid":"4e31-1613"},{"uid":"4e31-1615","name":"index.mjs"},{"uid":"4e31-1617","name":"Matrix.mjs"},{"uid":"4e31-1619","name":"groupD8.mjs"},{"uid":"4e31-1621","name":"ObservablePoint.mjs"},{"uid":"4e31-1623","name":"Transform.mjs"}]},{"name":"ticker/lib","children":[{"uid":"4e31-1783","name":"settings.mjs"},{"uid":"4e31-1785","name":"const.mjs"},{"uid":"4e31-1787","name":"TickerListener.mjs"},{"uid":"4e31-1789","name":"Ticker.mjs"},{"uid":"4e31-1791","name":"index.mjs"},{"uid":"4e31-1793","name":"TickerPlugin.mjs"}]},{"name":"filter-bloom/dist/filter-bloom.mjs","uid":"4e31-1823"}]}]},{"name":"marked/lib/marked.esm.js","uid":"4e31-2037"},{"name":"name-suggestion-index","children":[{"name":"lib","children":[{"uid":"4e31-2131","name":"matcher.js"},{"uid":"4e31-2133","name":"simplify.js"}]},{"name":"config","children":[{"uid":"4e31-2135","name":"matchGroups.json"},{"uid":"4e31-2137","name":"genericWords.json"},{"uid":"4e31-2139","name":"trees.json"}]},{"uid":"4e31-2141","name":"index.mjs"}]},{"name":"osm-auth/src/osm-auth.mjs","uid":"4e31-2147"},{"name":"@turf","children":[{"name":"helpers/dist/es/index.js","uid":"4e31-2161"},{"name":"invariant/dist/es/index.js","uid":"4e31-2163"},{"name":"bbox-clip/dist/es","children":[{"name":"lib/lineclip.js","uid":"4e31-2165"},{"uid":"4e31-2167","name":"index.js"}]}]},{"name":"d3/src/index.js","uid":"4e31-2239"},{"name":"d3-brush/src","children":[{"uid":"4e31-2241","name":"brush.js"},{"uid":"4e31-2243","name":"index.js"}]}]},{"name":"modules","children":[{"uid":"4e31-105","name":"index.js"},{"name":"actions","children":[{"uid":"4e31-107","name":"add_entity.js"},{"uid":"4e31-109","name":"index.js"},{"uid":"4e31-113","name":"reverse.js"},{"uid":"4e31-523","name":"delete_way.js"},{"uid":"4e31-525","name":"delete_node.js"},{"uid":"4e31-527","name":"delete_multiple.js"},{"uid":"4e31-529","name":"delete_relation.js"},{"uid":"4e31-531","name":"split.js"},{"uid":"4e31-593","name":"add_midpoint.js"},{"uid":"4e31-603","name":"circularize.js"},{"uid":"4e31-613","name":"noop.js"},{"uid":"4e31-623","name":"disconnect.js"},{"uid":"4e31-627","name":"change_tags.js"},{"uid":"4e31-631","name":"extract.js"},{"uid":"4e31-635","name":"join.js"},{"uid":"4e31-637","name":"merge.js"},{"uid":"4e31-639","name":"connect.js"},{"uid":"4e31-641","name":"merge_nodes.js"},{"uid":"4e31-643","name":"merge_polygon.js"},{"uid":"4e31-649","name":"orthogonalize.js"},{"uid":"4e31-653","name":"copy_entities.js"},{"uid":"4e31-655","name":"move.js"},{"uid":"4e31-659","name":"reflect.js"},{"uid":"4e31-669","name":"straighten_nodes.js"},{"uid":"4e31-671","name":"straighten_way.js"},{"uid":"4e31-705","name":"add_vertex.js"},{"uid":"4e31-707","name":"change_member.js"},{"uid":"4e31-709","name":"delete_member.js"},{"uid":"4e31-715","name":"change_preset.js"},{"uid":"4e31-717","name":"upgrade_tags.js"},{"uid":"4e31-731","name":"discard_tags.js"},{"uid":"4e31-733","name":"merge_remote_changes.js"},{"uid":"4e31-737","name":"revert.js"},{"uid":"4e31-769","name":"move_node.js"},{"uid":"4e31-779","name":"rotate.js"},{"uid":"4e31-2001","name":"move_member.js"},{"uid":"4e31-2005","name":"delete_members.js"},{"uid":"4e31-2211","name":"add_member.js"},{"uid":"4e31-2213","name":"restrict_turn.js"},{"uid":"4e31-2215","name":"scale.js"},{"uid":"4e31-2217","name":"unrestrict_turn.js"},{"uid":"4e31-2219","name":"rapid_accept_feature.js"}]},{"name":"osm","children":[{"uid":"4e31-115","name":"tags.js"},{"uid":"4e31-409","name":"entity.js"},{"uid":"4e31-411","name":"lanes.js"},{"uid":"4e31-511","name":"changeset.js"},{"uid":"4e31-513","name":"index.js"},{"uid":"4e31-515","name":"node.js"},{"uid":"4e31-517","name":"note.js"},{"uid":"4e31-519","name":"relation.js"},{"uid":"4e31-521","name":"qa_item.js"},{"uid":"4e31-535","name":"intersection.js"},{"uid":"4e31-2207","name":"way.js"},{"uid":"4e31-2209","name":"multipolygon.js"}]},{"name":"util","children":[{"uid":"4e31-413","name":"detect.js"},{"uid":"4e31-415","name":"index.js"},{"uid":"4e31-509","name":"rebind.js"},{"uid":"4e31-783","name":"jxon.js"},{"uid":"4e31-1939","name":"dimensions.js"},{"uid":"4e31-1969","name":"units.js"},{"uid":"4e31-2053","name":"keybinding.js"},{"uid":"4e31-2155","name":"jsonp_request.js"},{"uid":"4e31-2201","name":"util.js"},{"uid":"4e31-2203","name":"get_set_value.js"},{"uid":"4e31-2205","name":"trigger_event.js"}]},{"name":"core","children":[{"uid":"4e31-417","name":"preferences.js"},{"uid":"4e31-419","name":"file_fetcher.js"},{"uid":"4e31-497","name":"LocationManager.js"},{"uid":"4e31-499","name":"localizer.js"},{"uid":"4e31-533","name":"Graph.js"},{"uid":"4e31-581","name":"rapid_context.js"},{"uid":"4e31-583","name":"Difference.js"},{"uid":"4e31-585","name":"Tree.js"},{"uid":"4e31-591","name":"history.js"},{"name":"validation","children":[{"uid":"4e31-679","name":"models.js"},{"uid":"4e31-681","name":"index.js"}]},{"uid":"4e31-729","name":"validator.js"},{"uid":"4e31-739","name":"uploader.js"},{"uid":"4e31-743","name":"UrlHash.js"},{"uid":"4e31-2111","name":"context.js"},{"uid":"4e31-2113","name":"index.js"}]},{"name":"presets","children":[{"uid":"4e31-501","name":"collection.js"},{"uid":"4e31-503","name":"category.js"},{"uid":"4e31-505","name":"field.js"},{"uid":"4e31-507","name":"preset.js"},{"uid":"4e31-2199","name":"index.js"}]},{"name":"svg","children":[{"uid":"4e31-537","name":"icon.js"},{"uid":"4e31-1947","name":"defs.js"},{"uid":"4e31-2223","name":"index.js"},{"uid":"4e31-2225","name":"tag_classes.js"}]},{"name":"ui","children":[{"name":"fields","children":[{"uid":"4e31-539","name":"check.js"},{"uid":"4e31-541","name":"index.js"},{"uid":"4e31-2175","name":"combo.js"},{"uid":"4e31-2177","name":"input.js"},{"uid":"4e31-2179","name":"access.js"},{"uid":"4e31-2181","name":"address.js"},{"uid":"4e31-2183","name":"cycleway.js"},{"uid":"4e31-2185","name":"lanes.js"},{"uid":"4e31-2187","name":"localized.js"},{"uid":"4e31-2189","name":"roadspeed.js"},{"uid":"4e31-2191","name":"radio.js"},{"uid":"4e31-2193","name":"textarea.js"},{"uid":"4e31-2195","name":"wikidata.js"},{"uid":"4e31-2197","name":"wikipedia.js"}]},{"uid":"4e31-587","name":"modal.js"},{"uid":"4e31-589","name":"loading.js"},{"uid":"4e31-617","name":"cmd.js"},{"uid":"4e31-785","name":"conflicts.js"},{"uid":"4e31-787","name":"confirm.js"},{"uid":"4e31-789","name":"commit.js"},{"uid":"4e31-791","name":"popover.js"},{"uid":"4e31-793","name":"tooltip.js"},{"uid":"4e31-795","name":"combobox.js"},{"uid":"4e31-797","name":"tag_reference.js"},{"uid":"4e31-799","name":"field.js"},{"uid":"4e31-801","name":"form_fields.js"},{"uid":"4e31-803","name":"changeset_editor.js"},{"uid":"4e31-805","name":"toggle.js"},{"uid":"4e31-807","name":"disclosure.js"},{"uid":"4e31-809","name":"section.js"},{"name":"sections","children":[{"uid":"4e31-811","name":"changes.js"},{"uid":"4e31-815","name":"raw_tag_editor.js"},{"uid":"4e31-1993","name":"entity_issues.js"},{"uid":"4e31-1997","name":"feature_type.js"},{"uid":"4e31-1999","name":"preset_fields.js"},{"uid":"4e31-2003","name":"raw_member_editor.js"},{"uid":"4e31-2007","name":"raw_membership_editor.js"},{"uid":"4e31-2009","name":"selection_list.js"},{"uid":"4e31-2061","name":"background_display_options.js"},{"uid":"4e31-2065","name":"background_list.js"},{"uid":"4e31-2067","name":"background_offset.js"},{"uid":"4e31-2069","name":"grid_display_options.js"},{"uid":"4e31-2071","name":"overlay_list.js"},{"uid":"4e31-2077","name":"validation_issues.js"},{"uid":"4e31-2079","name":"validation_options.js"},{"uid":"4e31-2081","name":"validation_rules.js"},{"uid":"4e31-2083","name":"validation_status.js"},{"uid":"4e31-2089","name":"data_layers.js"},{"uid":"4e31-2091","name":"map_features.js"},{"uid":"4e31-2093","name":"map_style_options.js"},{"uid":"4e31-2095","name":"photo_overlays.js"},{"uid":"4e31-2099","name":"privacy.js"},{"uid":"4e31-2101","name":"map_interaction_options.js"},{"uid":"4e31-2231","name":"index.js"}]},{"uid":"4e31-813","name":"commit_warnings.js"},{"uid":"4e31-823","name":"success.js"},{"uid":"4e31-827","name":"data_header.js"},{"uid":"4e31-829","name":"data_editor.js"},{"uid":"4e31-831","name":"improveOSM_comments.js"},{"uid":"4e31-833","name":"improveOSM_details.js"},{"uid":"4e31-1445","name":"improveOSM_header.js"},{"uid":"4e31-1447","name":"improveOSM_editor.js"},{"uid":"4e31-1449","name":"keepRight_details.js"},{"uid":"4e31-1451","name":"keepRight_header.js"},{"uid":"4e31-1453","name":"view_on_keepRight.js"},{"uid":"4e31-1455","name":"keepRight_editor.js"},{"uid":"4e31-1457","name":"note_comments.js"},{"uid":"4e31-1459","name":"note_header.js"},{"uid":"4e31-1461","name":"note_report.js"},{"uid":"4e31-1463","name":"view_on_osm.js"},{"uid":"4e31-1465","name":"note_editor.js"},{"uid":"4e31-1467","name":"osmose_details.js"},{"uid":"4e31-1469","name":"osmose_header.js"},{"uid":"4e31-1471","name":"view_on_osmose.js"},{"uid":"4e31-1473","name":"osmose_editor.js"},{"uid":"4e31-1479","name":"flash.js"},{"name":"intro","children":[{"uid":"4e31-1481","name":"helper.js"},{"uid":"4e31-1483","name":"UiCurtain.js"},{"uid":"4e31-1485","name":"welcome.js"},{"uid":"4e31-1487","name":"navigation.js"},{"uid":"4e31-1489","name":"point.js"},{"uid":"4e31-1491","name":"area.js"},{"uid":"4e31-1493","name":"line.js"},{"uid":"4e31-1495","name":"building.js"},{"uid":"4e31-1497","name":"start_editing.js"},{"uid":"4e31-1499","name":"rapid.js"},{"uid":"4e31-1501","name":"intro.js"},{"uid":"4e31-1503","name":"index.js"}]},{"uid":"4e31-1505","name":"rapid_splash.js"},{"uid":"4e31-1507","name":"rapid_first_edit_dialog.js"},{"uid":"4e31-1509","name":"rapid_feature_inspector.js"},{"uid":"4e31-1949","name":"account.js"},{"uid":"4e31-1951","name":"attribution.js"},{"uid":"4e31-1953","name":"contributors.js"},{"uid":"4e31-1955","name":"edit_menu.js"},{"uid":"4e31-1957","name":"feature_info.js"},{"uid":"4e31-1959","name":"full_screen.js"},{"uid":"4e31-1961","name":"geolocate.js"},{"name":"panels","children":[{"uid":"4e31-1963","name":"AbstractUiPanel.js"},{"uid":"4e31-1965","name":"UiPanelBackground.js"},{"uid":"4e31-1967","name":"UiPanelHistory.js"},{"uid":"4e31-1971","name":"UiPanelLocation.js"},{"uid":"4e31-1973","name":"UiPanelMeasurement.js"},{"uid":"4e31-2227","name":"index.js"}]},{"uid":"4e31-1975","name":"info.js"},{"uid":"4e31-1977","name":"issues_info.js"},{"uid":"4e31-1979","name":"map_in_map.js"},{"uid":"4e31-1981","name":"photoviewer.js"},{"uid":"4e31-1983","name":"restore.js"},{"uid":"4e31-1985","name":"scale.js"},{"uid":"4e31-1987","name":"shortcuts.js"},{"uid":"4e31-1989","name":"feature_list.js"},{"uid":"4e31-1991","name":"entity_editor.js"},{"uid":"4e31-1995","name":"preset_icon.js"},{"uid":"4e31-2011","name":"preset_list.js"},{"uid":"4e31-2013","name":"inspector.js"},{"uid":"4e31-2015","name":"sidebar.js"},{"uid":"4e31-2017","name":"source_switch.js"},{"uid":"4e31-2019","name":"spinner.js"},{"uid":"4e31-2021","name":"status.js"},{"name":"tools","children":[{"uid":"4e31-2023","name":"download_osc.js"},{"uid":"4e31-2025","name":"index.js"},{"uid":"4e31-2027","name":"modes.js"},{"uid":"4e31-2029","name":"notes.js"},{"uid":"4e31-2031","name":"save.js"},{"uid":"4e31-2033","name":"sidebar_toggle.js"},{"uid":"4e31-2035","name":"undo_redo.js"},{"uid":"4e31-2047","name":"rapid_features.js"}]},{"uid":"4e31-2039","name":"rapid_colorpicker.js"},{"uid":"4e31-2041","name":"rapid_view_manage_datasets.js"},{"uid":"4e31-2043","name":"rapid_feature_toggle_dialog.js"},{"uid":"4e31-2045","name":"rapid_poweruser_features_dialog.js"},{"uid":"4e31-2049","name":"top_toolbar.js"},{"uid":"4e31-2051","name":"version.js"},{"uid":"4e31-2055","name":"zoom.js"},{"uid":"4e31-2057","name":"zoom_to_selection.js"},{"uid":"4e31-2059","name":"pane.js"},{"name":"settings","children":[{"uid":"4e31-2063","name":"custom_background.js"},{"uid":"4e31-2087","name":"custom_data.js"},{"uid":"4e31-2233","name":"index.js"}]},{"name":"panes","children":[{"uid":"4e31-2073","name":"background.js"},{"uid":"4e31-2075","name":"help.js"},{"uid":"4e31-2085","name":"issues.js"},{"uid":"4e31-2097","name":"map_data.js"},{"uid":"4e31-2103","name":"preferences.js"},{"uid":"4e31-2229","name":"index.js"}]},{"uid":"4e31-2105","name":"rapid_service_license.js"},{"uid":"4e31-2107","name":"rapid_whatsnew.js"},{"uid":"4e31-2109","name":"init.js"},{"uid":"4e31-2235","name":"index.js"},{"uid":"4e31-2237","name":"splash.js"}]},{"name":"geo","children":[{"uid":"4e31-595","name":"geom.js"},{"uid":"4e31-597","name":"index.js"},{"uid":"4e31-599","name":"ortho.js"}]},{"name":"operations","children":[{"uid":"4e31-601","name":"index.js"},{"uid":"4e31-609","name":"circularize.js"},{"uid":"4e31-611","name":"continue.js"},{"uid":"4e31-615","name":"cycle_highway_tag.js"},{"uid":"4e31-619","name":"copy.js"},{"uid":"4e31-621","name":"delete.js"},{"uid":"4e31-625","name":"disconnect.js"},{"uid":"4e31-629","name":"downgrade.js"},{"uid":"4e31-633","name":"extract.js"},{"uid":"4e31-645","name":"merge.js"},{"uid":"4e31-647","name":"move.js"},{"uid":"4e31-651","name":"orthogonalize.js"},{"uid":"4e31-657","name":"paste.js"},{"uid":"4e31-661","name":"reflect.js"},{"uid":"4e31-663","name":"reverse.js"},{"uid":"4e31-665","name":"rotate.js"},{"uid":"4e31-667","name":"split.js"},{"uid":"4e31-673","name":"straighten.js"}]},{"name":"behaviors","children":[{"uid":"4e31-605","name":"AbstractBehavior.js"},{"uid":"4e31-607","name":"BehaviorKeyOperation.js"},{"uid":"4e31-745","name":"BehaviorDrag.js"},{"uid":"4e31-747","name":"BehaviorDraw.js"},{"uid":"4e31-749","name":"BehaviorHover.js"},{"uid":"4e31-751","name":"BehaviorLasso.js"},{"uid":"4e31-753","name":"BehaviorMapInteraction.js"},{"uid":"4e31-755","name":"BehaviorMapNudging.js"},{"uid":"4e31-757","name":"BehaviorPaste.js"},{"uid":"4e31-759","name":"BehaviorSelect.js"},{"uid":"4e31-2221","name":"index.js"}]},{"name":"modes","children":[{"uid":"4e31-675","name":"select.js"},{"uid":"4e31-761","name":"AbstractMode.js"},{"uid":"4e31-763","name":"ModeAddNote.js"},{"uid":"4e31-765","name":"ModeAddPoint.js"},{"uid":"4e31-767","name":"ModeBrowse.js"},{"uid":"4e31-771","name":"ModeDragNode.js"},{"uid":"4e31-773","name":"ModeDrawArea.js"},{"uid":"4e31-775","name":"ModeDrawLine.js"},{"uid":"4e31-777","name":"ModeMove.js"},{"uid":"4e31-781","name":"ModeRotate.js"},{"uid":"4e31-825","name":"ModeSave.js"},{"uid":"4e31-1475","name":"index.js"},{"uid":"4e31-1477","name":"drag_note.js"},{"uid":"4e31-1511","name":"ModeSelect.js"}]},{"name":"validations","children":[{"uid":"4e31-677","name":"index.js"},{"uid":"4e31-683","name":"almost_junction.js"},{"uid":"4e31-685","name":"close_nodes.js"},{"uid":"4e31-687","name":"crossing_ways.js"},{"uid":"4e31-689","name":"disconnected_way.js"},{"uid":"4e31-691","name":"duplicate_way_segments.js"},{"uid":"4e31-693","name":"invalid_format.js"},{"uid":"4e31-695","name":"help_request.js"},{"uid":"4e31-697","name":"impossible_oneway.js"},{"uid":"4e31-699","name":"incompatible_source.js"},{"uid":"4e31-701","name":"maprules.js"},{"uid":"4e31-703","name":"mismatched_geometry.js"},{"uid":"4e31-711","name":"missing_role.js"},{"uid":"4e31-713","name":"missing_tag.js"},{"uid":"4e31-719","name":"outdated_tags.js"},{"uid":"4e31-721","name":"private_data.js"},{"uid":"4e31-723","name":"y_shaped_connection.js"},{"uid":"4e31-725","name":"suspicious_name.js"},{"uid":"4e31-727","name":"unsquare_way.js"}]},{"name":"renderer","children":[{"uid":"4e31-1513","name":"RendererImagery.js"},{"uid":"4e31-1515","name":"RendererImagerySource.js"},{"uid":"4e31-1517","name":"index.js"},{"uid":"4e31-1941","name":"RendererMap.js"},{"uid":"4e31-1943","name":"RendererPhotos.js"},{"uid":"4e31-1945","name":"features.js"}]},{"name":"pixi","children":[{"uid":"4e31-1519","name":"PixiEvents.js"},{"uid":"4e31-1883","name":"AbstractLayer.js"},{"uid":"4e31-1885","name":"PixiLayerBackgroundTiles.js"},{"uid":"4e31-1889","name":"PixiGeometry.js"},{"uid":"4e31-1891","name":"AbstractFeature.js"},{"uid":"4e31-1893","name":"helpers.js"},{"uid":"4e31-1895","name":"PixiFeaturePolygon.js"},{"uid":"4e31-1897","name":"PixiLayerEditBlocks.js"},{"uid":"4e31-1899","name":"PixiFeaturePoint.js"},{"uid":"4e31-1901","name":"PixiLayerImproveOsm.js"},{"uid":"4e31-1903","name":"PixiFeatureLine.js"},{"uid":"4e31-1905","name":"PixiLayerKartaPhotos.js"},{"uid":"4e31-1907","name":"PixiLayerKeepRight.js"},{"uid":"4e31-1909","name":"PixiLayerLabels.js"},{"uid":"4e31-1911","name":"PixiLayerMapillaryFeatures.js"},{"uid":"4e31-1913","name":"PixiLayerMapillaryPhotos.js"},{"uid":"4e31-1915","name":"PixiLayerMapillarySigns.js"},{"uid":"4e31-1917","name":"PixiLayerOsm.js"},{"uid":"4e31-1919","name":"styles.js"},{"uid":"4e31-1921","name":"PixiLayerOsmNotes.js"},{"uid":"4e31-1923","name":"PixiLayerOsmose.js"},{"uid":"4e31-1925","name":"PixiLayerRapid.js"},{"uid":"4e31-1927","name":"PixiLayerMapUI.js"},{"uid":"4e31-1929","name":"PixiLayerStreetsidePhotos.js"},{"uid":"4e31-1931","name":"PixiLayerCustomData.js"},{"uid":"4e31-1933","name":"PixiScene.js"},{"uid":"4e31-1935","name":"PixiTextures.js"},{"uid":"4e31-1937","name":"PixiRenderer.js"}]},{"name":"services","children":[{"uid":"4e31-2115","name":"esri_data.js"},{"uid":"4e31-2117","name":"fb_ai_features.js"},{"uid":"4e31-2119","name":"keepRight.js"},{"uid":"4e31-2121","name":"improveOSM.js"},{"uid":"4e31-2123","name":"osmose.js"},{"uid":"4e31-2125","name":"mapillary.js"},{"uid":"4e31-2127","name":"maprules.js"},{"uid":"4e31-2129","name":"nominatim.js"},{"uid":"4e31-2143","name":"nsi.js"},{"uid":"4e31-2145","name":"kartaview.js"},{"uid":"4e31-2149","name":"osm.js"},{"uid":"4e31-2151","name":"osm_wikibase.js"},{"uid":"4e31-2153","name":"streetside.js"},{"uid":"4e31-2157","name":"taginfo.js"},{"uid":"4e31-2159","name":"vector_tile.js"},{"uid":"4e31-2169","name":"wikidata.js"},{"uid":"4e31-2171","name":"wikipedia.js"},{"uid":"4e31-2173","name":"index.js"}]},{"uid":"4e31-2245","name":"main.js"}]}]}],"isRoot":true},"nodeParts":{"4e31-1":{"renderedLength":59680,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-0"},"4e31-3":{"renderedLength":11829,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2"},"4e31-5":{"renderedLength":6826,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-4"},"4e31-7":{"renderedLength":17883,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-6"},"4e31-9":{"renderedLength":9473,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-8"},"4e31-11":{"renderedLength":500,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-10"},"4e31-13":{"renderedLength":1435,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-12"},"4e31-15":{"renderedLength":1291,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-14"},"4e31-17":{"renderedLength":264,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-16"},"4e31-19":{"renderedLength":18651,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-18"},"4e31-21":{"renderedLength":2293,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-20"},"4e31-23":{"renderedLength":14964,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-22"},"4e31-25":{"renderedLength":3091,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-24"},"4e31-27":{"renderedLength":3497,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-26"},"4e31-29":{"renderedLength":249,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-28"},"4e31-31":{"renderedLength":2278,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-30"},"4e31-33":{"renderedLength":969,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-32"},"4e31-35":{"renderedLength":493,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-34"},"4e31-37":{"renderedLength":645,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-36"},"4e31-39":{"renderedLength":633,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-38"},"4e31-41":{"renderedLength":446,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-40"},"4e31-43":{"renderedLength":1121,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-42"},"4e31-45":{"renderedLength":3189,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-44"},"4e31-47":{"renderedLength":79572,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-46"},"4e31-49":{"renderedLength":2699,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-48"},"4e31-51":{"renderedLength":4424,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-50"},"4e31-53":{"renderedLength":1546,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-52"},"4e31-55":{"renderedLength":11715,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-54"},"4e31-57":{"renderedLength":2321,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-56"},"4e31-59":{"renderedLength":4435,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-58"},"4e31-61":{"renderedLength":1580,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-60"},"4e31-63":{"renderedLength":2194,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-62"},"4e31-65":{"renderedLength":3049,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-64"},"4e31-67":{"renderedLength":8844,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-66"},"4e31-69":{"renderedLength":5797,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-68"},"4e31-71":{"renderedLength":1925,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-70"},"4e31-73":{"renderedLength":577,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-72"},"4e31-75":{"renderedLength":317,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-74"},"4e31-77":{"renderedLength":2717,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-76"},"4e31-79":{"renderedLength":22340,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-78"},"4e31-81":{"renderedLength":3275,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-80"},"4e31-83":{"renderedLength":7647,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-82"},"4e31-85":{"renderedLength":939,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-84"},"4e31-87":{"renderedLength":950,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-86"},"4e31-89":{"renderedLength":3495,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-88"},"4e31-91":{"renderedLength":1723,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-90"},"4e31-93":{"renderedLength":954,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-92"},"4e31-95":{"renderedLength":796,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-94"},"4e31-97":{"renderedLength":400,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-96"},"4e31-99":{"renderedLength":6539,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-98"},"4e31-101":{"renderedLength":231,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-100"},"4e31-103":{"renderedLength":303,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-102"},"4e31-105":{"renderedLength":15101,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-104"},"4e31-107":{"renderedLength":107,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-106"},"4e31-109":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-108"},"4e31-111":{"renderedLength":9918,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-110"},"4e31-113":{"renderedLength":4382,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-112"},"4e31-115":{"renderedLength":5870,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-114"},"4e31-117":{"renderedLength":128,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-116"},"4e31-119":{"renderedLength":129,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-118"},"4e31-121":{"renderedLength":416,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-120"},"4e31-123":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-122"},"4e31-125":{"renderedLength":1006,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-124"},"4e31-127":{"renderedLength":533,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-126"},"4e31-129":{"renderedLength":498,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-128"},"4e31-131":{"renderedLength":498,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-130"},"4e31-133":{"renderedLength":1599,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-132"},"4e31-135":{"renderedLength":467,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-134"},"4e31-137":{"renderedLength":84,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-136"},"4e31-139":{"renderedLength":509,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-138"},"4e31-141":{"renderedLength":24,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-140"},"4e31-143":{"renderedLength":2513,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-142"},"4e31-145":{"renderedLength":1566,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-144"},"4e31-147":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-146"},"4e31-149":{"renderedLength":590,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-148"},"4e31-151":{"renderedLength":5332,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-150"},"4e31-153":{"renderedLength":3434,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-152"},"4e31-155":{"renderedLength":1209,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-154"},"4e31-157":{"renderedLength":821,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-156"},"4e31-159":{"renderedLength":185,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-158"},"4e31-161":{"renderedLength":253,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-160"},"4e31-163":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-162"},"4e31-165":{"renderedLength":365,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-164"},"4e31-167":{"renderedLength":125,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-166"},"4e31-169":{"renderedLength":1382,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-168"},"4e31-171":{"renderedLength":2873,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-170"},"4e31-173":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-172"},"4e31-175":{"renderedLength":265,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-174"},"4e31-177":{"renderedLength":304,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-176"},"4e31-179":{"renderedLength":593,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-178"},"4e31-181":{"renderedLength":168,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-180"},"4e31-183":{"renderedLength":646,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-182"},"4e31-185":{"renderedLength":97,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-184"},"4e31-187":{"renderedLength":191,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-186"},"4e31-189":{"renderedLength":682,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-188"},"4e31-191":{"renderedLength":223,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-190"},"4e31-193":{"renderedLength":378,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-192"},"4e31-195":{"renderedLength":399,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-194"},"4e31-197":{"renderedLength":525,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-196"},"4e31-199":{"renderedLength":77,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-198"},"4e31-201":{"renderedLength":799,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-200"},"4e31-203":{"renderedLength":86,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-202"},"4e31-205":{"renderedLength":2898,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-204"},"4e31-207":{"renderedLength":121,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-206"},"4e31-209":{"renderedLength":569,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-208"},"4e31-211":{"renderedLength":657,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-210"},"4e31-213":{"renderedLength":422,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-212"},"4e31-215":{"renderedLength":715,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-214"},"4e31-217":{"renderedLength":144,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-216"},"4e31-219":{"renderedLength":62,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-218"},"4e31-221":{"renderedLength":294,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-220"},"4e31-223":{"renderedLength":110,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-222"},"4e31-225":{"renderedLength":58,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-224"},"4e31-227":{"renderedLength":324,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-226"},"4e31-229":{"renderedLength":1499,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-228"},"4e31-231":{"renderedLength":148,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-230"},"4e31-233":{"renderedLength":932,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-232"},"4e31-235":{"renderedLength":633,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-234"},"4e31-237":{"renderedLength":1884,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-236"},"4e31-239":{"renderedLength":518,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-238"},"4e31-241":{"renderedLength":510,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-240"},"4e31-243":{"renderedLength":154,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-242"},"4e31-245":{"renderedLength":187,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-244"},"4e31-247":{"renderedLength":222,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-246"},"4e31-249":{"renderedLength":426,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-248"},"4e31-251":{"renderedLength":172,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-250"},"4e31-253":{"renderedLength":472,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-252"},"4e31-255":{"renderedLength":125,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-254"},"4e31-257":{"renderedLength":2299,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-256"},"4e31-259":{"renderedLength":922,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-258"},"4e31-261":{"renderedLength":269,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-260"},"4e31-263":{"renderedLength":1357,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-262"},"4e31-265":{"renderedLength":202,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-264"},"4e31-267":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-266"},"4e31-269":{"renderedLength":158,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-268"},"4e31-271":{"renderedLength":712,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-270"},"4e31-273":{"renderedLength":211,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-272"},"4e31-275":{"renderedLength":287,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-274"},"4e31-277":{"renderedLength":921,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-276"},"4e31-279":{"renderedLength":44,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-278"},"4e31-281":{"renderedLength":1083,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-280"},"4e31-283":{"renderedLength":5593,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-282"},"4e31-285":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-284"},"4e31-287":{"renderedLength":356,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-286"},"4e31-289":{"renderedLength":11353,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-288"},"4e31-291":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-290"},"4e31-293":{"renderedLength":602,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-292"},"4e31-295":{"renderedLength":339,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-294"},"4e31-297":{"renderedLength":44,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-296"},"4e31-299":{"renderedLength":581,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-298"},"4e31-301":{"renderedLength":1211,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-300"},"4e31-303":{"renderedLength":381,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-302"},"4e31-305":{"renderedLength":394,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-304"},"4e31-307":{"renderedLength":186,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-306"},"4e31-309":{"renderedLength":131,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-308"},"4e31-311":{"renderedLength":439,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-310"},"4e31-313":{"renderedLength":1233,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-312"},"4e31-315":{"renderedLength":526,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-314"},"4e31-317":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-316"},"4e31-319":{"renderedLength":763,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-318"},"4e31-321":{"renderedLength":650,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-320"},"4e31-323":{"renderedLength":2180,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-322"},"4e31-325":{"renderedLength":1557,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-324"},"4e31-327":{"renderedLength":2856,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-326"},"4e31-329":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-328"},"4e31-331":{"renderedLength":238,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-330"},"4e31-333":{"renderedLength":3680,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-332"},"4e31-335":{"renderedLength":653,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-334"},"4e31-337":{"renderedLength":121,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-336"},"4e31-339":{"renderedLength":1819,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-338"},"4e31-341":{"renderedLength":216,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-340"},"4e31-343":{"renderedLength":2478,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-342"},"4e31-345":{"renderedLength":1242,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-344"},"4e31-347":{"renderedLength":471,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-346"},"4e31-349":{"renderedLength":495,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-348"},"4e31-351":{"renderedLength":329,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-350"},"4e31-353":{"renderedLength":371,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-352"},"4e31-355":{"renderedLength":549,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-354"},"4e31-357":{"renderedLength":673,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-356"},"4e31-359":{"renderedLength":691,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-358"},"4e31-361":{"renderedLength":334,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-360"},"4e31-363":{"renderedLength":786,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-362"},"4e31-365":{"renderedLength":847,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-364"},"4e31-367":{"renderedLength":154,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-366"},"4e31-369":{"renderedLength":2318,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-368"},"4e31-371":{"renderedLength":827,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-370"},"4e31-373":{"renderedLength":453,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-372"},"4e31-375":{"renderedLength":680,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-374"},"4e31-377":{"renderedLength":657,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-376"},"4e31-379":{"renderedLength":628,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-378"},"4e31-381":{"renderedLength":1411,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-380"},"4e31-383":{"renderedLength":29,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-382"},"4e31-385":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-384"},"4e31-387":{"renderedLength":106,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-386"},"4e31-389":{"renderedLength":1000,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-388"},"4e31-391":{"renderedLength":126,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-390"},"4e31-393":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-392"},"4e31-395":{"renderedLength":44,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-394"},"4e31-397":{"renderedLength":495,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-396"},"4e31-399":{"renderedLength":1505,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-398"},"4e31-401":{"renderedLength":189,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-400"},"4e31-403":{"renderedLength":15676,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-402"},"4e31-405":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-404"},"4e31-407":{"renderedLength":17587,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-406"},"4e31-409":{"renderedLength":6131,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-408"},"4e31-411":{"renderedLength":7026,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-410"},"4e31-413":{"renderedLength":3034,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-412"},"4e31-415":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-414"},"4e31-417":{"renderedLength":662,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-416"},"4e31-419":{"renderedLength":3613,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-418"},"4e31-421":{"renderedLength":1737,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-420"},"4e31-423":{"renderedLength":654,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-422"},"4e31-425":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-424"},"4e31-427":{"renderedLength":128,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-426"},"4e31-429":{"renderedLength":3806,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-428"},"4e31-431":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-430"},"4e31-433":{"renderedLength":105,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-432"},"4e31-435":{"renderedLength":96,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-434"},"4e31-437":{"renderedLength":157,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-436"},"4e31-439":{"renderedLength":11688,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-438"},"4e31-441":{"renderedLength":863,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-440"},"4e31-443":{"renderedLength":242,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-442"},"4e31-445":{"renderedLength":982,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-444"},"4e31-447":{"renderedLength":8459,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-446"},"4e31-449":{"renderedLength":4204,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-448"},"4e31-451":{"renderedLength":7511,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-450"},"4e31-453":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-452"},"4e31-455":{"renderedLength":699,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-454"},"4e31-457":{"renderedLength":10083,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-456"},"4e31-459":{"renderedLength":1480,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-458"},"4e31-461":{"renderedLength":97,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-460"},"4e31-463":{"renderedLength":620,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-462"},"4e31-465":{"renderedLength":552,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-464"},"4e31-467":{"renderedLength":937,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-466"},"4e31-469":{"renderedLength":578,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-468"},"4e31-471":{"renderedLength":403,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-470"},"4e31-473":{"renderedLength":88,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-472"},"4e31-475":{"renderedLength":64,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-474"},"4e31-477":{"renderedLength":482,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-476"},"4e31-479":{"renderedLength":549,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-478"},"4e31-481":{"renderedLength":1471,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-480"},"4e31-483":{"renderedLength":1320,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-482"},"4e31-485":{"renderedLength":467,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-484"},"4e31-487":{"renderedLength":498,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-486"},"4e31-489":{"renderedLength":578,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-488"},"4e31-491":{"renderedLength":214,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-490"},"4e31-493":{"renderedLength":679253,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-492"},"4e31-495":{"renderedLength":10739,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-494"},"4e31-497":{"renderedLength":11194,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-496"},"4e31-499":{"renderedLength":9721,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-498"},"4e31-501":{"renderedLength":4657,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-500"},"4e31-503":{"renderedLength":1731,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-502"},"4e31-505":{"renderedLength":1922,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-504"},"4e31-507":{"renderedLength":8957,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-506"},"4e31-509":{"renderedLength":403,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-508"},"4e31-511":{"renderedLength":3207,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-510"},"4e31-513":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-512"},"4e31-515":{"renderedLength":6373,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-514"},"4e31-517":{"renderedLength":1107,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-516"},"4e31-519":{"renderedLength":11211,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-518"},"4e31-521":{"renderedLength":767,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-520"},"4e31-523":{"renderedLength":1034,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-522"},"4e31-525":{"renderedLength":692,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-524"},"4e31-527":{"renderedLength":399,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-526"},"4e31-529":{"renderedLength":1083,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-528"},"4e31-531":{"renderedLength":8566,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-530"},"4e31-533":{"renderedLength":15757,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-532"},"4e31-535":{"renderedLength":16944,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-534"},"4e31-537":{"renderedLength":281,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-536"},"4e31-539":{"renderedLength":5426,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-538"},"4e31-541":{"renderedLength":833,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-540"},"4e31-543":{"renderedLength":254,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-542"},"4e31-545":{"renderedLength":327,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-544"},"4e31-547":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-546"},"4e31-549":{"renderedLength":270,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-548"},"4e31-551":{"renderedLength":170,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-550"},"4e31-553":{"renderedLength":133,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-552"},"4e31-555":{"renderedLength":187,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-554"},"4e31-557":{"renderedLength":93,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-556"},"4e31-559":{"renderedLength":237,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-558"},"4e31-561":{"renderedLength":205,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-560"},"4e31-563":{"renderedLength":69,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-562"},"4e31-565":{"renderedLength":690,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-564"},"4e31-567":{"renderedLength":224,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-566"},"4e31-569":{"renderedLength":438,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-568"},"4e31-571":{"renderedLength":134,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-570"},"4e31-573":{"renderedLength":215,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-572"},"4e31-575":{"renderedLength":827,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-574"},"4e31-577":{"renderedLength":2995,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-576"},"4e31-579":{"renderedLength":21674,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-578"},"4e31-581":{"renderedLength":6181,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-580"},"4e31-583":{"renderedLength":6034,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-582"},"4e31-585":{"renderedLength":6781,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-584"},"4e31-587":{"renderedLength":1929,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-586"},"4e31-589":{"renderedLength":1128,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-588"},"4e31-591":{"renderedLength":21025,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-590"},"4e31-593":{"renderedLength":642,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-592"},"4e31-595":{"renderedLength":3030,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-594"},"4e31-597":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-596"},"4e31-599":{"renderedLength":3031,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-598"},"4e31-601":{"renderedLength":941,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-600"},"4e31-603":{"renderedLength":8598,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-602"},"4e31-605":{"renderedLength":3232,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-604"},"4e31-607":{"renderedLength":1929,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-606"},"4e31-609":{"renderedLength":3202,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-608"},"4e31-611":{"renderedLength":2056,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-610"},"4e31-613":{"renderedLength":86,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-612"},"4e31-615":{"renderedLength":2933,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-614"},"4e31-617":{"renderedLength":2018,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-616"},"4e31-619":{"renderedLength":3538,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-618"},"4e31-621":{"renderedLength":4851,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-620"},"4e31-623":{"renderedLength":3248,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-622"},"4e31-625":{"renderedLength":6289,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-624"},"4e31-627":{"renderedLength":182,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-626"},"4e31-629":{"renderedLength":3922,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-628"},"4e31-631":{"renderedLength":3465,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-630"},"4e31-633":{"renderedLength":2825,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-632"},"4e31-635":{"renderedLength":6062,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-634"},"4e31-637":{"renderedLength":2031,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-636"},"4e31-639":{"renderedLength":7347,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-638"},"4e31-641":{"renderedLength":1328,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-640"},"4e31-643":{"renderedLength":4251,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-642"},"4e31-645":{"renderedLength":2970,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-644"},"4e31-647":{"renderedLength":2693,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-646"},"4e31-649":{"renderedLength":6696,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-648"},"4e31-651":{"renderedLength":3836,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-650"},"4e31-653":{"renderedLength":403,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-652"},"4e31-655":{"renderedLength":10067,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-654"},"4e31-657":{"renderedLength":2308,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-656"},"4e31-659":{"renderedLength":1876,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-658"},"4e31-661":{"renderedLength":2883,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-660"},"4e31-663":{"renderedLength":1895,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-662"},"4e31-665":{"renderedLength":2709,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-664"},"4e31-667":{"renderedLength":2764,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-666"},"4e31-669":{"renderedLength":2457,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-668"},"4e31-671":{"renderedLength":4696,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-670"},"4e31-673":{"renderedLength":4300,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-672"},"4e31-675":{"renderedLength":12022,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-674"},"4e31-677":{"renderedLength":1159,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-676"},"4e31-679":{"renderedLength":2007,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-678"},"4e31-681":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-680"},"4e31-683":{"renderedLength":10096,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-682"},"4e31-685":{"renderedLength":9432,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-684"},"4e31-687":{"renderedLength":27306,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-686"},"4e31-689":{"renderedLength":6335,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-688"},"4e31-691":{"renderedLength":3330,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-690"},"4e31-693":{"renderedLength":1552,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-692"},"4e31-695":{"renderedLength":1437,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-694"},"4e31-697":{"renderedLength":7478,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-696"},"4e31-699":{"renderedLength":2216,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-698"},"4e31-701":{"renderedLength":470,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-700"},"4e31-703":{"renderedLength":12688,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-702"},"4e31-705":{"renderedLength":163,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-704"},"4e31-707":{"renderedLength":193,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-706"},"4e31-709":{"renderedLength":332,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-708"},"4e31-711":{"renderedLength":3121,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-710"},"4e31-713":{"renderedLength":4262,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-712"},"4e31-715":{"renderedLength":536,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-714"},"4e31-717":{"renderedLength":1986,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-716"},"4e31-719":{"renderedLength":8624,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-718"},"4e31-721":{"renderedLength":3274,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-720"},"4e31-723":{"renderedLength":4267,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-722"},"4e31-725":{"renderedLength":5841,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-724"},"4e31-727":{"renderedLength":4363,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-726"},"4e31-729":{"renderedLength":18055,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-728"},"4e31-731":{"renderedLength":729,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-730"},"4e31-733":{"renderedLength":7522,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-732"},"4e31-735":{"renderedLength":7074,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-734"},"4e31-737":{"renderedLength":858,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-736"},"4e31-739":{"renderedLength":10287,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-738"},"4e31-741":{"renderedLength":574,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-740"},"4e31-743":{"renderedLength":6716,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-742"},"4e31-745":{"renderedLength":6149,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-744"},"4e31-747":{"renderedLength":7196,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-746"},"4e31-749":{"renderedLength":2887,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-748"},"4e31-751":{"renderedLength":4747,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-750"},"4e31-753":{"renderedLength":7652,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-752"},"4e31-755":{"renderedLength":1851,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-754"},"4e31-757":{"renderedLength":3091,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-756"},"4e31-759":{"renderedLength":13426,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-758"},"4e31-761":{"renderedLength":1222,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-760"},"4e31-763":{"renderedLength":2014,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-762"},"4e31-765":{"renderedLength":4013,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-764"},"4e31-767":{"renderedLength":1111,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-766"},"4e31-769":{"renderedLength":370,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-768"},"4e31-771":{"renderedLength":8954,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-770"},"4e31-773":{"renderedLength":13030,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-772"},"4e31-775":{"renderedLength":15028,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-774"},"4e31-777":{"renderedLength":4712,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-776"},"4e31-779":{"renderedLength":426,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-778"},"4e31-781":{"renderedLength":5799,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-780"},"4e31-783":{"renderedLength":5850,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-782"},"4e31-785":{"renderedLength":7542,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-784"},"4e31-787":{"renderedLength":722,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-786"},"4e31-789":{"renderedLength":16062,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-788"},"4e31-791":{"renderedLength":9387,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-790"},"4e31-793":{"renderedLength":2249,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-792"},"4e31-795":{"renderedLength":12482,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-794"},"4e31-797":{"renderedLength":4163,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-796"},"4e31-799":{"renderedLength":7975,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-798"},"4e31-801":{"renderedLength":3257,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-800"},"4e31-803":{"renderedLength":3123,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-802"},"4e31-805":{"renderedLength":362,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-804"},"4e31-807":{"renderedLength":2836,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-806"},"4e31-809":{"renderedLength":2951,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-808"},"4e31-811":{"renderedLength":3640,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-810"},"4e31-813":{"renderedLength":2362,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-812"},"4e31-815":{"renderedLength":15133,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-814"},"4e31-817":{"renderedLength":1518,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-816"},"4e31-819":{"renderedLength":3105,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-818"},"4e31-821":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-820"},"4e31-823":{"renderedLength":9342,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-822"},"4e31-825":{"renderedLength":6975,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-824"},"4e31-827":{"renderedLength":813,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-826"},"4e31-829":{"renderedLength":1439,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-828"},"4e31-831":{"renderedLength":2034,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-830"},"4e31-833":{"renderedLength":2964,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-832"},"4e31-835":{"renderedLength":7518,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-834"},"4e31-837":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-836"},"4e31-839":{"renderedLength":3398,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-838"},"4e31-841":{"renderedLength":1951,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-840"},"4e31-843":{"renderedLength":1010,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-842"},"4e31-845":{"renderedLength":2217,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-844"},"4e31-847":{"renderedLength":637,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-846"},"4e31-849":{"renderedLength":1636,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-848"},"4e31-851":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-850"},"4e31-853":{"renderedLength":1721,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-852"},"4e31-855":{"renderedLength":1199,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-854"},"4e31-857":{"renderedLength":7978,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-856"},"4e31-859":{"renderedLength":218,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-858"},"4e31-861":{"renderedLength":987,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-860"},"4e31-863":{"renderedLength":565,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-862"},"4e31-865":{"renderedLength":958,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-864"},"4e31-867":{"renderedLength":6419,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-866"},"4e31-869":{"renderedLength":530,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-868"},"4e31-871":{"renderedLength":408,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-870"},"4e31-873":{"renderedLength":587,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-872"},"4e31-875":{"renderedLength":5104,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-874"},"4e31-877":{"renderedLength":737,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-876"},"4e31-879":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-878"},"4e31-881":{"renderedLength":842,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-880"},"4e31-883":{"renderedLength":1307,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-882"},"4e31-885":{"renderedLength":1672,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-884"},"4e31-887":{"renderedLength":6405,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-886"},"4e31-889":{"renderedLength":2577,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-888"},"4e31-891":{"renderedLength":1235,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-890"},"4e31-893":{"renderedLength":3090,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-892"},"4e31-895":{"renderedLength":165,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-894"},"4e31-897":{"renderedLength":299,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-896"},"4e31-899":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-898"},"4e31-901":{"renderedLength":173,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-900"},"4e31-903":{"renderedLength":1747,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-902"},"4e31-905":{"renderedLength":5822,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-904"},"4e31-907":{"renderedLength":5888,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-906"},"4e31-909":{"renderedLength":607,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-908"},"4e31-911":{"renderedLength":494,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-910"},"4e31-913":{"renderedLength":1602,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-912"},"4e31-915":{"renderedLength":366,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-914"},"4e31-917":{"renderedLength":1184,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-916"},"4e31-919":{"renderedLength":557,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-918"},"4e31-921":{"renderedLength":371,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-920"},"4e31-923":{"renderedLength":1744,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-922"},"4e31-925":{"renderedLength":1311,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-924"},"4e31-927":{"renderedLength":1167,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-926"},"4e31-929":{"renderedLength":1852,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-928"},"4e31-931":{"renderedLength":266,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-930"},"4e31-933":{"renderedLength":75,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-932"},"4e31-935":{"renderedLength":768,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-934"},"4e31-937":{"renderedLength":259,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-936"},"4e31-939":{"renderedLength":237,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-938"},"4e31-941":{"renderedLength":562,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-940"},"4e31-943":{"renderedLength":12107,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-942"},"4e31-945":{"renderedLength":167,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-944"},"4e31-947":{"renderedLength":599,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-946"},"4e31-949":{"renderedLength":1114,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-948"},"4e31-951":{"renderedLength":1167,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-950"},"4e31-953":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-952"},"4e31-955":{"renderedLength":1770,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-954"},"4e31-957":{"renderedLength":6170,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-956"},"4e31-959":{"renderedLength":766,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-958"},"4e31-961":{"renderedLength":2558,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-960"},"4e31-963":{"renderedLength":1484,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-962"},"4e31-965":{"renderedLength":2245,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-964"},"4e31-967":{"renderedLength":4241,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-966"},"4e31-969":{"renderedLength":1939,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-968"},"4e31-971":{"renderedLength":9761,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-970"},"4e31-973":{"renderedLength":1374,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-972"},"4e31-975":{"renderedLength":3216,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-974"},"4e31-977":{"renderedLength":267,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-976"},"4e31-979":{"renderedLength":1645,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-978"},"4e31-981":{"renderedLength":568,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-980"},"4e31-983":{"renderedLength":12375,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-982"},"4e31-985":{"renderedLength":352,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-984"},"4e31-987":{"renderedLength":13753,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-986"},"4e31-989":{"renderedLength":10228,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-988"},"4e31-991":{"renderedLength":2381,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-990"},"4e31-993":{"renderedLength":679,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-992"},"4e31-995":{"renderedLength":418,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-994"},"4e31-997":{"renderedLength":1403,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-996"},"4e31-999":{"renderedLength":1476,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-998"},"4e31-1001":{"renderedLength":5831,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1000"},"4e31-1003":{"renderedLength":741,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1002"},"4e31-1005":{"renderedLength":3884,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1004"},"4e31-1007":{"renderedLength":2606,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1006"},"4e31-1009":{"renderedLength":1342,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1008"},"4e31-1011":{"renderedLength":1566,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1010"},"4e31-1013":{"renderedLength":1319,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1012"},"4e31-1015":{"renderedLength":4216,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1014"},"4e31-1017":{"renderedLength":443,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1016"},"4e31-1019":{"renderedLength":637,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1018"},"4e31-1021":{"renderedLength":647,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1020"},"4e31-1023":{"renderedLength":1971,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1022"},"4e31-1025":{"renderedLength":5156,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1024"},"4e31-1027":{"renderedLength":5007,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1026"},"4e31-1029":{"renderedLength":672,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1028"},"4e31-1031":{"renderedLength":2292,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1030"},"4e31-1033":{"renderedLength":3896,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1032"},"4e31-1035":{"renderedLength":1531,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1034"},"4e31-1037":{"renderedLength":2086,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1036"},"4e31-1039":{"renderedLength":361,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1038"},"4e31-1041":{"renderedLength":3831,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1040"},"4e31-1043":{"renderedLength":8900,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1042"},"4e31-1045":{"renderedLength":2736,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1044"},"4e31-1047":{"renderedLength":1621,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1046"},"4e31-1049":{"renderedLength":4350,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1048"},"4e31-1051":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1050"},"4e31-1053":{"renderedLength":279,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1052"},"4e31-1055":{"renderedLength":468,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1054"},"4e31-1057":{"renderedLength":1353,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1056"},"4e31-1059":{"renderedLength":5368,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1058"},"4e31-1061":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1060"},"4e31-1063":{"renderedLength":1086,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1062"},"4e31-1065":{"renderedLength":339,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1064"},"4e31-1067":{"renderedLength":302,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1066"},"4e31-1069":{"renderedLength":605,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1068"},"4e31-1071":{"renderedLength":89,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1070"},"4e31-1073":{"renderedLength":1204,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1072"},"4e31-1075":{"renderedLength":177,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1074"},"4e31-1077":{"renderedLength":3009,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1076"},"4e31-1079":{"renderedLength":1816,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1078"},"4e31-1081":{"renderedLength":5470,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1080"},"4e31-1083":{"renderedLength":2570,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1082"},"4e31-1085":{"renderedLength":1537,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1084"},"4e31-1087":{"renderedLength":143,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1086"},"4e31-1089":{"renderedLength":390,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1088"},"4e31-1091":{"renderedLength":2649,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1090"},"4e31-1093":{"renderedLength":2523,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1092"},"4e31-1095":{"renderedLength":3457,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1094"},"4e31-1097":{"renderedLength":5808,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1096"},"4e31-1099":{"renderedLength":351,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1098"},"4e31-1101":{"renderedLength":7896,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1100"},"4e31-1103":{"renderedLength":8325,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1102"},"4e31-1105":{"renderedLength":11180,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1104"},"4e31-1107":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1106"},"4e31-1109":{"renderedLength":8615,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1108"},"4e31-1111":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1110"},"4e31-1113":{"renderedLength":9712,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1112"},"4e31-1115":{"renderedLength":615,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1114"},"4e31-1117":{"renderedLength":309,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1116"},"4e31-1119":{"renderedLength":194,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1118"},"4e31-1121":{"renderedLength":288,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1120"},"4e31-1123":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1122"},"4e31-1125":{"renderedLength":1396,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1124"},"4e31-1127":{"renderedLength":1503,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1126"},"4e31-1129":{"renderedLength":2366,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1128"},"4e31-1131":{"renderedLength":2422,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1130"},"4e31-1133":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1132"},"4e31-1135":{"renderedLength":1239,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1134"},"4e31-1137":{"renderedLength":12315,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1136"},"4e31-1139":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1138"},"4e31-1141":{"renderedLength":529,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1140"},"4e31-1143":{"renderedLength":709,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1142"},"4e31-1145":{"renderedLength":1400,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1144"},"4e31-1147":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1146"},"4e31-1149":{"renderedLength":4303,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1148"},"4e31-1151":{"renderedLength":1167,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1150"},"4e31-1153":{"renderedLength":106,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1152"},"4e31-1155":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1154"},"4e31-1157":{"renderedLength":760,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1156"},"4e31-1159":{"renderedLength":493,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1158"},"4e31-1161":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1160"},"4e31-1163":{"renderedLength":401,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1162"},"4e31-1165":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1164"},"4e31-1167":{"renderedLength":1819,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1166"},"4e31-1169":{"renderedLength":1761,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1168"},"4e31-1171":{"renderedLength":1481,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1170"},"4e31-1173":{"renderedLength":475,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1172"},"4e31-1175":{"renderedLength":343,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1174"},"4e31-1177":{"renderedLength":25835,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1176"},"4e31-1179":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1178"},"4e31-1181":{"renderedLength":16490,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1180"},"4e31-1183":{"renderedLength":3069,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1182"},"4e31-1185":{"renderedLength":295,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1184"},"4e31-1187":{"renderedLength":10590,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1186"},"4e31-1189":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1188"},"4e31-1191":{"renderedLength":994,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1190"},"4e31-1193":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1192"},"4e31-1195":{"renderedLength":1764,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1194"},"4e31-1197":{"renderedLength":617,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1196"},"4e31-1199":{"renderedLength":1182,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1198"},"4e31-1201":{"renderedLength":256,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1200"},"4e31-1203":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1202"},"4e31-1205":{"renderedLength":264,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1204"},"4e31-1207":{"renderedLength":302,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1206"},"4e31-1209":{"renderedLength":199,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1208"},"4e31-1211":{"renderedLength":790,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1210"},"4e31-1213":{"renderedLength":53,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1212"},"4e31-1215":{"renderedLength":2292,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1214"},"4e31-1217":{"renderedLength":3972,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1216"},"4e31-1219":{"renderedLength":358,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1218"},"4e31-1221":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1220"},"4e31-1223":{"renderedLength":520,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1222"},"4e31-1225":{"renderedLength":504,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1224"},"4e31-1227":{"renderedLength":2350,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1226"},"4e31-1229":{"renderedLength":4494,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1228"},"4e31-1231":{"renderedLength":204,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1230"},"4e31-1233":{"renderedLength":1966,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1232"},"4e31-1235":{"renderedLength":981,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1234"},"4e31-1237":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1236"},"4e31-1239":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1238"},"4e31-1241":{"renderedLength":8521,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1240"},"4e31-1243":{"renderedLength":7574,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1242"},"4e31-1245":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1244"},"4e31-1247":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1246"},"4e31-1249":{"renderedLength":434,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1248"},"4e31-1251":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1250"},"4e31-1253":{"renderedLength":975,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1252"},"4e31-1255":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1254"},"4e31-1257":{"renderedLength":611,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1256"},"4e31-1259":{"renderedLength":379,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1258"},"4e31-1261":{"renderedLength":308,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1260"},"4e31-1263":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1262"},"4e31-1265":{"renderedLength":5319,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1264"},"4e31-1267":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1266"},"4e31-1269":{"renderedLength":1678,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1268"},"4e31-1271":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1270"},"4e31-1273":{"renderedLength":1287,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1272"},"4e31-1275":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1274"},"4e31-1277":{"renderedLength":3224,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1276"},"4e31-1279":{"renderedLength":6047,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1278"},"4e31-1281":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1280"},"4e31-1283":{"renderedLength":8621,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1282"},"4e31-1285":{"renderedLength":1030,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1284"},"4e31-1287":{"renderedLength":1348,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1286"},"4e31-1289":{"renderedLength":1116,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1288"},"4e31-1291":{"renderedLength":5152,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1290"},"4e31-1293":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1292"},"4e31-1295":{"renderedLength":4166,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1294"},"4e31-1297":{"renderedLength":249,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1296"},"4e31-1299":{"renderedLength":1932,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1298"},"4e31-1301":{"renderedLength":913,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1300"},"4e31-1303":{"renderedLength":228,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1302"},"4e31-1305":{"renderedLength":916,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1304"},"4e31-1307":{"renderedLength":2113,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1306"},"4e31-1309":{"renderedLength":517,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1308"},"4e31-1311":{"renderedLength":1670,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1310"},"4e31-1313":{"renderedLength":11694,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1312"},"4e31-1315":{"renderedLength":1233,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1314"},"4e31-1317":{"renderedLength":243,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1316"},"4e31-1319":{"renderedLength":638,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1318"},"4e31-1321":{"renderedLength":15496,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1320"},"4e31-1323":{"renderedLength":687,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1322"},"4e31-1325":{"renderedLength":841,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1324"},"4e31-1327":{"renderedLength":14977,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1326"},"4e31-1329":{"renderedLength":787,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1328"},"4e31-1331":{"renderedLength":6550,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1330"},"4e31-1333":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1332"},"4e31-1335":{"renderedLength":538,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1334"},"4e31-1337":{"renderedLength":194,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1336"},"4e31-1339":{"renderedLength":415,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1338"},"4e31-1341":{"renderedLength":2218,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1340"},"4e31-1343":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1342"},"4e31-1345":{"renderedLength":3749,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1344"},"4e31-1347":{"renderedLength":675,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1346"},"4e31-1349":{"renderedLength":2880,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1348"},"4e31-1351":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1350"},"4e31-1353":{"renderedLength":4201,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1352"},"4e31-1355":{"renderedLength":215,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1354"},"4e31-1357":{"renderedLength":689,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1356"},"4e31-1359":{"renderedLength":8037,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1358"},"4e31-1361":{"renderedLength":341,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1360"},"4e31-1363":{"renderedLength":277,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1362"},"4e31-1365":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1364"},"4e31-1367":{"renderedLength":12969,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1366"},"4e31-1369":{"renderedLength":9417,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1368"},"4e31-1371":{"renderedLength":13575,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1370"},"4e31-1373":{"renderedLength":286,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1372"},"4e31-1375":{"renderedLength":5103,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1374"},"4e31-1377":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1376"},"4e31-1379":{"renderedLength":1337,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1378"},"4e31-1381":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1380"},"4e31-1383":{"renderedLength":32,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1382"},"4e31-1385":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1384"},"4e31-1387":{"renderedLength":694,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1386"},"4e31-1389":{"renderedLength":477,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1388"},"4e31-1391":{"renderedLength":892,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1390"},"4e31-1393":{"renderedLength":492,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1392"},"4e31-1395":{"renderedLength":322,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1394"},"4e31-1397":{"renderedLength":3282,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1396"},"4e31-1399":{"renderedLength":4441,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1398"},"4e31-1401":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1400"},"4e31-1403":{"renderedLength":3280,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1402"},"4e31-1405":{"renderedLength":208,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1404"},"4e31-1407":{"renderedLength":2237,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1406"},"4e31-1409":{"renderedLength":259,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1408"},"4e31-1411":{"renderedLength":2490,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1410"},"4e31-1413":{"renderedLength":322,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1412"},"4e31-1415":{"renderedLength":2556,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1414"},"4e31-1417":{"renderedLength":1736,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1416"},"4e31-1419":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1418"},"4e31-1421":{"renderedLength":111,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1420"},"4e31-1423":{"renderedLength":107,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1422"},"4e31-1425":{"renderedLength":956,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1424"},"4e31-1427":{"renderedLength":8117,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1426"},"4e31-1429":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1428"},"4e31-1431":{"renderedLength":1216,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1430"},"4e31-1433":{"renderedLength":483,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1432"},"4e31-1435":{"renderedLength":17035,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1434"},"4e31-1437":{"renderedLength":1356,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1436"},"4e31-1439":{"renderedLength":7930,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1438"},"4e31-1441":{"renderedLength":8753,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1440"},"4e31-1443":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1442"},"4e31-1445":{"renderedLength":1666,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1444"},"4e31-1447":{"renderedLength":4682,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1446"},"4e31-1449":{"renderedLength":3121,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1448"},"4e31-1451":{"renderedLength":1522,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1450"},"4e31-1453":{"renderedLength":823,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1452"},"4e31-1455":{"renderedLength":4800,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1454"},"4e31-1457":{"renderedLength":2897,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1456"},"4e31-1459":{"renderedLength":1500,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1458"},"4e31-1461":{"renderedLength":775,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1460"},"4e31-1463":{"renderedLength":909,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1462"},"4e31-1465":{"renderedLength":8528,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1464"},"4e31-1467":{"renderedLength":4189,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1466"},"4e31-1469":{"renderedLength":1600,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1468"},"4e31-1471":{"renderedLength":792,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1470"},"4e31-1473":{"renderedLength":3244,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1472"},"4e31-1475":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1474"},"4e31-1477":{"renderedLength":2370,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1476"},"4e31-1479":{"renderedLength":2243,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1478"},"4e31-1481":{"renderedLength":9181,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1480"},"4e31-1483":{"renderedLength":12436,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1482"},"4e31-1485":{"renderedLength":2647,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1484"},"4e31-1487":{"renderedLength":13975,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1486"},"4e31-1489":{"renderedLength":13651,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1488"},"4e31-1491":{"renderedLength":12947,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1490"},"4e31-1493":{"renderedLength":30906,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1492"},"4e31-1495":{"renderedLength":20374,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1494"},"4e31-1497":{"renderedLength":3118,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1496"},"4e31-1499":{"renderedLength":10173,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1498"},"4e31-1501":{"renderedLength":6696,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1500"},"4e31-1503":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1502"},"4e31-1505":{"renderedLength":2126,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1504"},"4e31-1507":{"renderedLength":1319,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1506"},"4e31-1509":{"renderedLength":8530,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1508"},"4e31-1511":{"renderedLength":4884,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1510"},"4e31-1513":{"renderedLength":12075,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1512"},"4e31-1515":{"renderedLength":13238,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1514"},"4e31-1517":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1516"},"4e31-1519":{"renderedLength":10617,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1518"},"4e31-1521":{"renderedLength":22014,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1520"},"4e31-1523":{"renderedLength":1593,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1522"},"4e31-1525":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1524"},"4e31-1527":{"renderedLength":4488,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1526"},"4e31-1529":{"renderedLength":3614,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1528"},"4e31-1531":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1530"},"4e31-1533":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1532"},"4e31-1535":{"renderedLength":10121,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1534"},"4e31-1537":{"renderedLength":655,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1536"},"4e31-1539":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1538"},"4e31-1541":{"renderedLength":130,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1540"},"4e31-1543":{"renderedLength":107,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1542"},"4e31-1545":{"renderedLength":98,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1544"},"4e31-1547":{"renderedLength":120,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1546"},"4e31-1549":{"renderedLength":162,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1548"},"4e31-1551":{"renderedLength":867,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1550"},"4e31-1553":{"renderedLength":990,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1552"},"4e31-1555":{"renderedLength":5652,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1554"},"4e31-1557":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1556"},"4e31-1559":{"renderedLength":636,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1558"},"4e31-1561":{"renderedLength":553,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1560"},"4e31-1563":{"renderedLength":581,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1562"},"4e31-1565":{"renderedLength":404,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1564"},"4e31-1567":{"renderedLength":67,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1566"},"4e31-1569":{"renderedLength":487,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1568"},"4e31-1571":{"renderedLength":148,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1570"},"4e31-1573":{"renderedLength":585,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1572"},"4e31-1575":{"renderedLength":216,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1574"},"4e31-1577":{"renderedLength":3408,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1576"},"4e31-1579":{"renderedLength":1952,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1578"},"4e31-1581":{"renderedLength":1015,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1580"},"4e31-1583":{"renderedLength":2245,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1582"},"4e31-1585":{"renderedLength":641,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1584"},"4e31-1587":{"renderedLength":1640,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1586"},"4e31-1589":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1588"},"4e31-1591":{"renderedLength":1725,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1590"},"4e31-1593":{"renderedLength":1202,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1592"},"4e31-1595":{"renderedLength":8038,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1594"},"4e31-1597":{"renderedLength":220,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1596"},"4e31-1599":{"renderedLength":993,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1598"},"4e31-1601":{"renderedLength":568,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1600"},"4e31-1603":{"renderedLength":959,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1602"},"4e31-1605":{"renderedLength":6432,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1604"},"4e31-1607":{"renderedLength":536,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1606"},"4e31-1609":{"renderedLength":413,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1608"},"4e31-1611":{"renderedLength":589,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1610"},"4e31-1613":{"renderedLength":5117,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1612"},"4e31-1615":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1614"},"4e31-1617":{"renderedLength":6412,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1616"},"4e31-1619":{"renderedLength":2633,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1618"},"4e31-1621":{"renderedLength":1237,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1620"},"4e31-1623":{"renderedLength":3099,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1622"},"4e31-1625":{"renderedLength":166,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1624"},"4e31-1627":{"renderedLength":300,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1626"},"4e31-1629":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1628"},"4e31-1631":{"renderedLength":174,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1630"},"4e31-1633":{"renderedLength":1752,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1632"},"4e31-1635":{"renderedLength":5823,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1634"},"4e31-1637":{"renderedLength":5896,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1636"},"4e31-1639":{"renderedLength":619,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1638"},"4e31-1641":{"renderedLength":504,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1640"},"4e31-1643":{"renderedLength":1606,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1642"},"4e31-1645":{"renderedLength":369,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1644"},"4e31-1647":{"renderedLength":1193,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1646"},"4e31-1649":{"renderedLength":562,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1648"},"4e31-1651":{"renderedLength":378,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1650"},"4e31-1653":{"renderedLength":1770,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1652"},"4e31-1655":{"renderedLength":1317,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1654"},"4e31-1657":{"renderedLength":1174,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1656"},"4e31-1659":{"renderedLength":1857,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1658"},"4e31-1661":{"renderedLength":267,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1660"},"4e31-1663":{"renderedLength":76,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1662"},"4e31-1665":{"renderedLength":770,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1664"},"4e31-1667":{"renderedLength":260,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1666"},"4e31-1669":{"renderedLength":237,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1668"},"4e31-1671":{"renderedLength":562,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1670"},"4e31-1673":{"renderedLength":12103,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1672"},"4e31-1675":{"renderedLength":167,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1674"},"4e31-1677":{"renderedLength":599,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1676"},"4e31-1679":{"renderedLength":1127,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1678"},"4e31-1681":{"renderedLength":1174,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1680"},"4e31-1683":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1682"},"4e31-1685":{"renderedLength":1776,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1684"},"4e31-1687":{"renderedLength":6181,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1686"},"4e31-1689":{"renderedLength":769,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1688"},"4e31-1691":{"renderedLength":2570,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1690"},"4e31-1693":{"renderedLength":1489,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1692"},"4e31-1695":{"renderedLength":2249,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1694"},"4e31-1697":{"renderedLength":4246,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1696"},"4e31-1699":{"renderedLength":1953,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1698"},"4e31-1701":{"renderedLength":9830,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1700"},"4e31-1703":{"renderedLength":1378,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1702"},"4e31-1705":{"renderedLength":3225,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1704"},"4e31-1707":{"renderedLength":269,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1706"},"4e31-1709":{"renderedLength":1647,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1708"},"4e31-1711":{"renderedLength":574,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1710"},"4e31-1713":{"renderedLength":12407,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1712"},"4e31-1715":{"renderedLength":354,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1714"},"4e31-1717":{"renderedLength":13667,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1716"},"4e31-1719":{"renderedLength":10236,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1718"},"4e31-1721":{"renderedLength":2387,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1720"},"4e31-1723":{"renderedLength":680,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1722"},"4e31-1725":{"renderedLength":419,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1724"},"4e31-1727":{"renderedLength":1409,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1726"},"4e31-1729":{"renderedLength":1480,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1728"},"4e31-1731":{"renderedLength":5853,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1730"},"4e31-1733":{"renderedLength":742,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1732"},"4e31-1735":{"renderedLength":3901,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1734"},"4e31-1737":{"renderedLength":2613,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1736"},"4e31-1739":{"renderedLength":1351,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1738"},"4e31-1741":{"renderedLength":1572,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1740"},"4e31-1743":{"renderedLength":1329,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1742"},"4e31-1745":{"renderedLength":3864,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1744"},"4e31-1747":{"renderedLength":444,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1746"},"4e31-1749":{"renderedLength":640,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1748"},"4e31-1751":{"renderedLength":650,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1750"},"4e31-1753":{"renderedLength":1979,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1752"},"4e31-1755":{"renderedLength":5172,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1754"},"4e31-1757":{"renderedLength":5023,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1756"},"4e31-1759":{"renderedLength":679,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1758"},"4e31-1761":{"renderedLength":2323,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1760"},"4e31-1763":{"renderedLength":3908,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1762"},"4e31-1765":{"renderedLength":1534,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1764"},"4e31-1767":{"renderedLength":2101,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1766"},"4e31-1769":{"renderedLength":364,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1768"},"4e31-1771":{"renderedLength":3915,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1770"},"4e31-1773":{"renderedLength":8921,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1772"},"4e31-1775":{"renderedLength":2741,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1774"},"4e31-1777":{"renderedLength":1632,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1776"},"4e31-1779":{"renderedLength":4401,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1778"},"4e31-1781":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1780"},"4e31-1783":{"renderedLength":283,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1782"},"4e31-1785":{"renderedLength":470,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1784"},"4e31-1787":{"renderedLength":1354,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1786"},"4e31-1789":{"renderedLength":5389,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1788"},"4e31-1791":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1790"},"4e31-1793":{"renderedLength":1094,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1792"},"4e31-1795":{"renderedLength":88,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1794"},"4e31-1797":{"renderedLength":1216,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1796"},"4e31-1799":{"renderedLength":178,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1798"},"4e31-1801":{"renderedLength":3015,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1800"},"4e31-1803":{"renderedLength":1821,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1802"},"4e31-1805":{"renderedLength":5502,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1804"},"4e31-1807":{"renderedLength":2575,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1806"},"4e31-1809":{"renderedLength":1540,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1808"},"4e31-1811":{"renderedLength":152,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1810"},"4e31-1813":{"renderedLength":392,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1812"},"4e31-1815":{"renderedLength":2661,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1814"},"4e31-1817":{"renderedLength":2532,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1816"},"4e31-1819":{"renderedLength":3469,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1818"},"4e31-1821":{"renderedLength":5823,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1820"},"4e31-1823":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1822"},"4e31-1825":{"renderedLength":2100,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1824"},"4e31-1827":{"renderedLength":25439,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1826"},"4e31-1829":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1828"},"4e31-1831":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1830"},"4e31-1833":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1832"},"4e31-1835":{"renderedLength":2264,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1834"},"4e31-1837":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1836"},"4e31-1839":{"renderedLength":4130,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1838"},"4e31-1841":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1840"},"4e31-1843":{"renderedLength":4527,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1842"},"4e31-1845":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1844"},"4e31-1847":{"renderedLength":7592,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1846"},"4e31-1849":{"renderedLength":3653,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1848"},"4e31-1851":{"renderedLength":6213,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1850"},"4e31-1853":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1852"},"4e31-1855":{"renderedLength":2793,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1854"},"4e31-1857":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1856"},"4e31-1859":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1858"},"4e31-1861":{"renderedLength":5566,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1860"},"4e31-1863":{"renderedLength":2988,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1862"},"4e31-1865":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1864"},"4e31-1867":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1866"},"4e31-1869":{"renderedLength":3053,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1868"},"4e31-1871":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1870"},"4e31-1873":{"renderedLength":3294,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1872"},"4e31-1875":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1874"},"4e31-1877":{"renderedLength":4357,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1876"},"4e31-1879":{"renderedLength":1814,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1878"},"4e31-1881":{"renderedLength":4061,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1880"},"4e31-1883":{"renderedLength":13514,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1882"},"4e31-1885":{"renderedLength":11003,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1884"},"4e31-1887":{"renderedLength":10701,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1886"},"4e31-1889":{"renderedLength":7687,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1888"},"4e31-1891":{"renderedLength":7562,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1890"},"4e31-1893":{"renderedLength":6240,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1892"},"4e31-1895":{"renderedLength":10426,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1894"},"4e31-1897":{"renderedLength":3303,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1896"},"4e31-1899":{"renderedLength":8874,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1898"},"4e31-1901":{"renderedLength":2829,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1900"},"4e31-1903":{"renderedLength":9639,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1902"},"4e31-1905":{"renderedLength":5634,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1904"},"4e31-1907":{"renderedLength":2707,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1906"},"4e31-1909":{"renderedLength":23546,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1908"},"4e31-1911":{"renderedLength":3526,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1910"},"4e31-1913":{"renderedLength":5711,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1912"},"4e31-1915":{"renderedLength":3501,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1914"},"4e31-1917":{"renderedLength":24004,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1916"},"4e31-1919":{"renderedLength":13701,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1918"},"4e31-1921":{"renderedLength":2878,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1920"},"4e31-1923":{"renderedLength":2806,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1922"},"4e31-1925":{"renderedLength":12435,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1924"},"4e31-1927":{"renderedLength":6573,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1926"},"4e31-1929":{"renderedLength":5519,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1928"},"4e31-1931":{"renderedLength":16035,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1930"},"4e31-1933":{"renderedLength":7843,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1932"},"4e31-1935":{"renderedLength":10816,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1934"},"4e31-1937":{"renderedLength":10546,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1936"},"4e31-1939":{"renderedLength":464,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1938"},"4e31-1941":{"renderedLength":18876,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1940"},"4e31-1943":{"renderedLength":8707,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1942"},"4e31-1945":{"renderedLength":15036,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1944"},"4e31-1947":{"renderedLength":870,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1946"},"4e31-1949":{"renderedLength":2209,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1948"},"4e31-1951":{"renderedLength":2188,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1950"},"4e31-1953":{"renderedLength":1945,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1952"},"4e31-1955":{"renderedLength":6963,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1954"},"4e31-1957":{"renderedLength":1253,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1956"},"4e31-1959":{"renderedLength":1612,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1958"},"4e31-1961":{"renderedLength":2645,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1960"},"4e31-1963":{"renderedLength":747,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1962"},"4e31-1965":{"renderedLength":4981,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1964"},"4e31-1967":{"renderedLength":7288,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1966"},"4e31-1969":{"renderedLength":3556,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1968"},"4e31-1971":{"renderedLength":2743,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1970"},"4e31-1973":{"renderedLength":6731,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1972"},"4e31-1975":{"renderedLength":3322,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1974"},"4e31-1977":{"renderedLength":2124,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1976"},"4e31-1979":{"renderedLength":7748,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1978"},"4e31-1981":{"renderedLength":4367,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1980"},"4e31-1983":{"renderedLength":1360,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1982"},"4e31-1985":{"renderedLength":2149,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1984"},"4e31-1987":{"renderedLength":6534,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1986"},"4e31-1989":{"renderedLength":8903,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1988"},"4e31-1991":{"renderedLength":10081,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1990"},"4e31-1993":{"renderedLength":6885,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1992"},"4e31-1995":{"renderedLength":7341,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1994"},"4e31-1997":{"renderedLength":3593,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1996"},"4e31-1999":{"renderedLength":4049,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-1998"},"4e31-2001":{"renderedLength":187,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2000"},"4e31-2003":{"renderedLength":9971,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2002"},"4e31-2005":{"renderedLength":287,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2004"},"4e31-2007":{"renderedLength":14810,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2006"},"4e31-2009":{"renderedLength":2893,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2008"},"4e31-2011":{"renderedLength":14766,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2010"},"4e31-2013":{"renderedLength":3937,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2012"},"4e31-2015":{"renderedLength":11825,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2014"},"4e31-2017":{"renderedLength":1081,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2016"},"4e31-2019":{"renderedLength":454,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2018"},"4e31-2021":{"renderedLength":1904,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2020"},"4e31-2023":{"renderedLength":2157,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2022"},"4e31-2025":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2024"},"4e31-2027":{"renderedLength":3165,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2026"},"4e31-2029":{"renderedLength":2521,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2028"},"4e31-2031":{"renderedLength":2558,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2030"},"4e31-2033":{"renderedLength":620,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2032"},"4e31-2035":{"renderedLength":2737,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2034"},"4e31-2037":{"renderedLength":75121,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2036"},"4e31-2039":{"renderedLength":4205,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2038"},"4e31-2041":{"renderedLength":13434,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2040"},"4e31-2043":{"renderedLength":8091,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2042"},"4e31-2045":{"renderedLength":4366,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2044"},"4e31-2047":{"renderedLength":2874,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2046"},"4e31-2049":{"renderedLength":1789,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2048"},"4e31-2051":{"renderedLength":1269,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2050"},"4e31-2053":{"renderedLength":12382,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2052"},"4e31-2055":{"renderedLength":2862,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2054"},"4e31-2057":{"renderedLength":1927,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2056"},"4e31-2059":{"renderedLength":2537,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2058"},"4e31-2061":{"renderedLength":3322,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2060"},"4e31-2063":{"renderedLength":3087,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2062"},"4e31-2065":{"renderedLength":9400,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2064"},"4e31-2067":{"renderedLength":3847,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2066"},"4e31-2069":{"renderedLength":2148,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2068"},"4e31-2071":{"renderedLength":2735,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2070"},"4e31-2073":{"renderedLength":544,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2072"},"4e31-2075":{"renderedLength":10026,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2074"},"4e31-2077":{"renderedLength":5412,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2076"},"4e31-2079":{"renderedLength":1882,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2078"},"4e31-2081":{"renderedLength":4183,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2080"},"4e31-2083":{"renderedLength":4985,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2082"},"4e31-2085":{"renderedLength":486,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2084"},"4e31-2087":{"renderedLength":2958,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2086"},"4e31-2089":{"renderedLength":7334,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2088"},"4e31-2091":{"renderedLength":2758,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2090"},"4e31-2093":{"renderedLength":2234,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2092"},"4e31-2095":{"renderedLength":7545,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2094"},"4e31-2097":{"renderedLength":421,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2096"},"4e31-2099":{"renderedLength":1794,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2098"},"4e31-2101":{"renderedLength":1909,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2100"},"4e31-2103":{"renderedLength":324,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2102"},"4e31-2105":{"renderedLength":239,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2104"},"4e31-2107":{"renderedLength":2268,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2106"},"4e31-2109":{"renderedLength":11876,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2108"},"4e31-2111":{"renderedLength":16501,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2110"},"4e31-2113":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2112"},"4e31-2115":{"renderedLength":9420,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2114"},"4e31-2117":{"renderedLength":8917,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2116"},"4e31-2119":{"renderedLength":13370,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2118"},"4e31-2121":{"renderedLength":13370,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2120"},"4e31-2123":{"renderedLength":8556,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2122"},"4e31-2125":{"renderedLength":20629,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2124"},"4e31-2127":{"renderedLength":7148,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2126"},"4e31-2129":{"renderedLength":2913,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2128"},"4e31-2131":{"renderedLength":15035,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2130"},"4e31-2133":{"renderedLength":1336,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2132"},"4e31-2135":{"renderedLength":6688,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2134"},"4e31-2137":{"renderedLength":745,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2136"},"4e31-2139":{"renderedLength":1153,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2138"},"4e31-2141":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2140"},"4e31-2143":{"renderedLength":16857,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2142"},"4e31-2145":{"renderedLength":14924,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2144"},"4e31-2147":{"renderedLength":6765,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2146"},"4e31-2149":{"renderedLength":41582,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2148"},"4e31-2151":{"renderedLength":9670,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2150"},"4e31-2153":{"renderedLength":28256,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2152"},"4e31-2155":{"renderedLength":1374,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2154"},"4e31-2157":{"renderedLength":9228,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2156"},"4e31-2159":{"renderedLength":6290,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2158"},"4e31-2161":{"renderedLength":2828,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2160"},"4e31-2163":{"renderedLength":129,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2162"},"4e31-2165":{"renderedLength":2359,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2164"},"4e31-2167":{"renderedLength":1485,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2166"},"4e31-2169":{"renderedLength":6067,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2168"},"4e31-2171":{"renderedLength":2942,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2170"},"4e31-2173":{"renderedLength":578,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2172"},"4e31-2175":{"renderedLength":19588,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2174"},"4e31-2177":{"renderedLength":7026,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2176"},"4e31-2179":{"renderedLength":5903,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2178"},"4e31-2181":{"renderedLength":8353,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2180"},"4e31-2183":{"renderedLength":4194,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2182"},"4e31-2185":{"renderedLength":2725,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2184"},"4e31-2187":{"renderedLength":13282,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2186"},"4e31-2189":{"renderedLength":3433,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2188"},"4e31-2191":{"renderedLength":7633,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2190"},"4e31-2193":{"renderedLength":1521,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2192"},"4e31-2195":{"renderedLength":9441,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2194"},"4e31-2197":{"renderedLength":8102,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2196"},"4e31-2199":{"renderedLength":18336,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2198"},"4e31-2201":{"renderedLength":4169,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2200"},"4e31-2203":{"renderedLength":786,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2202"},"4e31-2205":{"renderedLength":209,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2204"},"4e31-2207":{"renderedLength":14594,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2206"},"4e31-2209":{"renderedLength":4940,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2208"},"4e31-2211":{"renderedLength":4086,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2210"},"4e31-2213":{"renderedLength":981,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2212"},"4e31-2215":{"renderedLength":620,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2214"},"4e31-2217":{"renderedLength":142,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2216"},"4e31-2219":{"renderedLength":4833,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2218"},"4e31-2221":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2220"},"4e31-2223":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2222"},"4e31-2225":{"renderedLength":4597,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2224"},"4e31-2227":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2226"},"4e31-2229":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2228"},"4e31-2231":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2230"},"4e31-2233":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2232"},"4e31-2235":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2234"},"4e31-2237":{"renderedLength":2486,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2236"},"4e31-2239":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2238"},"4e31-2241":{"renderedLength":971,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2240"},"4e31-2243":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2242"},"4e31-2245":{"renderedLength":512,"gzipLength":0,"brotliLength":0,"mainUid":"4e31-2244"}},"nodeMetas":{"4e31-0":{"id":"node_modules/aes-js/index.js","moduleParts":{"dist/rapid.js":"4e31-1"},"imported":[],"importedBy":[{"uid":"4e31-110"}]},"4e31-2":{"id":"node_modules/diacritics/index.js","moduleParts":{"dist/rapid.js":"4e31-3"},"imported":[],"importedBy":[{"uid":"4e31-110"},{"uid":"4e31-2132"},{"uid":"4e31-816"}]},"4e31-4":{"id":"node_modules/eventemitter3/index.js","moduleParts":{"dist/rapid.js":"4e31-5"},"imported":[],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-1546"}]},"4e31-6":{"id":"node_modules/earcut/src/earcut.js","moduleParts":{"dist/rapid.js":"4e31-7"},"imported":[],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-1546"}]},"4e31-8":{"id":"node_modules/url/node_modules/punycode/punycode.js","moduleParts":{"dist/rapid.js":"4e31-9"},"imported":[],"importedBy":[{"uid":"4e31-18"}]},"4e31-10":{"id":"node_modules/url/util.js","moduleParts":{"dist/rapid.js":"4e31-11"},"imported":[],"importedBy":[{"uid":"4e31-18"}]},"4e31-12":{"id":"node_modules/url/node_modules/querystring/decode.js","moduleParts":{"dist/rapid.js":"4e31-13"},"imported":[],"importedBy":[{"uid":"4e31-16"}]},"4e31-14":{"id":"node_modules/url/node_modules/querystring/encode.js","moduleParts":{"dist/rapid.js":"4e31-15"},"imported":[],"importedBy":[{"uid":"4e31-16"}]},"4e31-16":{"id":"node_modules/url/node_modules/querystring/index.js","moduleParts":{"dist/rapid.js":"4e31-17"},"imported":[{"uid":"4e31-12"},{"uid":"4e31-14"}],"importedBy":[{"uid":"4e31-18"}]},"4e31-18":{"id":"node_modules/url/url.js","moduleParts":{"dist/rapid.js":"4e31-19"},"imported":[{"uid":"4e31-8"},{"uid":"4e31-10"},{"uid":"4e31-16"}],"importedBy":[{"uid":"4e31-436"},{"uid":"4e31-1548"}]},"4e31-20":{"id":"node_modules/which-polygon/node_modules/quickselect/quickselect.js","moduleParts":{"dist/rapid.js":"4e31-21"},"imported":[],"importedBy":[{"uid":"4e31-22"}]},"4e31-22":{"id":"node_modules/which-polygon/node_modules/rbush/index.js","moduleParts":{"dist/rapid.js":"4e31-23"},"imported":[{"uid":"4e31-20"}],"importedBy":[{"uid":"4e31-26"}]},"4e31-24":{"id":"node_modules/lineclip/index.js","moduleParts":{"dist/rapid.js":"4e31-25"},"imported":[],"importedBy":[{"uid":"4e31-26"}]},"4e31-26":{"id":"node_modules/which-polygon/index.js","moduleParts":{"dist/rapid.js":"4e31-27"},"imported":[{"uid":"4e31-22"},{"uid":"4e31-24"}],"importedBy":[{"uid":"4e31-496"},{"uid":"4e31-1512"},{"uid":"4e31-492"},{"uid":"4e31-2130"}]},"4e31-28":{"id":"node_modules/wgs84/index.js","moduleParts":{"dist/rapid.js":"4e31-29"},"imported":[],"importedBy":[{"uid":"4e31-30"}]},"4e31-30":{"id":"node_modules/@mapbox/geojson-area/index.js","moduleParts":{"dist/rapid.js":"4e31-31"},"imported":[{"uid":"4e31-28"}],"importedBy":[{"uid":"4e31-496"},{"uid":"4e31-494"}]},"4e31-32":{"id":"node_modules/circle-to-polygon/input-validation/validateCenter.js","moduleParts":{"dist/rapid.js":"4e31-33"},"imported":[],"importedBy":[{"uid":"4e31-42"}]},"4e31-34":{"id":"node_modules/circle-to-polygon/input-validation/validateRadius.js","moduleParts":{"dist/rapid.js":"4e31-35"},"imported":[],"importedBy":[{"uid":"4e31-42"}]},"4e31-36":{"id":"node_modules/circle-to-polygon/input-validation/validateNumberOfEdges.js","moduleParts":{"dist/rapid.js":"4e31-37"},"imported":[],"importedBy":[{"uid":"4e31-42"}]},"4e31-38":{"id":"node_modules/circle-to-polygon/input-validation/validateEarthRadius.js","moduleParts":{"dist/rapid.js":"4e31-39"},"imported":[],"importedBy":[{"uid":"4e31-42"}]},"4e31-40":{"id":"node_modules/circle-to-polygon/input-validation/validateBearing.js","moduleParts":{"dist/rapid.js":"4e31-41"},"imported":[],"importedBy":[{"uid":"4e31-42"}]},"4e31-42":{"id":"node_modules/circle-to-polygon/input-validation/index.js","moduleParts":{"dist/rapid.js":"4e31-43"},"imported":[{"uid":"4e31-32"},{"uid":"4e31-34"},{"uid":"4e31-36"},{"uid":"4e31-38"},{"uid":"4e31-40"}],"importedBy":[{"uid":"4e31-44"}]},"4e31-44":{"id":"node_modules/circle-to-polygon/index.js","moduleParts":{"dist/rapid.js":"4e31-45"},"imported":[{"uid":"4e31-42"}],"importedBy":[{"uid":"4e31-494"}]},"4e31-46":{"id":"node_modules/polygon-clipping/dist/polygon-clipping.umd.js","moduleParts":{"dist/rapid.js":"4e31-47"},"imported":[],"importedBy":[{"uid":"4e31-2158"},{"uid":"4e31-494"}]},"4e31-48":{"id":"node_modules/geojson-precision/index.js","moduleParts":{"dist/rapid.js":"4e31-49"},"imported":[],"importedBy":[{"uid":"4e31-494"}]},"4e31-50":{"id":"node_modules/@aitodotai/json-stringify-pretty-compact/index.js","moduleParts":{"dist/rapid.js":"4e31-51"},"imported":[],"importedBy":[{"uid":"4e31-494"}]},"4e31-52":{"id":"node_modules/fast-deep-equal/index.js","moduleParts":{"dist/rapid.js":"4e31-53"},"imported":[],"importedBy":[{"uid":"4e31-732"},{"uid":"4e31-582"},{"uid":"4e31-2158"},{"uid":"4e31-788"},{"uid":"4e31-1990"},{"uid":"4e31-702"}]},"4e31-54":{"id":"node_modules/rbush/rbush.min.js","moduleParts":{"dist/rapid.js":"4e31-55"},"imported":[],"importedBy":[{"uid":"4e31-584"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2124"},{"uid":"4e31-2128"},{"uid":"4e31-2144"},{"uid":"4e31-2148"},{"uid":"4e31-2152"},{"uid":"4e31-1908"}]},"4e31-56":{"id":"node_modules/tinyqueue/index.js","moduleParts":{"dist/rapid.js":"4e31-57"},"imported":[],"importedBy":[{"uid":"4e31-58"}]},"4e31-58":{"id":"node_modules/@mapbox/polylabel/polylabel.js","moduleParts":{"dist/rapid.js":"4e31-59"},"imported":[{"uid":"4e31-56"}],"importedBy":[{"uid":"4e31-1888"}]},"4e31-60":{"id":"node_modules/@mapbox/geojson-rewind/index.js","moduleParts":{"dist/rapid.js":"4e31-61"},"imported":[],"importedBy":[{"uid":"4e31-1916"},{"uid":"4e31-1924"}]},"4e31-62":{"id":"node_modules/fast-json-stable-stringify/index.js","moduleParts":{"dist/rapid.js":"4e31-63"},"imported":[],"importedBy":[{"uid":"4e31-2158"},{"uid":"4e31-1930"}]},"4e31-64":{"id":"node_modules/@mapbox/sexagesimal/index.js","moduleParts":{"dist/rapid.js":"4e31-65"},"imported":[],"importedBy":[{"uid":"4e31-1988"}]},"4e31-66":{"id":"node_modules/@mapbox/point-geometry/index.js","moduleParts":{"dist/rapid.js":"4e31-67"},"imported":[],"importedBy":[{"uid":"4e31-68"}]},"4e31-68":{"id":"node_modules/@mapbox/vector-tile/lib/vectortilefeature.js","moduleParts":{"dist/rapid.js":"4e31-69"},"imported":[{"uid":"4e31-66"}],"importedBy":[{"uid":"4e31-74"},{"uid":"4e31-70"}]},"4e31-70":{"id":"node_modules/@mapbox/vector-tile/lib/vectortilelayer.js","moduleParts":{"dist/rapid.js":"4e31-71"},"imported":[{"uid":"4e31-68"}],"importedBy":[{"uid":"4e31-74"},{"uid":"4e31-72"}]},"4e31-72":{"id":"node_modules/@mapbox/vector-tile/lib/vectortile.js","moduleParts":{"dist/rapid.js":"4e31-73"},"imported":[{"uid":"4e31-70"}],"importedBy":[{"uid":"4e31-74"}]},"4e31-74":{"id":"node_modules/@mapbox/vector-tile/index.js","moduleParts":{"dist/rapid.js":"4e31-75"},"imported":[{"uid":"4e31-72"},{"uid":"4e31-68"},{"uid":"4e31-70"}],"importedBy":[{"uid":"4e31-2124"},{"uid":"4e31-2158"}]},"4e31-76":{"id":"node_modules/ieee754/index.js","moduleParts":{"dist/rapid.js":"4e31-77"},"imported":[],"importedBy":[{"uid":"4e31-78"}]},"4e31-78":{"id":"node_modules/pbf/index.js","moduleParts":{"dist/rapid.js":"4e31-79"},"imported":[{"uid":"4e31-76"}],"importedBy":[{"uid":"4e31-2124"},{"uid":"4e31-2158"}]},"4e31-80":{"id":"node_modules/store/src/util.js","moduleParts":{"dist/rapid.js":"4e31-81"},"imported":[],"importedBy":[{"uid":"4e31-82"},{"uid":"4e31-84"},{"uid":"4e31-86"},{"uid":"4e31-88"},{"uid":"4e31-90"},{"uid":"4e31-92"}]},"4e31-82":{"id":"node_modules/store/src/store-engine.js","moduleParts":{"dist/rapid.js":"4e31-83"},"imported":[{"uid":"4e31-80"}],"importedBy":[{"uid":"4e31-102"}]},"4e31-84":{"id":"node_modules/store/storages/localStorage.js","moduleParts":{"dist/rapid.js":"4e31-85"},"imported":[{"uid":"4e31-80"}],"importedBy":[{"uid":"4e31-96"}]},"4e31-86":{"id":"node_modules/store/storages/oldFF-globalStorage.js","moduleParts":{"dist/rapid.js":"4e31-87"},"imported":[{"uid":"4e31-80"}],"importedBy":[{"uid":"4e31-96"}]},"4e31-88":{"id":"node_modules/store/storages/oldIE-userDataStorage.js","moduleParts":{"dist/rapid.js":"4e31-89"},"imported":[{"uid":"4e31-80"}],"importedBy":[{"uid":"4e31-96"}]},"4e31-90":{"id":"node_modules/store/storages/cookieStorage.js","moduleParts":{"dist/rapid.js":"4e31-91"},"imported":[{"uid":"4e31-80"}],"importedBy":[{"uid":"4e31-96"}]},"4e31-92":{"id":"node_modules/store/storages/sessionStorage.js","moduleParts":{"dist/rapid.js":"4e31-93"},"imported":[{"uid":"4e31-80"}],"importedBy":[{"uid":"4e31-96"}]},"4e31-94":{"id":"node_modules/store/storages/memoryStorage.js","moduleParts":{"dist/rapid.js":"4e31-95"},"imported":[],"importedBy":[{"uid":"4e31-96"}]},"4e31-96":{"id":"node_modules/store/storages/all.js","moduleParts":{"dist/rapid.js":"4e31-97"},"imported":[{"uid":"4e31-84"},{"uid":"4e31-86"},{"uid":"4e31-88"},{"uid":"4e31-90"},{"uid":"4e31-92"},{"uid":"4e31-94"}],"importedBy":[{"uid":"4e31-102"}]},"4e31-98":{"id":"node_modules/store/plugins/lib/json2.js","moduleParts":{"dist/rapid.js":"4e31-99"},"imported":[],"importedBy":[{"uid":"4e31-100"}]},"4e31-100":{"id":"node_modules/store/plugins/json2.js","moduleParts":{"dist/rapid.js":"4e31-101"},"imported":[{"uid":"4e31-98"}],"importedBy":[{"uid":"4e31-102"}]},"4e31-102":{"id":"node_modules/store/dist/store.legacy.js","moduleParts":{"dist/rapid.js":"4e31-103"},"imported":[{"uid":"4e31-82"},{"uid":"4e31-96"},{"uid":"4e31-100"}],"importedBy":[{"uid":"4e31-2146"}]},"4e31-104":{"id":"modules/index.js","moduleParts":{"dist/rapid.js":"4e31-105"},"imported":[{"uid":"4e31-108"},{"uid":"4e31-2220"},{"uid":"4e31-2112"},{"uid":"4e31-596"},{"uid":"4e31-1474"},{"uid":"4e31-600"},{"uid":"4e31-512"},{"uid":"4e31-2198"},{"uid":"4e31-1516"},{"uid":"4e31-2172"},{"uid":"4e31-2222"},{"uid":"4e31-540"},{"uid":"4e31-1502"},{"uid":"4e31-2226"},{"uid":"4e31-2228"},{"uid":"4e31-2230"},{"uid":"4e31-2232"},{"uid":"4e31-2234"},{"uid":"4e31-414"},{"uid":"4e31-676"},{"uid":"4e31-2238"},{"uid":"4e31-406"},{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-2244"}]},"4e31-106":{"id":"modules/actions/add_entity.js","moduleParts":{"dist/rapid.js":"4e31-107"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-764"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-2006"}]},"4e31-108":{"id":"modules/actions/index.js","moduleParts":{"dist/rapid.js":"4e31-109"},"imported":[{"uid":"4e31-106"},{"uid":"4e31-2210"},{"uid":"4e31-592"},{"uid":"4e31-704"},{"uid":"4e31-706"},{"uid":"4e31-714"},{"uid":"4e31-626"},{"uid":"4e31-602"},{"uid":"4e31-638"},{"uid":"4e31-652"},{"uid":"4e31-708"},{"uid":"4e31-526"},{"uid":"4e31-524"},{"uid":"4e31-528"},{"uid":"4e31-522"},{"uid":"4e31-730"},{"uid":"4e31-622"},{"uid":"4e31-630"},{"uid":"4e31-634"},{"uid":"4e31-636"},{"uid":"4e31-640"},{"uid":"4e31-642"},{"uid":"4e31-732"},{"uid":"4e31-654"},{"uid":"4e31-2000"},{"uid":"4e31-768"},{"uid":"4e31-612"},{"uid":"4e31-648"},{"uid":"4e31-2212"},{"uid":"4e31-112"},{"uid":"4e31-736"},{"uid":"4e31-778"},{"uid":"4e31-2214"},{"uid":"4e31-530"},{"uid":"4e31-668"},{"uid":"4e31-670"},{"uid":"4e31-2216"},{"uid":"4e31-658"},{"uid":"4e31-716"},{"uid":"4e31-2218"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-614"},{"uid":"4e31-1508"},{"uid":"4e31-2022"}]},"4e31-110":{"id":"node_modules/@rapid-sdk/util/built/util.mjs","moduleParts":{"dist/rapid.js":"4e31-111"},"imported":[{"uid":"4e31-0"},{"uid":"4e31-2"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-2198"},{"uid":"4e31-2210"},{"uid":"4e31-592"},{"uid":"4e31-602"},{"uid":"4e31-638"},{"uid":"4e31-528"},{"uid":"4e31-634"},{"uid":"4e31-636"},{"uid":"4e31-642"},{"uid":"4e31-732"},{"uid":"4e31-654"},{"uid":"4e31-778"},{"uid":"4e31-2214"},{"uid":"4e31-530"},{"uid":"4e31-670"},{"uid":"4e31-658"},{"uid":"4e31-750"},{"uid":"4e31-2110"},{"uid":"4e31-590"},{"uid":"4e31-498"},{"uid":"4e31-738"},{"uid":"4e31-728"},{"uid":"4e31-582"},{"uid":"4e31-532"},{"uid":"4e31-770"},{"uid":"4e31-780"},{"uid":"4e31-674"},{"uid":"4e31-608"},{"uid":"4e31-610"},{"uid":"4e31-614"},{"uid":"4e31-618"},{"uid":"4e31-620"},{"uid":"4e31-624"},{"uid":"4e31-632"},{"uid":"4e31-646"},{"uid":"4e31-650"},{"uid":"4e31-660"},{"uid":"4e31-664"},{"uid":"4e31-672"},{"uid":"4e31-408"},{"uid":"4e31-514"},{"uid":"4e31-2206"},{"uid":"4e31-534"},{"uid":"4e31-500"},{"uid":"4e31-504"},{"uid":"4e31-506"},{"uid":"4e31-1514"},{"uid":"4e31-1944"},{"uid":"4e31-2114"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2126"},{"uid":"4e31-2128"},{"uid":"4e31-2144"},{"uid":"4e31-2148"},{"uid":"4e31-2150"},{"uid":"4e31-2152"},{"uid":"4e31-2156"},{"uid":"4e31-2158"},{"uid":"4e31-2168"},{"uid":"4e31-2170"},{"uid":"4e31-2174"},{"uid":"4e31-2180"},{"uid":"4e31-2186"},{"uid":"4e31-2190"},{"uid":"4e31-1500"},{"uid":"4e31-1972"},{"uid":"4e31-810"},{"uid":"4e31-1992"},{"uid":"4e31-1996"},{"uid":"4e31-1998"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-802"},{"uid":"4e31-788"},{"uid":"4e31-812"},{"uid":"4e31-784"},{"uid":"4e31-1990"},{"uid":"4e31-798"},{"uid":"4e31-2014"},{"uid":"4e31-2200"},{"uid":"4e31-2052"},{"uid":"4e31-702"},{"uid":"4e31-718"},{"uid":"4e31-720"},{"uid":"4e31-742"},{"uid":"4e31-1494"},{"uid":"4e31-1986"},{"uid":"4e31-1930"}]},"4e31-112":{"id":"modules/actions/reverse.js","moduleParts":{"dist/rapid.js":"4e31-113"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-662"},{"uid":"4e31-534"},{"uid":"4e31-2208"},{"uid":"4e31-538"},{"uid":"4e31-696"}]},"4e31-114":{"id":"modules/osm/tags.js","moduleParts":{"dist/rapid.js":"4e31-115"},"imported":[],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-2198"},{"uid":"4e31-522"},{"uid":"4e31-634"},{"uid":"4e31-636"},{"uid":"4e31-408"},{"uid":"4e31-2206"},{"uid":"4e31-2208"},{"uid":"4e31-506"},{"uid":"4e31-2126"},{"uid":"4e31-2224"},{"uid":"4e31-682"},{"uid":"4e31-684"},{"uid":"4e31-686"},{"uid":"4e31-688"},{"uid":"4e31-696"},{"uid":"4e31-702"},{"uid":"4e31-712"},{"uid":"4e31-1918"}]},"4e31-116":{"id":"node_modules/d3-array/src/ascending.js","moduleParts":{"dist/rapid.js":"4e31-117"},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2263"},{"uid":"4e31-2264"},{"uid":"4e31-2272"},{"uid":"4e31-2286"},{"uid":"4e31-2287"},{"uid":"4e31-2288"},{"uid":"4e31-2289"},{"uid":"4e31-2290"},{"uid":"4e31-126"}]},"4e31-118":{"id":"node_modules/d3-array/src/descending.js","moduleParts":{"dist/rapid.js":"4e31-119"},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2264"}]},"4e31-120":{"id":"node_modules/d3-array/src/number.js","moduleParts":{"dist/rapid.js":"4e31-121"},"imported":[],"importedBy":[{"uid":"4e31-2263"},{"uid":"4e31-134"}]},"4e31-122":{"id":"node_modules/d3-array/src/index.js","moduleParts":{"dist/rapid.js":"4e31-123"},"imported":[{"uid":"4e31-2263"},{"uid":"4e31-116"},{"uid":"4e31-2264"},{"uid":"4e31-2265"},{"uid":"4e31-2266"},{"uid":"4e31-2267"},{"uid":"4e31-2268"},{"uid":"4e31-118"},{"uid":"4e31-2269"},{"uid":"4e31-2270"},{"uid":"4e31-124"},{"uid":"4e31-2271"},{"uid":"4e31-2272"},{"uid":"4e31-2273"},{"uid":"4e31-2274"},{"uid":"4e31-2275"},{"uid":"4e31-2276"},{"uid":"4e31-128"},{"uid":"4e31-2277"},{"uid":"4e31-2278"},{"uid":"4e31-136"},{"uid":"4e31-2279"},{"uid":"4e31-130"},{"uid":"4e31-2280"},{"uid":"4e31-2281"},{"uid":"4e31-2282"},{"uid":"4e31-2283"},{"uid":"4e31-2284"},{"uid":"4e31-134"},{"uid":"4e31-132"},{"uid":"4e31-2285"},{"uid":"4e31-2286"},{"uid":"4e31-2287"},{"uid":"4e31-2288"},{"uid":"4e31-2289"},{"uid":"4e31-2290"},{"uid":"4e31-2291"},{"uid":"4e31-2292"},{"uid":"4e31-2293"},{"uid":"4e31-2294"},{"uid":"4e31-2295"},{"uid":"4e31-2296"},{"uid":"4e31-2297"},{"uid":"4e31-2298"},{"uid":"4e31-2299"},{"uid":"4e31-2300"},{"uid":"4e31-2301"},{"uid":"4e31-2302"},{"uid":"4e31-2303"},{"uid":"4e31-126"},{"uid":"4e31-2304"},{"uid":"4e31-2305"},{"uid":"4e31-2306"},{"uid":"4e31-2307"},{"uid":"4e31-2308"},{"uid":"4e31-2309"},{"uid":"4e31-2310"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-602"},{"uid":"4e31-2064"},{"uid":"4e31-2070"},{"uid":"4e31-2316"},{"uid":"4e31-2317"},{"uid":"4e31-144"},{"uid":"4e31-150"},{"uid":"4e31-152"},{"uid":"4e31-2354"},{"uid":"4e31-2357"},{"uid":"4e31-154"},{"uid":"4e31-2423"},{"uid":"4e31-2425"},{"uid":"4e31-2426"},{"uid":"4e31-2428"},{"uid":"4e31-2431"},{"uid":"4e31-2432"},{"uid":"4e31-2433"},{"uid":"4e31-2437"},{"uid":"4e31-2439"},{"uid":"4e31-2545"},{"uid":"4e31-2587"},{"uid":"4e31-2592"},{"uid":"4e31-2594"},{"uid":"4e31-2598"},{"uid":"4e31-2639"}]},"4e31-124":{"id":"node_modules/d3-array/src/fsum.js","moduleParts":{"dist/rapid.js":"4e31-125"},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-126":{"id":"node_modules/d3-array/src/sort.js","moduleParts":{"dist/rapid.js":"4e31-127"},"imported":[{"uid":"4e31-116"},{"uid":"4e31-2284"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2272"},{"uid":"4e31-134"},{"uid":"4e31-132"},{"uid":"4e31-2286"}]},"4e31-128":{"id":"node_modules/d3-array/src/max.js","moduleParts":{"dist/rapid.js":"4e31-129"},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-134"}]},"4e31-130":{"id":"node_modules/d3-array/src/min.js","moduleParts":{"dist/rapid.js":"4e31-131"},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-134"},{"uid":"4e31-2295"}]},"4e31-132":{"id":"node_modules/d3-array/src/quickselect.js","moduleParts":{"dist/rapid.js":"4e31-133"},"imported":[{"uid":"4e31-126"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-134"}]},"4e31-134":{"id":"node_modules/d3-array/src/quantile.js","moduleParts":{"dist/rapid.js":"4e31-135"},"imported":[{"uid":"4e31-128"},{"uid":"4e31-2277"},{"uid":"4e31-130"},{"uid":"4e31-2280"},{"uid":"4e31-132"},{"uid":"4e31-120"},{"uid":"4e31-126"},{"uid":"4e31-2289"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2274"},{"uid":"4e31-136"}]},"4e31-136":{"id":"node_modules/d3-array/src/median.js","moduleParts":{"dist/rapid.js":"4e31-137"},"imported":[{"uid":"4e31-134"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-138":{"id":"node_modules/d3-geo/src/math.js","moduleParts":{"dist/rapid.js":"4e31-139"},"imported":[],"importedBy":[{"uid":"4e31-144"},{"uid":"4e31-150"},{"uid":"4e31-152"},{"uid":"4e31-2350"},{"uid":"4e31-2351"},{"uid":"4e31-2352"},{"uid":"4e31-2354"},{"uid":"4e31-2355"},{"uid":"4e31-2357"},{"uid":"4e31-2358"},{"uid":"4e31-154"},{"uid":"4e31-2361"},{"uid":"4e31-2362"},{"uid":"4e31-2363"},{"uid":"4e31-2364"},{"uid":"4e31-2365"},{"uid":"4e31-2366"},{"uid":"4e31-2367"},{"uid":"4e31-2369"},{"uid":"4e31-2370"},{"uid":"4e31-2371"},{"uid":"4e31-158"},{"uid":"4e31-2372"},{"uid":"4e31-2373"},{"uid":"4e31-2374"},{"uid":"4e31-2375"},{"uid":"4e31-2376"},{"uid":"4e31-148"},{"uid":"4e31-2587"},{"uid":"4e31-2588"},{"uid":"4e31-2591"},{"uid":"4e31-2592"},{"uid":"4e31-2594"},{"uid":"4e31-2596"},{"uid":"4e31-2597"},{"uid":"4e31-2598"},{"uid":"4e31-2601"},{"uid":"4e31-2602"},{"uid":"4e31-2603"},{"uid":"4e31-2605"}]},"4e31-140":{"id":"node_modules/d3-geo/src/noop.js","moduleParts":{"dist/rapid.js":"4e31-141"},"imported":[],"importedBy":[{"uid":"4e31-144"},{"uid":"4e31-152"},{"uid":"4e31-154"},{"uid":"4e31-2589"},{"uid":"4e31-2594"},{"uid":"4e31-2595"},{"uid":"4e31-2597"},{"uid":"4e31-2598"}]},"4e31-142":{"id":"node_modules/d3-geo/src/stream.js","moduleParts":{"dist/rapid.js":"4e31-143"},"imported":[],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-144"},{"uid":"4e31-150"},{"uid":"4e31-152"},{"uid":"4e31-154"},{"uid":"4e31-2359"},{"uid":"4e31-2600"}]},"4e31-144":{"id":"node_modules/d3-geo/src/area.js","moduleParts":{"dist/rapid.js":"4e31-145"},"imported":[{"uid":"4e31-122"},{"uid":"4e31-138"},{"uid":"4e31-140"},{"uid":"4e31-142"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-150"}]},"4e31-146":{"id":"node_modules/d3-geo/src/index.js","moduleParts":{"dist/rapid.js":"4e31-147"},"imported":[{"uid":"4e31-144"},{"uid":"4e31-150"},{"uid":"4e31-152"},{"uid":"4e31-2350"},{"uid":"4e31-2351"},{"uid":"4e31-2352"},{"uid":"4e31-2353"},{"uid":"4e31-2354"},{"uid":"4e31-2355"},{"uid":"4e31-2356"},{"uid":"4e31-2357"},{"uid":"4e31-2358"},{"uid":"4e31-154"},{"uid":"4e31-2359"},{"uid":"4e31-2360"},{"uid":"4e31-2361"},{"uid":"4e31-2362"},{"uid":"4e31-2363"},{"uid":"4e31-2364"},{"uid":"4e31-2365"},{"uid":"4e31-2366"},{"uid":"4e31-2367"},{"uid":"4e31-2368"},{"uid":"4e31-2369"},{"uid":"4e31-2370"},{"uid":"4e31-2371"},{"uid":"4e31-158"},{"uid":"4e31-2372"},{"uid":"4e31-2373"},{"uid":"4e31-2374"},{"uid":"4e31-2375"},{"uid":"4e31-2376"},{"uid":"4e31-142"},{"uid":"4e31-156"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-406"},{"uid":"4e31-1510"},{"uid":"4e31-518"},{"uid":"4e31-2206"},{"uid":"4e31-1514"},{"uid":"4e31-1972"},{"uid":"4e31-1930"}]},"4e31-148":{"id":"node_modules/d3-geo/src/cartesian.js","moduleParts":{"dist/rapid.js":"4e31-149"},"imported":[{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-150"},{"uid":"4e31-2350"},{"uid":"4e31-2352"},{"uid":"4e31-2592"},{"uid":"4e31-2605"}]},"4e31-150":{"id":"node_modules/d3-geo/src/bounds.js","moduleParts":{"dist/rapid.js":"4e31-151"},"imported":[{"uid":"4e31-122"},{"uid":"4e31-144"},{"uid":"4e31-148"},{"uid":"4e31-138"},{"uid":"4e31-142"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-152":{"id":"node_modules/d3-geo/src/centroid.js","moduleParts":{"dist/rapid.js":"4e31-153"},"imported":[{"uid":"4e31-122"},{"uid":"4e31-138"},{"uid":"4e31-140"},{"uid":"4e31-142"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-154":{"id":"node_modules/d3-geo/src/length.js","moduleParts":{"dist/rapid.js":"4e31-155"},"imported":[{"uid":"4e31-122"},{"uid":"4e31-138"},{"uid":"4e31-140"},{"uid":"4e31-142"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2356"}]},"4e31-156":{"id":"node_modules/d3-geo/src/transform.js","moduleParts":{"dist/rapid.js":"4e31-157"},"imported":[],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2370"},{"uid":"4e31-2371"},{"uid":"4e31-2605"}]},"4e31-158":{"id":"node_modules/d3-geo/src/projection/mercator.js","moduleParts":{"dist/rapid.js":"4e31-159"},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2376"},{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2364"},{"uid":"4e31-2375"}]},"4e31-160":{"id":"node_modules/d3-polygon/src/area.js","moduleParts":{"dist/rapid.js":"4e31-161"},"imported":[],"importedBy":[{"uid":"4e31-162"}]},"4e31-162":{"id":"node_modules/d3-polygon/src/index.js","moduleParts":{"dist/rapid.js":"4e31-163"},"imported":[{"uid":"4e31-160"},{"uid":"4e31-164"},{"uid":"4e31-168"},{"uid":"4e31-2402"},{"uid":"4e31-2403"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-406"},{"uid":"4e31-602"},{"uid":"4e31-630"},{"uid":"4e31-780"},{"uid":"4e31-1888"}]},"4e31-164":{"id":"node_modules/d3-polygon/src/centroid.js","moduleParts":{"dist/rapid.js":"4e31-165"},"imported":[],"importedBy":[{"uid":"4e31-162"}]},"4e31-166":{"id":"node_modules/d3-polygon/src/cross.js","moduleParts":{"dist/rapid.js":"4e31-167"},"imported":[],"importedBy":[{"uid":"4e31-168"}]},"4e31-168":{"id":"node_modules/d3-polygon/src/hull.js","moduleParts":{"dist/rapid.js":"4e31-169"},"imported":[{"uid":"4e31-166"}],"importedBy":[{"uid":"4e31-162"}]},"4e31-170":{"id":"node_modules/d3-dispatch/src/dispatch.js","moduleParts":{"dist/rapid.js":"4e31-171"},"imported":[],"importedBy":[{"uid":"4e31-172"}]},"4e31-172":{"id":"node_modules/d3-dispatch/src/index.js","moduleParts":{"dist/rapid.js":"4e31-173"},"imported":[{"uid":"4e31-170"}],"importedBy":[{"uid":"4e31-2198"},{"uid":"4e31-2238"},{"uid":"4e31-2110"},{"uid":"4e31-590"},{"uid":"4e31-580"},{"uid":"4e31-738"},{"uid":"4e31-728"},{"uid":"4e31-1944"},{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2124"},{"uid":"4e31-2144"},{"uid":"4e31-2148"},{"uid":"4e31-2152"},{"uid":"4e31-2158"},{"uid":"4e31-538"},{"uid":"4e31-2174"},{"uid":"4e31-2176"},{"uid":"4e31-2178"},{"uid":"4e31-2180"},{"uid":"4e31-2182"},{"uid":"4e31-2184"},{"uid":"4e31-2186"},{"uid":"4e31-2188"},{"uid":"4e31-2190"},{"uid":"4e31-2192"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-1996"},{"uid":"4e31-1998"},{"uid":"4e31-814"},{"uid":"4e31-2062"},{"uid":"4e31-2086"},{"uid":"4e31-802"},{"uid":"4e31-794"},{"uid":"4e31-788"},{"uid":"4e31-784"},{"uid":"4e31-806"},{"uid":"4e31-1954"},{"uid":"4e31-1990"},{"uid":"4e31-798"},{"uid":"4e31-1446"},{"uid":"4e31-1454"},{"uid":"4e31-1464"},{"uid":"4e31-2010"},{"uid":"4e31-822"},{"uid":"4e31-2038"},{"uid":"4e31-2040"},{"uid":"4e31-1472"},{"uid":"4e31-1484"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1494"},{"uid":"4e31-1496"},{"uid":"4e31-1498"},{"uid":"4e31-1980"},{"uid":"4e31-2240"},{"uid":"4e31-282"},{"uid":"4e31-2341"},{"uid":"4e31-402"},{"uid":"4e31-332"},{"uid":"4e31-2046"}]},"4e31-174":{"id":"node_modules/d3-selection/src/namespaces.js","moduleParts":{"dist/rapid.js":"4e31-175"},"imported":[],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-178"},{"uid":"4e31-176"}]},"4e31-176":{"id":"node_modules/d3-selection/src/namespace.js","moduleParts":{"dist/rapid.js":"4e31-177"},"imported":[{"uid":"4e31-174"}],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-178"},{"uid":"4e31-228"}]},"4e31-178":{"id":"node_modules/d3-selection/src/creator.js","moduleParts":{"dist/rapid.js":"4e31-179"},"imported":[{"uid":"4e31-176"},{"uid":"4e31-174"}],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-2483"},{"uid":"4e31-246"},{"uid":"4e31-248"}]},"4e31-180":{"id":"node_modules/d3-selection/src/selector.js","moduleParts":{"dist/rapid.js":"4e31-181"},"imported":[],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-182"},{"uid":"4e31-248"}]},"4e31-182":{"id":"node_modules/d3-selection/src/selection/select.js","moduleParts":{"dist/rapid.js":"4e31-183"},"imported":[{"uid":"4e31-262"},{"uid":"4e31-180"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-184":{"id":"node_modules/d3-selection/src/array.js","moduleParts":{"dist/rapid.js":"4e31-185"},"imported":[],"importedBy":[{"uid":"4e31-272"},{"uid":"4e31-188"}]},"4e31-186":{"id":"node_modules/d3-selection/src/selectorAll.js","moduleParts":{"dist/rapid.js":"4e31-187"},"imported":[],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-188"}]},"4e31-188":{"id":"node_modules/d3-selection/src/selection/selectAll.js","moduleParts":{"dist/rapid.js":"4e31-189"},"imported":[{"uid":"4e31-262"},{"uid":"4e31-184"},{"uid":"4e31-186"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-190":{"id":"node_modules/d3-selection/src/matcher.js","moduleParts":{"dist/rapid.js":"4e31-191"},"imported":[],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-192"},{"uid":"4e31-194"},{"uid":"4e31-196"}]},"4e31-192":{"id":"node_modules/d3-selection/src/selection/selectChild.js","moduleParts":{"dist/rapid.js":"4e31-193"},"imported":[{"uid":"4e31-190"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-194":{"id":"node_modules/d3-selection/src/selection/selectChildren.js","moduleParts":{"dist/rapid.js":"4e31-195"},"imported":[{"uid":"4e31-190"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-196":{"id":"node_modules/d3-selection/src/selection/filter.js","moduleParts":{"dist/rapid.js":"4e31-197"},"imported":[{"uid":"4e31-262"},{"uid":"4e31-190"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-198":{"id":"node_modules/d3-selection/src/selection/sparse.js","moduleParts":{"dist/rapid.js":"4e31-199"},"imported":[],"importedBy":[{"uid":"4e31-200"},{"uid":"4e31-206"}]},"4e31-200":{"id":"node_modules/d3-selection/src/selection/enter.js","moduleParts":{"dist/rapid.js":"4e31-201"},"imported":[{"uid":"4e31-198"},{"uid":"4e31-262"}],"importedBy":[{"uid":"4e31-262"},{"uid":"4e31-204"}]},"4e31-202":{"id":"node_modules/d3-selection/src/constant.js","moduleParts":{"dist/rapid.js":"4e31-203"},"imported":[],"importedBy":[{"uid":"4e31-204"}]},"4e31-204":{"id":"node_modules/d3-selection/src/selection/data.js","moduleParts":{"dist/rapid.js":"4e31-205"},"imported":[{"uid":"4e31-262"},{"uid":"4e31-200"},{"uid":"4e31-202"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-206":{"id":"node_modules/d3-selection/src/selection/exit.js","moduleParts":{"dist/rapid.js":"4e31-207"},"imported":[{"uid":"4e31-198"},{"uid":"4e31-262"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-208":{"id":"node_modules/d3-selection/src/selection/join.js","moduleParts":{"dist/rapid.js":"4e31-209"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-210":{"id":"node_modules/d3-selection/src/selection/merge.js","moduleParts":{"dist/rapid.js":"4e31-211"},"imported":[{"uid":"4e31-262"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-212":{"id":"node_modules/d3-selection/src/selection/order.js","moduleParts":{"dist/rapid.js":"4e31-213"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-214":{"id":"node_modules/d3-selection/src/selection/sort.js","moduleParts":{"dist/rapid.js":"4e31-215"},"imported":[{"uid":"4e31-262"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-216":{"id":"node_modules/d3-selection/src/selection/call.js","moduleParts":{"dist/rapid.js":"4e31-217"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-218":{"id":"node_modules/d3-selection/src/selection/nodes.js","moduleParts":{"dist/rapid.js":"4e31-219"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-220":{"id":"node_modules/d3-selection/src/selection/node.js","moduleParts":{"dist/rapid.js":"4e31-221"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-222":{"id":"node_modules/d3-selection/src/selection/size.js","moduleParts":{"dist/rapid.js":"4e31-223"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-224":{"id":"node_modules/d3-selection/src/selection/empty.js","moduleParts":{"dist/rapid.js":"4e31-225"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-226":{"id":"node_modules/d3-selection/src/selection/each.js","moduleParts":{"dist/rapid.js":"4e31-227"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-228":{"id":"node_modules/d3-selection/src/selection/attr.js","moduleParts":{"dist/rapid.js":"4e31-229"},"imported":[{"uid":"4e31-176"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-230":{"id":"node_modules/d3-selection/src/window.js","moduleParts":{"dist/rapid.js":"4e31-231"},"imported":[],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-232"},{"uid":"4e31-258"}]},"4e31-232":{"id":"node_modules/d3-selection/src/selection/style.js","moduleParts":{"dist/rapid.js":"4e31-233"},"imported":[{"uid":"4e31-230"}],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-262"}]},"4e31-234":{"id":"node_modules/d3-selection/src/selection/property.js","moduleParts":{"dist/rapid.js":"4e31-235"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-236":{"id":"node_modules/d3-selection/src/selection/classed.js","moduleParts":{"dist/rapid.js":"4e31-237"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-238":{"id":"node_modules/d3-selection/src/selection/text.js","moduleParts":{"dist/rapid.js":"4e31-239"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-240":{"id":"node_modules/d3-selection/src/selection/html.js","moduleParts":{"dist/rapid.js":"4e31-241"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-242":{"id":"node_modules/d3-selection/src/selection/raise.js","moduleParts":{"dist/rapid.js":"4e31-243"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-244":{"id":"node_modules/d3-selection/src/selection/lower.js","moduleParts":{"dist/rapid.js":"4e31-245"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-246":{"id":"node_modules/d3-selection/src/selection/append.js","moduleParts":{"dist/rapid.js":"4e31-247"},"imported":[{"uid":"4e31-178"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-248":{"id":"node_modules/d3-selection/src/selection/insert.js","moduleParts":{"dist/rapid.js":"4e31-249"},"imported":[{"uid":"4e31-178"},{"uid":"4e31-180"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-250":{"id":"node_modules/d3-selection/src/selection/remove.js","moduleParts":{"dist/rapid.js":"4e31-251"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-252":{"id":"node_modules/d3-selection/src/selection/clone.js","moduleParts":{"dist/rapid.js":"4e31-253"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-254":{"id":"node_modules/d3-selection/src/selection/datum.js","moduleParts":{"dist/rapid.js":"4e31-255"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-256":{"id":"node_modules/d3-selection/src/selection/on.js","moduleParts":{"dist/rapid.js":"4e31-257"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-258":{"id":"node_modules/d3-selection/src/selection/dispatch.js","moduleParts":{"dist/rapid.js":"4e31-259"},"imported":[{"uid":"4e31-230"}],"importedBy":[{"uid":"4e31-262"}]},"4e31-260":{"id":"node_modules/d3-selection/src/selection/iterator.js","moduleParts":{"dist/rapid.js":"4e31-261"},"imported":[],"importedBy":[{"uid":"4e31-262"}]},"4e31-262":{"id":"node_modules/d3-selection/src/selection/index.js","moduleParts":{"dist/rapid.js":"4e31-263"},"imported":[{"uid":"4e31-182"},{"uid":"4e31-188"},{"uid":"4e31-192"},{"uid":"4e31-194"},{"uid":"4e31-196"},{"uid":"4e31-204"},{"uid":"4e31-200"},{"uid":"4e31-206"},{"uid":"4e31-208"},{"uid":"4e31-210"},{"uid":"4e31-212"},{"uid":"4e31-214"},{"uid":"4e31-216"},{"uid":"4e31-218"},{"uid":"4e31-220"},{"uid":"4e31-222"},{"uid":"4e31-224"},{"uid":"4e31-226"},{"uid":"4e31-228"},{"uid":"4e31-232"},{"uid":"4e31-234"},{"uid":"4e31-236"},{"uid":"4e31-238"},{"uid":"4e31-240"},{"uid":"4e31-242"},{"uid":"4e31-244"},{"uid":"4e31-246"},{"uid":"4e31-248"},{"uid":"4e31-250"},{"uid":"4e31-252"},{"uid":"4e31-254"},{"uid":"4e31-256"},{"uid":"4e31-258"},{"uid":"4e31-260"}],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-264"},{"uid":"4e31-272"},{"uid":"4e31-182"},{"uid":"4e31-188"},{"uid":"4e31-196"},{"uid":"4e31-204"},{"uid":"4e31-200"},{"uid":"4e31-206"},{"uid":"4e31-210"},{"uid":"4e31-214"}]},"4e31-264":{"id":"node_modules/d3-selection/src/select.js","moduleParts":{"dist/rapid.js":"4e31-265"},"imported":[{"uid":"4e31-262"}],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-2483"}]},"4e31-266":{"id":"node_modules/d3-selection/src/index.js","moduleParts":{"dist/rapid.js":"4e31-267"},"imported":[{"uid":"4e31-2483"},{"uid":"4e31-178"},{"uid":"4e31-2484"},{"uid":"4e31-190"},{"uid":"4e31-176"},{"uid":"4e31-174"},{"uid":"4e31-270"},{"uid":"4e31-2485"},{"uid":"4e31-264"},{"uid":"4e31-272"},{"uid":"4e31-262"},{"uid":"4e31-180"},{"uid":"4e31-186"},{"uid":"4e31-232"},{"uid":"4e31-230"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2110"},{"uid":"4e31-590"},{"uid":"4e31-824"},{"uid":"4e31-1510"},{"uid":"4e31-674"},{"uid":"4e31-1940"},{"uid":"4e31-2114"},{"uid":"4e31-2124"},{"uid":"4e31-2152"},{"uid":"4e31-1946"},{"uid":"4e31-2224"},{"uid":"4e31-538"},{"uid":"4e31-2174"},{"uid":"4e31-2176"},{"uid":"4e31-2178"},{"uid":"4e31-2180"},{"uid":"4e31-2182"},{"uid":"4e31-2186"},{"uid":"4e31-2188"},{"uid":"4e31-2190"},{"uid":"4e31-2192"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-1964"},{"uid":"4e31-1966"},{"uid":"4e31-1970"},{"uid":"4e31-1972"},{"uid":"4e31-2064"},{"uid":"4e31-2066"},{"uid":"4e31-810"},{"uid":"4e31-2088"},{"uid":"4e31-1992"},{"uid":"4e31-2070"},{"uid":"4e31-2094"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-2008"},{"uid":"4e31-2076"},{"uid":"4e31-2080"},{"uid":"4e31-2108"},{"uid":"4e31-1950"},{"uid":"4e31-794"},{"uid":"4e31-788"},{"uid":"4e31-784"},{"uid":"4e31-1952"},{"uid":"4e31-1954"},{"uid":"4e31-1988"},{"uid":"4e31-798"},{"uid":"4e31-800"},{"uid":"4e31-1960"},{"uid":"4e31-830"},{"uid":"4e31-832"},{"uid":"4e31-1446"},{"uid":"4e31-1974"},{"uid":"4e31-2012"},{"uid":"4e31-1976"},{"uid":"4e31-1448"},{"uid":"4e31-1454"},{"uid":"4e31-588"},{"uid":"4e31-1978"},{"uid":"4e31-586"},{"uid":"4e31-1456"},{"uid":"4e31-1464"},{"uid":"4e31-790"},{"uid":"4e31-2010"},{"uid":"4e31-2014"},{"uid":"4e31-2016"},{"uid":"4e31-822"},{"uid":"4e31-796"},{"uid":"4e31-804"},{"uid":"4e31-2054"},{"uid":"4e31-2038"},{"uid":"4e31-1508"},{"uid":"4e31-2042"},{"uid":"4e31-2044"},{"uid":"4e31-2040"},{"uid":"4e31-2052"},{"uid":"4e31-2154"},{"uid":"4e31-1482"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1498"},{"uid":"4e31-2058"},{"uid":"4e31-2068"},{"uid":"4e31-808"},{"uid":"4e31-1980"},{"uid":"4e31-1986"},{"uid":"4e31-2048"},{"uid":"4e31-2240"},{"uid":"4e31-282"},{"uid":"4e31-276"},{"uid":"4e31-390"},{"uid":"4e31-380"},{"uid":"4e31-402"},{"uid":"4e31-1466"},{"uid":"4e31-342"},{"uid":"4e31-344"},{"uid":"4e31-354"},{"uid":"4e31-362"},{"uid":"4e31-364"},{"uid":"4e31-366"},{"uid":"4e31-368"},{"uid":"4e31-2022"},{"uid":"4e31-2026"},{"uid":"4e31-2028"},{"uid":"4e31-2030"},{"uid":"4e31-2034"}]},"4e31-268":{"id":"node_modules/d3-selection/src/sourceEvent.js","moduleParts":{"dist/rapid.js":"4e31-269"},"imported":[],"importedBy":[{"uid":"4e31-270"},{"uid":"4e31-2485"}]},"4e31-270":{"id":"node_modules/d3-selection/src/pointer.js","moduleParts":{"dist/rapid.js":"4e31-271"},"imported":[{"uid":"4e31-268"}],"importedBy":[{"uid":"4e31-266"},{"uid":"4e31-2485"}]},"4e31-272":{"id":"node_modules/d3-selection/src/selectAll.js","moduleParts":{"dist/rapid.js":"4e31-273"},"imported":[{"uid":"4e31-184"},{"uid":"4e31-262"}],"importedBy":[{"uid":"4e31-266"}]},"4e31-274":{"id":"node_modules/d3-drag/src/noevent.js","moduleParts":{"dist/rapid.js":"4e31-275"},"imported":[],"importedBy":[{"uid":"4e31-282"},{"uid":"4e31-276"}]},"4e31-276":{"id":"node_modules/d3-drag/src/nodrag.js","moduleParts":{"dist/rapid.js":"4e31-277"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-274"}],"importedBy":[{"uid":"4e31-284"},{"uid":"4e31-282"}]},"4e31-278":{"id":"node_modules/d3-drag/src/constant.js","moduleParts":{"dist/rapid.js":"4e31-279"},"imported":[],"importedBy":[{"uid":"4e31-282"}]},"4e31-280":{"id":"node_modules/d3-drag/src/event.js","moduleParts":{"dist/rapid.js":"4e31-281"},"imported":[],"importedBy":[{"uid":"4e31-282"}]},"4e31-282":{"id":"node_modules/d3-drag/src/drag.js","moduleParts":{"dist/rapid.js":"4e31-283"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-276"},{"uid":"4e31-274"},{"uid":"4e31-278"},{"uid":"4e31-280"}],"importedBy":[{"uid":"4e31-284"}]},"4e31-284":{"id":"node_modules/d3-drag/src/index.js","moduleParts":{"dist/rapid.js":"4e31-285"},"imported":[{"uid":"4e31-282"},{"uid":"4e31-276"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2174"},{"uid":"4e31-2002"},{"uid":"4e31-2240"},{"uid":"4e31-402"}]},"4e31-286":{"id":"node_modules/d3-color/src/define.js","moduleParts":{"dist/rapid.js":"4e31-287"},"imported":[],"importedBy":[{"uid":"4e31-288"},{"uid":"4e31-2314"},{"uid":"4e31-2315"}]},"4e31-288":{"id":"node_modules/d3-color/src/color.js","moduleParts":{"dist/rapid.js":"4e31-289"},"imported":[{"uid":"4e31-286"}],"importedBy":[{"uid":"4e31-290"},{"uid":"4e31-2314"},{"uid":"4e31-2315"}]},"4e31-290":{"id":"node_modules/d3-color/src/index.js","moduleParts":{"dist/rapid.js":"4e31-291"},"imported":[{"uid":"4e31-288"},{"uid":"4e31-2314"},{"uid":"4e31-2315"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-314"},{"uid":"4e31-300"},{"uid":"4e31-2395"},{"uid":"4e31-2396"},{"uid":"4e31-2397"},{"uid":"4e31-2398"},{"uid":"4e31-2478"},{"uid":"4e31-2479"},{"uid":"4e31-2480"},{"uid":"4e31-340"}]},"4e31-292":{"id":"node_modules/d3-interpolate/src/basis.js","moduleParts":{"dist/rapid.js":"4e31-293"},"imported":[],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-294"},{"uid":"4e31-300"}]},"4e31-294":{"id":"node_modules/d3-interpolate/src/basisClosed.js","moduleParts":{"dist/rapid.js":"4e31-295"},"imported":[{"uid":"4e31-292"}],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-300"}]},"4e31-296":{"id":"node_modules/d3-interpolate/src/constant.js","moduleParts":{"dist/rapid.js":"4e31-297"},"imported":[],"importedBy":[{"uid":"4e31-314"},{"uid":"4e31-298"}]},"4e31-298":{"id":"node_modules/d3-interpolate/src/color.js","moduleParts":{"dist/rapid.js":"4e31-299"},"imported":[{"uid":"4e31-296"}],"importedBy":[{"uid":"4e31-2393"},{"uid":"4e31-300"},{"uid":"4e31-2395"},{"uid":"4e31-2396"},{"uid":"4e31-2397"},{"uid":"4e31-2398"}]},"4e31-300":{"id":"node_modules/d3-interpolate/src/rgb.js","moduleParts":{"dist/rapid.js":"4e31-301"},"imported":[{"uid":"4e31-290"},{"uid":"4e31-292"},{"uid":"4e31-294"},{"uid":"4e31-298"}],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-314"}]},"4e31-302":{"id":"node_modules/d3-interpolate/src/numberArray.js","moduleParts":{"dist/rapid.js":"4e31-303"},"imported":[],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-314"},{"uid":"4e31-304"}]},"4e31-304":{"id":"node_modules/d3-interpolate/src/array.js","moduleParts":{"dist/rapid.js":"4e31-305"},"imported":[{"uid":"4e31-314"},{"uid":"4e31-302"}],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-314"}]},"4e31-306":{"id":"node_modules/d3-interpolate/src/date.js","moduleParts":{"dist/rapid.js":"4e31-307"},"imported":[],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-314"}]},"4e31-308":{"id":"node_modules/d3-interpolate/src/number.js","moduleParts":{"dist/rapid.js":"4e31-309"},"imported":[],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-314"},{"uid":"4e31-312"},{"uid":"4e31-322"}]},"4e31-310":{"id":"node_modules/d3-interpolate/src/object.js","moduleParts":{"dist/rapid.js":"4e31-311"},"imported":[{"uid":"4e31-314"}],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-314"}]},"4e31-312":{"id":"node_modules/d3-interpolate/src/string.js","moduleParts":{"dist/rapid.js":"4e31-313"},"imported":[{"uid":"4e31-308"}],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-314"}]},"4e31-314":{"id":"node_modules/d3-interpolate/src/value.js","moduleParts":{"dist/rapid.js":"4e31-315"},"imported":[{"uid":"4e31-290"},{"uid":"4e31-300"},{"uid":"4e31-304"},{"uid":"4e31-306"},{"uid":"4e31-308"},{"uid":"4e31-310"},{"uid":"4e31-312"},{"uid":"4e31-296"},{"uid":"4e31-302"}],"importedBy":[{"uid":"4e31-316"},{"uid":"4e31-304"},{"uid":"4e31-310"},{"uid":"4e31-2399"}]},"4e31-316":{"id":"node_modules/d3-interpolate/src/index.js","moduleParts":{"dist/rapid.js":"4e31-317"},"imported":[{"uid":"4e31-314"},{"uid":"4e31-304"},{"uid":"4e31-292"},{"uid":"4e31-294"},{"uid":"4e31-306"},{"uid":"4e31-2392"},{"uid":"4e31-2393"},{"uid":"4e31-308"},{"uid":"4e31-302"},{"uid":"4e31-310"},{"uid":"4e31-2394"},{"uid":"4e31-312"},{"uid":"4e31-322"},{"uid":"4e31-324"},{"uid":"4e31-300"},{"uid":"4e31-2395"},{"uid":"4e31-2396"},{"uid":"4e31-2397"},{"uid":"4e31-2398"},{"uid":"4e31-2399"},{"uid":"4e31-2400"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2012"},{"uid":"4e31-2014"},{"uid":"4e31-1490"},{"uid":"4e31-1884"},{"uid":"4e31-2240"},{"uid":"4e31-2436"},{"uid":"4e31-2438"},{"uid":"4e31-2478"},{"uid":"4e31-2479"},{"uid":"4e31-402"},{"uid":"4e31-2639"},{"uid":"4e31-2642"},{"uid":"4e31-342"},{"uid":"4e31-368"},{"uid":"4e31-2030"},{"uid":"4e31-340"}]},"4e31-318":{"id":"node_modules/d3-interpolate/src/transform/decompose.js","moduleParts":{"dist/rapid.js":"4e31-319"},"imported":[],"importedBy":[{"uid":"4e31-320"}]},"4e31-320":{"id":"node_modules/d3-interpolate/src/transform/parse.js","moduleParts":{"dist/rapid.js":"4e31-321"},"imported":[{"uid":"4e31-318"}],"importedBy":[{"uid":"4e31-322"}]},"4e31-322":{"id":"node_modules/d3-interpolate/src/transform/index.js","moduleParts":{"dist/rapid.js":"4e31-323"},"imported":[{"uid":"4e31-308"},{"uid":"4e31-320"}],"importedBy":[{"uid":"4e31-316"}]},"4e31-324":{"id":"node_modules/d3-interpolate/src/zoom.js","moduleParts":{"dist/rapid.js":"4e31-325"},"imported":[],"importedBy":[{"uid":"4e31-316"}]},"4e31-326":{"id":"node_modules/d3-timer/src/timer.js","moduleParts":{"dist/rapid.js":"4e31-327"},"imported":[],"importedBy":[{"uid":"4e31-328"},{"uid":"4e31-330"},{"uid":"4e31-2550"}]},"4e31-328":{"id":"node_modules/d3-timer/src/index.js","moduleParts":{"dist/rapid.js":"4e31-329"},"imported":[{"uid":"4e31-326"},{"uid":"4e31-330"},{"uid":"4e31-2550"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2152"},{"uid":"4e31-1478"},{"uid":"4e31-2341"},{"uid":"4e31-388"},{"uid":"4e31-332"}]},"4e31-330":{"id":"node_modules/d3-timer/src/timeout.js","moduleParts":{"dist/rapid.js":"4e31-331"},"imported":[{"uid":"4e31-326"}],"importedBy":[{"uid":"4e31-328"}]},"4e31-332":{"id":"node_modules/d3-transition/src/transition/schedule.js","moduleParts":{"dist/rapid.js":"4e31-333"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-328"}],"importedBy":[{"uid":"4e31-2551"},{"uid":"4e31-334"},{"uid":"4e31-388"},{"uid":"4e31-346"},{"uid":"4e31-348"},{"uid":"4e31-350"},{"uid":"4e31-352"},{"uid":"4e31-358"},{"uid":"4e31-362"},{"uid":"4e31-364"},{"uid":"4e31-368"},{"uid":"4e31-376"},{"uid":"4e31-338"},{"uid":"4e31-378"}]},"4e31-334":{"id":"node_modules/d3-transition/src/interrupt.js","moduleParts":{"dist/rapid.js":"4e31-335"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-392"},{"uid":"4e31-336"}]},"4e31-336":{"id":"node_modules/d3-transition/src/selection/interrupt.js","moduleParts":{"dist/rapid.js":"4e31-337"},"imported":[{"uid":"4e31-334"}],"importedBy":[{"uid":"4e31-390"}]},"4e31-338":{"id":"node_modules/d3-transition/src/transition/tween.js","moduleParts":{"dist/rapid.js":"4e31-339"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"},{"uid":"4e31-342"},{"uid":"4e31-368"},{"uid":"4e31-372"}]},"4e31-340":{"id":"node_modules/d3-transition/src/transition/interpolate.js","moduleParts":{"dist/rapid.js":"4e31-341"},"imported":[{"uid":"4e31-290"},{"uid":"4e31-316"}],"importedBy":[{"uid":"4e31-342"},{"uid":"4e31-368"}]},"4e31-342":{"id":"node_modules/d3-transition/src/transition/attr.js","moduleParts":{"dist/rapid.js":"4e31-343"},"imported":[{"uid":"4e31-316"},{"uid":"4e31-266"},{"uid":"4e31-338"},{"uid":"4e31-340"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-344":{"id":"node_modules/d3-transition/src/transition/attrTween.js","moduleParts":{"dist/rapid.js":"4e31-345"},"imported":[{"uid":"4e31-266"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-346":{"id":"node_modules/d3-transition/src/transition/delay.js","moduleParts":{"dist/rapid.js":"4e31-347"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-348":{"id":"node_modules/d3-transition/src/transition/duration.js","moduleParts":{"dist/rapid.js":"4e31-349"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-350":{"id":"node_modules/d3-transition/src/transition/ease.js","moduleParts":{"dist/rapid.js":"4e31-351"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-352":{"id":"node_modules/d3-transition/src/transition/easeVarying.js","moduleParts":{"dist/rapid.js":"4e31-353"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-354":{"id":"node_modules/d3-transition/src/transition/filter.js","moduleParts":{"dist/rapid.js":"4e31-355"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-380"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-356":{"id":"node_modules/d3-transition/src/transition/merge.js","moduleParts":{"dist/rapid.js":"4e31-357"},"imported":[{"uid":"4e31-380"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-358":{"id":"node_modules/d3-transition/src/transition/on.js","moduleParts":{"dist/rapid.js":"4e31-359"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-360":{"id":"node_modules/d3-transition/src/transition/remove.js","moduleParts":{"dist/rapid.js":"4e31-361"},"imported":[],"importedBy":[{"uid":"4e31-380"}]},"4e31-362":{"id":"node_modules/d3-transition/src/transition/select.js","moduleParts":{"dist/rapid.js":"4e31-363"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-380"},{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-364":{"id":"node_modules/d3-transition/src/transition/selectAll.js","moduleParts":{"dist/rapid.js":"4e31-365"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-380"},{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-366":{"id":"node_modules/d3-transition/src/transition/selection.js","moduleParts":{"dist/rapid.js":"4e31-367"},"imported":[{"uid":"4e31-266"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-368":{"id":"node_modules/d3-transition/src/transition/style.js","moduleParts":{"dist/rapid.js":"4e31-369"},"imported":[{"uid":"4e31-316"},{"uid":"4e31-266"},{"uid":"4e31-332"},{"uid":"4e31-338"},{"uid":"4e31-340"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-370":{"id":"node_modules/d3-transition/src/transition/styleTween.js","moduleParts":{"dist/rapid.js":"4e31-371"},"imported":[],"importedBy":[{"uid":"4e31-380"}]},"4e31-372":{"id":"node_modules/d3-transition/src/transition/text.js","moduleParts":{"dist/rapid.js":"4e31-373"},"imported":[{"uid":"4e31-338"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-374":{"id":"node_modules/d3-transition/src/transition/textTween.js","moduleParts":{"dist/rapid.js":"4e31-375"},"imported":[],"importedBy":[{"uid":"4e31-380"}]},"4e31-376":{"id":"node_modules/d3-transition/src/transition/transition.js","moduleParts":{"dist/rapid.js":"4e31-377"},"imported":[{"uid":"4e31-380"},{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-378":{"id":"node_modules/d3-transition/src/transition/end.js","moduleParts":{"dist/rapid.js":"4e31-379"},"imported":[{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-380"}]},"4e31-380":{"id":"node_modules/d3-transition/src/transition/index.js","moduleParts":{"dist/rapid.js":"4e31-381"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-342"},{"uid":"4e31-344"},{"uid":"4e31-346"},{"uid":"4e31-348"},{"uid":"4e31-350"},{"uid":"4e31-352"},{"uid":"4e31-354"},{"uid":"4e31-356"},{"uid":"4e31-358"},{"uid":"4e31-360"},{"uid":"4e31-362"},{"uid":"4e31-364"},{"uid":"4e31-366"},{"uid":"4e31-368"},{"uid":"4e31-370"},{"uid":"4e31-372"},{"uid":"4e31-374"},{"uid":"4e31-376"},{"uid":"4e31-338"},{"uid":"4e31-378"}],"importedBy":[{"uid":"4e31-392"},{"uid":"4e31-2551"},{"uid":"4e31-388"},{"uid":"4e31-354"},{"uid":"4e31-356"},{"uid":"4e31-362"},{"uid":"4e31-364"},{"uid":"4e31-376"}]},"4e31-382":{"id":"node_modules/d3-ease/src/linear.js","moduleParts":{"dist/rapid.js":"4e31-383"},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-384":{"id":"node_modules/d3-ease/src/index.js","moduleParts":{"dist/rapid.js":"4e31-385"},"imported":[{"uid":"4e31-382"},{"uid":"4e31-2324"},{"uid":"4e31-386"},{"uid":"4e31-2325"},{"uid":"4e31-2326"},{"uid":"4e31-2327"},{"uid":"4e31-2328"},{"uid":"4e31-2329"},{"uid":"4e31-2330"},{"uid":"4e31-2331"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-590"},{"uid":"4e31-2064"},{"uid":"4e31-1482"},{"uid":"4e31-388"}]},"4e31-386":{"id":"node_modules/d3-ease/src/cubic.js","moduleParts":{"dist/rapid.js":"4e31-387"},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-388":{"id":"node_modules/d3-transition/src/selection/transition.js","moduleParts":{"dist/rapid.js":"4e31-389"},"imported":[{"uid":"4e31-380"},{"uid":"4e31-332"},{"uid":"4e31-384"},{"uid":"4e31-328"}],"importedBy":[{"uid":"4e31-390"}]},"4e31-390":{"id":"node_modules/d3-transition/src/selection/index.js","moduleParts":{"dist/rapid.js":"4e31-391"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-336"},{"uid":"4e31-388"}],"importedBy":[{"uid":"4e31-392"}]},"4e31-392":{"id":"node_modules/d3-transition/src/index.js","moduleParts":{"dist/rapid.js":"4e31-393"},"imported":[{"uid":"4e31-390"},{"uid":"4e31-380"},{"uid":"4e31-2551"},{"uid":"4e31-334"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2240"},{"uid":"4e31-402"}]},"4e31-394":{"id":"node_modules/d3-zoom/src/constant.js","moduleParts":{"dist/rapid.js":"4e31-395"},"imported":[],"importedBy":[{"uid":"4e31-402"}]},"4e31-396":{"id":"node_modules/d3-zoom/src/event.js","moduleParts":{"dist/rapid.js":"4e31-397"},"imported":[],"importedBy":[{"uid":"4e31-402"}]},"4e31-398":{"id":"node_modules/d3-zoom/src/transform.js","moduleParts":{"dist/rapid.js":"4e31-399"},"imported":[],"importedBy":[{"uid":"4e31-404"},{"uid":"4e31-402"}]},"4e31-400":{"id":"node_modules/d3-zoom/src/noevent.js","moduleParts":{"dist/rapid.js":"4e31-401"},"imported":[],"importedBy":[{"uid":"4e31-402"}]},"4e31-402":{"id":"node_modules/d3-zoom/src/zoom.js","moduleParts":{"dist/rapid.js":"4e31-403"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-284"},{"uid":"4e31-316"},{"uid":"4e31-266"},{"uid":"4e31-392"},{"uid":"4e31-394"},{"uid":"4e31-396"},{"uid":"4e31-398"},{"uid":"4e31-400"}],"importedBy":[{"uid":"4e31-404"}]},"4e31-404":{"id":"node_modules/d3-zoom/src/index.js","moduleParts":{"dist/rapid.js":"4e31-405"},"imported":[{"uid":"4e31-402"},{"uid":"4e31-398"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-406"},{"uid":"4e31-2144"},{"uid":"4e31-1978"}]},"4e31-406":{"id":"node_modules/@rapid-sdk/math/built/math.mjs","moduleParts":{"dist/rapid.js":"4e31-407"},"imported":[{"uid":"4e31-162"},{"uid":"4e31-146"},{"uid":"4e31-404"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-592"},{"uid":"4e31-602"},{"uid":"4e31-630"},{"uid":"4e31-634"},{"uid":"4e31-640"},{"uid":"4e31-642"},{"uid":"4e31-654"},{"uid":"4e31-768"},{"uid":"4e31-648"},{"uid":"4e31-778"},{"uid":"4e31-530"},{"uid":"4e31-668"},{"uid":"4e31-670"},{"uid":"4e31-658"},{"uid":"4e31-2218"},{"uid":"4e31-744"},{"uid":"4e31-746"},{"uid":"4e31-750"},{"uid":"4e31-752"},{"uid":"4e31-756"},{"uid":"4e31-758"},{"uid":"4e31-2110"},{"uid":"4e31-580"},{"uid":"4e31-728"},{"uid":"4e31-582"},{"uid":"4e31-594"},{"uid":"4e31-598"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-780"},{"uid":"4e31-1510"},{"uid":"4e31-1476"},{"uid":"4e31-620"},{"uid":"4e31-656"},{"uid":"4e31-510"},{"uid":"4e31-514"},{"uid":"4e31-516"},{"uid":"4e31-518"},{"uid":"4e31-2206"},{"uid":"4e31-534"},{"uid":"4e31-1512"},{"uid":"4e31-1514"},{"uid":"4e31-1940"},{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2124"},{"uid":"4e31-2128"},{"uid":"4e31-2144"},{"uid":"4e31-2148"},{"uid":"4e31-2152"},{"uid":"4e31-2158"},{"uid":"4e31-2180"},{"uid":"4e31-1964"},{"uid":"4e31-1972"},{"uid":"4e31-2066"},{"uid":"4e31-2076"},{"uid":"4e31-784"},{"uid":"4e31-1954"},{"uid":"4e31-1988"},{"uid":"4e31-1960"},{"uid":"4e31-1978"},{"uid":"4e31-1984"},{"uid":"4e31-2014"},{"uid":"4e31-2040"},{"uid":"4e31-2200"},{"uid":"4e31-682"},{"uid":"4e31-684"},{"uid":"4e31-686"},{"uid":"4e31-688"},{"uid":"4e31-696"},{"uid":"4e31-702"},{"uid":"4e31-722"},{"uid":"4e31-754"},{"uid":"4e31-1936"},{"uid":"4e31-1480"},{"uid":"4e31-1482"},{"uid":"4e31-1484"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1494"},{"uid":"4e31-1498"},{"uid":"4e31-1884"},{"uid":"4e31-678"},{"uid":"4e31-1908"},{"uid":"4e31-1916"},{"uid":"4e31-1926"},{"uid":"4e31-1930"},{"uid":"4e31-1894"},{"uid":"4e31-1892"},{"uid":"4e31-1888"}]},"4e31-408":{"id":"modules/osm/entity.js","moduleParts":{"dist/rapid.js":"4e31-409"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-114"}],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-590"},{"uid":"4e31-510"},{"uid":"4e31-514"},{"uid":"4e31-518"},{"uid":"4e31-2206"},{"uid":"4e31-534"},{"uid":"4e31-2174"},{"uid":"4e31-1500"},{"uid":"4e31-1988"}]},"4e31-410":{"id":"modules/osm/lanes.js","moduleParts":{"dist/rapid.js":"4e31-411"},"imported":[],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-2206"}]},"4e31-412":{"id":"modules/util/detect.js","moduleParts":{"dist/rapid.js":"4e31-413"},"imported":[],"importedBy":[{"uid":"4e31-414"},{"uid":"4e31-756"},{"uid":"4e31-498"},{"uid":"4e31-2108"},{"uid":"4e31-616"},{"uid":"4e31-1958"},{"uid":"4e31-1986"},{"uid":"4e31-1518"}]},"4e31-414":{"id":"modules/util/index.js","moduleParts":{"dist/rapid.js":"4e31-415"},"imported":[{"uid":"4e31-412"},{"uid":"4e31-2200"},{"uid":"4e31-2202"},{"uid":"4e31-2052"},{"uid":"4e31-508"},{"uid":"4e31-2204"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-2198"},{"uid":"4e31-530"},{"uid":"4e31-2110"},{"uid":"4e31-590"},{"uid":"4e31-580"},{"uid":"4e31-738"},{"uid":"4e31-728"},{"uid":"4e31-824"},{"uid":"4e31-1510"},{"uid":"4e31-674"},{"uid":"4e31-608"},{"uid":"4e31-618"},{"uid":"4e31-620"},{"uid":"4e31-632"},{"uid":"4e31-650"},{"uid":"4e31-672"},{"uid":"4e31-2206"},{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2124"},{"uid":"4e31-2144"},{"uid":"4e31-2148"},{"uid":"4e31-2152"},{"uid":"4e31-2158"},{"uid":"4e31-2174"},{"uid":"4e31-2176"},{"uid":"4e31-2178"},{"uid":"4e31-2180"},{"uid":"4e31-2182"},{"uid":"4e31-2186"},{"uid":"4e31-2188"},{"uid":"4e31-2190"},{"uid":"4e31-2192"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-810"},{"uid":"4e31-1992"},{"uid":"4e31-1996"},{"uid":"4e31-2094"},{"uid":"4e31-1998"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-2008"},{"uid":"4e31-2076"},{"uid":"4e31-2080"},{"uid":"4e31-2062"},{"uid":"4e31-2086"},{"uid":"4e31-802"},{"uid":"4e31-794"},{"uid":"4e31-788"},{"uid":"4e31-784"},{"uid":"4e31-806"},{"uid":"4e31-1990"},{"uid":"4e31-1988"},{"uid":"4e31-798"},{"uid":"4e31-800"},{"uid":"4e31-832"},{"uid":"4e31-1446"},{"uid":"4e31-1448"},{"uid":"4e31-1454"},{"uid":"4e31-1978"},{"uid":"4e31-586"},{"uid":"4e31-1464"},{"uid":"4e31-2010"},{"uid":"4e31-2014"},{"uid":"4e31-2038"},{"uid":"4e31-2040"},{"uid":"4e31-682"},{"uid":"4e31-684"},{"uid":"4e31-686"},{"uid":"4e31-688"},{"uid":"4e31-690"},{"uid":"4e31-692"},{"uid":"4e31-694"},{"uid":"4e31-696"},{"uid":"4e31-698"},{"uid":"4e31-702"},{"uid":"4e31-710"},{"uid":"4e31-712"},{"uid":"4e31-718"},{"uid":"4e31-720"},{"uid":"4e31-726"},{"uid":"4e31-742"},{"uid":"4e31-1472"},{"uid":"4e31-1494"},{"uid":"4e31-808"},{"uid":"4e31-1980"},{"uid":"4e31-1466"},{"uid":"4e31-678"},{"uid":"4e31-1916"},{"uid":"4e31-1924"}]},"4e31-416":{"id":"modules/core/preferences.js","moduleParts":{"dist/rapid.js":"4e31-417"},"imported":[],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-2198"},{"uid":"4e31-634"},{"uid":"4e31-2110"},{"uid":"4e31-590"},{"uid":"4e31-728"},{"uid":"4e31-608"},{"uid":"4e31-618"},{"uid":"4e31-620"},{"uid":"4e31-624"},{"uid":"4e31-632"},{"uid":"4e31-646"},{"uid":"4e31-650"},{"uid":"4e31-660"},{"uid":"4e31-664"},{"uid":"4e31-672"},{"uid":"4e31-1512"},{"uid":"4e31-1940"},{"uid":"4e31-1944"},{"uid":"4e31-1500"},{"uid":"4e31-2060"},{"uid":"4e31-2064"},{"uid":"4e31-1992"},{"uid":"4e31-2100"},{"uid":"4e31-2098"},{"uid":"4e31-814"},{"uid":"4e31-2076"},{"uid":"4e31-2078"},{"uid":"4e31-2080"},{"uid":"4e31-2082"},{"uid":"4e31-2062"},{"uid":"4e31-2086"},{"uid":"4e31-2108"},{"uid":"4e31-788"},{"uid":"4e31-806"},{"uid":"4e31-1976"},{"uid":"4e31-1456"},{"uid":"4e31-1994"},{"uid":"4e31-2236"},{"uid":"4e31-2050"},{"uid":"4e31-2042"},{"uid":"4e31-2044"},{"uid":"4e31-1504"},{"uid":"4e31-2106"},{"uid":"4e31-2040"},{"uid":"4e31-726"},{"uid":"4e31-1518"},{"uid":"4e31-1894"}]},"4e31-418":{"id":"modules/core/file_fetcher.js","moduleParts":{"dist/rapid.js":"4e31-419"},"imported":[],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-2198"},{"uid":"4e31-2110"},{"uid":"4e31-498"},{"uid":"4e31-738"},{"uid":"4e31-1512"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2174"},{"uid":"4e31-2176"},{"uid":"4e31-2180"},{"uid":"4e31-2186"},{"uid":"4e31-2196"},{"uid":"4e31-1500"},{"uid":"4e31-810"},{"uid":"4e31-2236"},{"uid":"4e31-822"},{"uid":"4e31-1986"}]},"4e31-420":{"id":"node_modules/@pixi/utils/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-421"},"imported":[{"uid":"4e31-434"},{"uid":"4e31-424"},{"uid":"4e31-4"},{"uid":"4e31-6"},{"uid":"4e31-436"},{"uid":"4e31-438"},{"uid":"4e31-442"},{"uid":"4e31-444"},{"uid":"4e31-454"},{"uid":"4e31-458"},{"uid":"4e31-460"},{"uid":"4e31-462"},{"uid":"4e31-464"},{"uid":"4e31-466"},{"uid":"4e31-468"},{"uid":"4e31-470"},{"uid":"4e31-472"},{"uid":"4e31-474"},{"uid":"4e31-440"},{"uid":"4e31-476"},{"uid":"4e31-478"},{"uid":"4e31-480"},{"uid":"4e31-482"},{"uid":"4e31-484"},{"uid":"4e31-486"},{"uid":"4e31-488"},{"uid":"4e31-490"},{"uid":"4e31-2552"}],"importedBy":[{"uid":"4e31-496"},{"uid":"4e31-1512"},{"uid":"4e31-1940"},{"uid":"4e31-1942"},{"uid":"4e31-604"},{"uid":"4e31-742"},{"uid":"4e31-1936"},{"uid":"4e31-1518"},{"uid":"4e31-1932"},{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-942"},{"uid":"4e31-866"},{"uid":"4e31-1008"},{"uid":"4e31-1080"},{"uid":"4e31-974"},{"uid":"4e31-922"},{"uid":"4e31-856"},{"uid":"4e31-970"},{"uid":"4e31-1042"},{"uid":"4e31-1034"},{"uid":"4e31-964"},{"uid":"4e31-1094"},{"uid":"4e31-1052"},{"uid":"4e31-864"}]},"4e31-422":{"id":"node_modules/@pixi/settings/lib/adapter.mjs","moduleParts":{"dist/rapid.js":"4e31-423"},"imported":[],"importedBy":[{"uid":"4e31-424"},{"uid":"4e31-426"}]},"4e31-424":{"id":"node_modules/@pixi/settings/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-425"},"imported":[{"uid":"4e31-422"},{"uid":"4e31-2653"},{"uid":"4e31-2654"},{"uid":"4e31-426"},{"uid":"4e31-432"}],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-434"},{"uid":"4e31-438"},{"uid":"4e31-444"},{"uid":"4e31-480"},{"uid":"4e31-490"},{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-942"},{"uid":"4e31-956"},{"uid":"4e31-986"},{"uid":"4e31-988"},{"uid":"4e31-1004"},{"uid":"4e31-1006"},{"uid":"4e31-1080"},{"uid":"4e31-908"},{"uid":"4e31-856"},{"uid":"4e31-970"},{"uid":"4e31-1046"},{"uid":"4e31-1092"},{"uid":"4e31-966"},{"uid":"4e31-1094"},{"uid":"4e31-1052"},{"uid":"4e31-932"},{"uid":"4e31-934"}]},"4e31-426":{"id":"node_modules/@pixi/settings/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-427"},"imported":[{"uid":"4e31-422"}],"importedBy":[{"uid":"4e31-424"}]},"4e31-428":{"id":"node_modules/ismobilejs/esm/isMobile.js","moduleParts":{"dist/rapid.js":"4e31-429"},"imported":[],"importedBy":[{"uid":"4e31-430"}]},"4e31-430":{"id":"node_modules/ismobilejs/esm/index.js","moduleParts":{"dist/rapid.js":"4e31-431"},"imported":[{"uid":"4e31-428"}],"importedBy":[{"uid":"4e31-432"},{"uid":"4e31-1542"}]},"4e31-432":{"id":"node_modules/@pixi/settings/lib/utils/isMobile.mjs","moduleParts":{"dist/rapid.js":"4e31-433"},"imported":[{"uid":"4e31-430"}],"importedBy":[{"uid":"4e31-424"}]},"4e31-434":{"id":"node_modules/@pixi/utils/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-435"},"imported":[{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-444"},{"uid":"4e31-490"}]},"4e31-436":{"id":"node_modules/@pixi/utils/lib/url.mjs","moduleParts":{"dist/rapid.js":"4e31-437"},"imported":[{"uid":"4e31-18"}],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-488"}]},"4e31-438":{"id":"node_modules/@pixi/utils/lib/path.mjs","moduleParts":{"dist/rapid.js":"4e31-439"},"imported":[{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-440":{"id":"node_modules/@pixi/utils/lib/logging/deprecation.mjs","moduleParts":{"dist/rapid.js":"4e31-441"},"imported":[],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-442"},{"uid":"4e31-454"},{"uid":"4e31-458"}]},"4e31-442":{"id":"node_modules/@pixi/utils/lib/browser/hello.mjs","moduleParts":{"dist/rapid.js":"4e31-443"},"imported":[{"uid":"4e31-440"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-444":{"id":"node_modules/@pixi/utils/lib/browser/isWebGLSupported.mjs","moduleParts":{"dist/rapid.js":"4e31-445"},"imported":[{"uid":"4e31-434"},{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-446":{"id":"node_modules/colord/index.mjs","moduleParts":{"dist/rapid.js":"4e31-447"},"imported":[],"importedBy":[{"uid":"4e31-450"},{"uid":"4e31-834"},{"uid":"4e31-1554"}]},"4e31-448":{"id":"node_modules/colord/plugins/names.mjs","moduleParts":{"dist/rapid.js":"4e31-449"},"imported":[],"importedBy":[{"uid":"4e31-450"},{"uid":"4e31-834"},{"uid":"4e31-1554"}]},"4e31-450":{"id":"node_modules/@pixi/utils/node_modules/@pixi/color/lib/Color.mjs","moduleParts":{"dist/rapid.js":"4e31-451"},"imported":[{"uid":"4e31-446"},{"uid":"4e31-448"}],"importedBy":[{"uid":"4e31-452"}]},"4e31-452":{"id":"node_modules/@pixi/utils/node_modules/@pixi/color/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-453"},"imported":[{"uid":"4e31-450"}],"importedBy":[{"uid":"4e31-454"},{"uid":"4e31-458"}]},"4e31-454":{"id":"node_modules/@pixi/utils/lib/color/hex.mjs","moduleParts":{"dist/rapid.js":"4e31-455"},"imported":[{"uid":"4e31-452"},{"uid":"4e31-440"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-456":{"id":"node_modules/@pixi/constants/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-457"},"imported":[],"importedBy":[{"uid":"4e31-458"},{"uid":"4e31-1050"},{"uid":"4e31-1520"},{"uid":"4e31-1048"},{"uid":"4e31-858"},{"uid":"4e31-868"},{"uid":"4e31-942"},{"uid":"4e31-956"},{"uid":"4e31-948"},{"uid":"4e31-980"},{"uid":"4e31-982"},{"uid":"4e31-960"},{"uid":"4e31-986"},{"uid":"4e31-984"},{"uid":"4e31-1072"},{"uid":"4e31-862"},{"uid":"4e31-860"},{"uid":"4e31-866"},{"uid":"4e31-988"},{"uid":"4e31-998"},{"uid":"4e31-1000"},{"uid":"4e31-1080"},{"uid":"4e31-962"},{"uid":"4e31-974"},{"uid":"4e31-922"},{"uid":"4e31-924"},{"uid":"4e31-908"},{"uid":"4e31-844"},{"uid":"4e31-1032"},{"uid":"4e31-856"},{"uid":"4e31-1038"},{"uid":"4e31-1036"},{"uid":"4e31-1042"},{"uid":"4e31-964"},{"uid":"4e31-1084"},{"uid":"4e31-854"},{"uid":"4e31-1090"},{"uid":"4e31-1092"},{"uid":"4e31-966"},{"uid":"4e31-958"},{"uid":"4e31-918"},{"uid":"4e31-910"},{"uid":"4e31-1030"},{"uid":"4e31-1040"}]},"4e31-458":{"id":"node_modules/@pixi/utils/lib/color/premultiply.mjs","moduleParts":{"dist/rapid.js":"4e31-459"},"imported":[{"uid":"4e31-452"},{"uid":"4e31-456"},{"uid":"4e31-440"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-460":{"id":"node_modules/@pixi/utils/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-461"},"imported":[],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-486"}]},"4e31-462":{"id":"node_modules/@pixi/utils/lib/data/createIndicesForQuads.mjs","moduleParts":{"dist/rapid.js":"4e31-463"},"imported":[],"importedBy":[{"uid":"4e31-420"}]},"4e31-464":{"id":"node_modules/@pixi/utils/lib/data/getBufferType.mjs","moduleParts":{"dist/rapid.js":"4e31-465"},"imported":[],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-466"}]},"4e31-466":{"id":"node_modules/@pixi/utils/lib/data/interleaveTypedArrays.mjs","moduleParts":{"dist/rapid.js":"4e31-467"},"imported":[{"uid":"4e31-464"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-468":{"id":"node_modules/@pixi/utils/lib/data/pow2.mjs","moduleParts":{"dist/rapid.js":"4e31-469"},"imported":[],"importedBy":[{"uid":"4e31-420"}]},"4e31-470":{"id":"node_modules/@pixi/utils/lib/data/removeItems.mjs","moduleParts":{"dist/rapid.js":"4e31-471"},"imported":[],"importedBy":[{"uid":"4e31-420"}]},"4e31-472":{"id":"node_modules/@pixi/utils/lib/data/sign.mjs","moduleParts":{"dist/rapid.js":"4e31-473"},"imported":[],"importedBy":[{"uid":"4e31-420"}]},"4e31-474":{"id":"node_modules/@pixi/utils/lib/data/uid.mjs","moduleParts":{"dist/rapid.js":"4e31-475"},"imported":[],"importedBy":[{"uid":"4e31-420"}]},"4e31-476":{"id":"node_modules/@pixi/utils/lib/media/BoundingBox.mjs","moduleParts":{"dist/rapid.js":"4e31-477"},"imported":[],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-482"}]},"4e31-478":{"id":"node_modules/@pixi/utils/lib/media/caches.mjs","moduleParts":{"dist/rapid.js":"4e31-479"},"imported":[],"importedBy":[{"uid":"4e31-420"}]},"4e31-480":{"id":"node_modules/@pixi/utils/lib/media/CanvasRenderTarget.mjs","moduleParts":{"dist/rapid.js":"4e31-481"},"imported":[{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-482":{"id":"node_modules/@pixi/utils/lib/media/getCanvasBoundingBox.mjs","moduleParts":{"dist/rapid.js":"4e31-483"},"imported":[{"uid":"4e31-476"}],"importedBy":[{"uid":"4e31-420"},{"uid":"4e31-484"}]},"4e31-484":{"id":"node_modules/@pixi/utils/lib/media/trimCanvas.mjs","moduleParts":{"dist/rapid.js":"4e31-485"},"imported":[{"uid":"4e31-482"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-486":{"id":"node_modules/@pixi/utils/lib/network/decomposeDataUri.mjs","moduleParts":{"dist/rapid.js":"4e31-487"},"imported":[{"uid":"4e31-460"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-488":{"id":"node_modules/@pixi/utils/lib/network/determineCrossOrigin.mjs","moduleParts":{"dist/rapid.js":"4e31-489"},"imported":[{"uid":"4e31-436"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-490":{"id":"node_modules/@pixi/utils/lib/network/getResolutionOfUrl.mjs","moduleParts":{"dist/rapid.js":"4e31-491"},"imported":[{"uid":"4e31-434"},{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-420"}]},"4e31-492":{"id":"node_modules/@rapideditor/country-coder/dist/country-coder.mjs","moduleParts":{"dist/rapid.js":"4e31-493"},"imported":[{"uid":"4e31-26"}],"importedBy":[{"uid":"4e31-2174"},{"uid":"4e31-2176"},{"uid":"4e31-2180"},{"uid":"4e31-2186"},{"uid":"4e31-2188"},{"uid":"4e31-494"}]},"4e31-494":{"id":"node_modules/@rapideditor/location-conflation/index.mjs","moduleParts":{"dist/rapid.js":"4e31-495"},"imported":[{"uid":"4e31-492"},{"uid":"4e31-30"},{"uid":"4e31-44"},{"uid":"4e31-46"},{"uid":"4e31-48"},{"uid":"4e31-50"}],"importedBy":[{"uid":"4e31-496"}]},"4e31-496":{"id":"modules/core/LocationManager.js","moduleParts":{"dist/rapid.js":"4e31-497"},"imported":[{"uid":"4e31-420"},{"uid":"4e31-494"},{"uid":"4e31-26"},{"uid":"4e31-30"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-2198"},{"uid":"4e31-750"},{"uid":"4e31-764"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-674"},{"uid":"4e31-500"},{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2148"},{"uid":"4e31-798"},{"uid":"4e31-822"},{"uid":"4e31-1896"}]},"4e31-498":{"id":"modules/core/localizer.js","moduleParts":{"dist/rapid.js":"4e31-499"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-418"},{"uid":"4e31-412"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-732"},{"uid":"4e31-756"},{"uid":"4e31-758"},{"uid":"4e31-2110"},{"uid":"4e31-580"},{"uid":"4e31-738"},{"uid":"4e31-764"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-780"},{"uid":"4e31-824"},{"uid":"4e31-674"},{"uid":"4e31-608"},{"uid":"4e31-610"},{"uid":"4e31-614"},{"uid":"4e31-618"},{"uid":"4e31-620"},{"uid":"4e31-624"},{"uid":"4e31-628"},{"uid":"4e31-632"},{"uid":"4e31-644"},{"uid":"4e31-646"},{"uid":"4e31-650"},{"uid":"4e31-656"},{"uid":"4e31-660"},{"uid":"4e31-662"},{"uid":"4e31-664"},{"uid":"4e31-666"},{"uid":"4e31-672"},{"uid":"4e31-502"},{"uid":"4e31-504"},{"uid":"4e31-506"},{"uid":"4e31-1514"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2144"},{"uid":"4e31-2150"},{"uid":"4e31-2152"},{"uid":"4e31-2156"},{"uid":"4e31-2168"},{"uid":"4e31-538"},{"uid":"4e31-2174"},{"uid":"4e31-2176"},{"uid":"4e31-2178"},{"uid":"4e31-2180"},{"uid":"4e31-2182"},{"uid":"4e31-2186"},{"uid":"4e31-2188"},{"uid":"4e31-2190"},{"uid":"4e31-2192"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-1500"},{"uid":"4e31-1964"},{"uid":"4e31-1966"},{"uid":"4e31-1970"},{"uid":"4e31-1972"},{"uid":"4e31-2072"},{"uid":"4e31-2074"},{"uid":"4e31-2084"},{"uid":"4e31-2096"},{"uid":"4e31-2102"},{"uid":"4e31-2060"},{"uid":"4e31-2064"},{"uid":"4e31-2066"},{"uid":"4e31-810"},{"uid":"4e31-2088"},{"uid":"4e31-1992"},{"uid":"4e31-1996"},{"uid":"4e31-2090"},{"uid":"4e31-2100"},{"uid":"4e31-2092"},{"uid":"4e31-2070"},{"uid":"4e31-2094"},{"uid":"4e31-1998"},{"uid":"4e31-2098"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-2008"},{"uid":"4e31-2076"},{"uid":"4e31-2078"},{"uid":"4e31-2080"},{"uid":"4e31-2082"},{"uid":"4e31-2062"},{"uid":"4e31-2086"},{"uid":"4e31-2108"},{"uid":"4e31-1948"},{"uid":"4e31-1950"},{"uid":"4e31-802"},{"uid":"4e31-616"},{"uid":"4e31-788"},{"uid":"4e31-812"},{"uid":"4e31-786"},{"uid":"4e31-784"},{"uid":"4e31-1952"},{"uid":"4e31-828"},{"uid":"4e31-826"},{"uid":"4e31-806"},{"uid":"4e31-1954"},{"uid":"4e31-1990"},{"uid":"4e31-1956"},{"uid":"4e31-1988"},{"uid":"4e31-798"},{"uid":"4e31-800"},{"uid":"4e31-1960"},{"uid":"4e31-830"},{"uid":"4e31-832"},{"uid":"4e31-1446"},{"uid":"4e31-1444"},{"uid":"4e31-1974"},{"uid":"4e31-1976"},{"uid":"4e31-1448"},{"uid":"4e31-1454"},{"uid":"4e31-1450"},{"uid":"4e31-1978"},{"uid":"4e31-1456"},{"uid":"4e31-1464"},{"uid":"4e31-1458"},{"uid":"4e31-1460"},{"uid":"4e31-2010"},{"uid":"4e31-1982"},{"uid":"4e31-1984"},{"uid":"4e31-2014"},{"uid":"4e31-2016"},{"uid":"4e31-2236"},{"uid":"4e31-2020"},{"uid":"4e31-822"},{"uid":"4e31-796"},{"uid":"4e31-792"},{"uid":"4e31-2050"},{"uid":"4e31-1462"},{"uid":"4e31-1452"},{"uid":"4e31-2054"},{"uid":"4e31-2038"},{"uid":"4e31-1508"},{"uid":"4e31-1506"},{"uid":"4e31-2042"},{"uid":"4e31-2044"},{"uid":"4e31-2104"},{"uid":"4e31-1504"},{"uid":"4e31-2106"},{"uid":"4e31-2040"},{"uid":"4e31-2200"},{"uid":"4e31-682"},{"uid":"4e31-684"},{"uid":"4e31-686"},{"uid":"4e31-688"},{"uid":"4e31-690"},{"uid":"4e31-692"},{"uid":"4e31-694"},{"uid":"4e31-696"},{"uid":"4e31-698"},{"uid":"4e31-702"},{"uid":"4e31-710"},{"uid":"4e31-712"},{"uid":"4e31-718"},{"uid":"4e31-720"},{"uid":"4e31-722"},{"uid":"4e31-724"},{"uid":"4e31-726"},{"uid":"4e31-742"},{"uid":"4e31-1472"},{"uid":"4e31-1480"},{"uid":"4e31-1482"},{"uid":"4e31-1484"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1494"},{"uid":"4e31-1496"},{"uid":"4e31-1498"},{"uid":"4e31-1968"},{"uid":"4e31-2058"},{"uid":"4e31-2068"},{"uid":"4e31-1986"},{"uid":"4e31-2056"},{"uid":"4e31-1466"},{"uid":"4e31-1468"},{"uid":"4e31-1470"},{"uid":"4e31-678"},{"uid":"4e31-1908"},{"uid":"4e31-2022"},{"uid":"4e31-2026"},{"uid":"4e31-2028"},{"uid":"4e31-2030"},{"uid":"4e31-2032"},{"uid":"4e31-2034"},{"uid":"4e31-2046"}]},"4e31-500":{"id":"modules/presets/collection.js","moduleParts":{"dist/rapid.js":"4e31-501"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-496"}],"importedBy":[{"uid":"4e31-2198"},{"uid":"4e31-502"}]},"4e31-502":{"id":"modules/presets/category.js","moduleParts":{"dist/rapid.js":"4e31-503"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-500"}],"importedBy":[{"uid":"4e31-2198"}]},"4e31-504":{"id":"modules/presets/field.js","moduleParts":{"dist/rapid.js":"4e31-505"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2198"}]},"4e31-506":{"id":"modules/presets/preset.js","moduleParts":{"dist/rapid.js":"4e31-507"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-114"}],"importedBy":[{"uid":"4e31-2198"}]},"4e31-508":{"id":"modules/util/rebind.js","moduleParts":{"dist/rapid.js":"4e31-509"},"imported":[],"importedBy":[{"uid":"4e31-414"},{"uid":"4e31-1944"},{"uid":"4e31-538"},{"uid":"4e31-2184"},{"uid":"4e31-806"},{"uid":"4e31-1954"},{"uid":"4e31-822"},{"uid":"4e31-1484"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1496"},{"uid":"4e31-1498"}]},"4e31-510":{"id":"modules/osm/changeset.js","moduleParts":{"dist/rapid.js":"4e31-511"},"imported":[{"uid":"4e31-408"},{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-512"}]},"4e31-512":{"id":"modules/osm/index.js","moduleParts":{"dist/rapid.js":"4e31-513"},"imported":[{"uid":"4e31-510"},{"uid":"4e31-408"},{"uid":"4e31-514"},{"uid":"4e31-516"},{"uid":"4e31-518"},{"uid":"4e31-2206"},{"uid":"4e31-520"},{"uid":"4e31-534"},{"uid":"4e31-410"},{"uid":"4e31-2208"},{"uid":"4e31-114"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-642"},{"uid":"4e31-732"},{"uid":"4e31-2218"},{"uid":"4e31-744"},{"uid":"4e31-752"},{"uid":"4e31-758"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-1510"},{"uid":"4e31-674"},{"uid":"4e31-1944"},{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2148"},{"uid":"4e31-538"},{"uid":"4e31-1972"},{"uid":"4e31-810"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-2008"},{"uid":"4e31-788"},{"uid":"4e31-784"},{"uid":"4e31-1460"},{"uid":"4e31-2014"},{"uid":"4e31-1462"},{"uid":"4e31-1452"},{"uid":"4e31-1470"},{"uid":"4e31-2022"}]},"4e31-514":{"id":"modules/osm/node.js","moduleParts":{"dist/rapid.js":"4e31-515"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-408"}],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-602"},{"uid":"4e31-622"},{"uid":"4e31-630"},{"uid":"4e31-654"},{"uid":"4e31-758"},{"uid":"4e31-764"},{"uid":"4e31-686"}]},"4e31-516":{"id":"modules/osm/note.js","moduleParts":{"dist/rapid.js":"4e31-517"},"imported":[{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-762"}]},"4e31-518":{"id":"modules/osm/relation.js","moduleParts":{"dist/rapid.js":"4e31-519"},"imported":[{"uid":"4e31-146"},{"uid":"4e31-406"},{"uid":"4e31-408"},{"uid":"4e31-2208"}],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-2212"},{"uid":"4e31-530"}]},"4e31-520":{"id":"modules/osm/qa_item.js","moduleParts":{"dist/rapid.js":"4e31-521"},"imported":[],"importedBy":[{"uid":"4e31-512"}]},"4e31-522":{"id":"modules/actions/delete_way.js","moduleParts":{"dist/rapid.js":"4e31-523"},"imported":[{"uid":"4e31-114"},{"uid":"4e31-528"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-638"},{"uid":"4e31-526"},{"uid":"4e31-524"},{"uid":"4e31-634"},{"uid":"4e31-736"}]},"4e31-524":{"id":"modules/actions/delete_node.js","moduleParts":{"dist/rapid.js":"4e31-525"},"imported":[{"uid":"4e31-528"},{"uid":"4e31-522"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-638"},{"uid":"4e31-526"},{"uid":"4e31-648"},{"uid":"4e31-670"}]},"4e31-526":{"id":"modules/actions/delete_multiple.js","moduleParts":{"dist/rapid.js":"4e31-527"},"imported":[{"uid":"4e31-524"},{"uid":"4e31-528"},{"uid":"4e31-522"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-528"},{"uid":"4e31-732"},{"uid":"4e31-620"}]},"4e31-528":{"id":"modules/actions/delete_relation.js","moduleParts":{"dist/rapid.js":"4e31-529"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-526"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-708"},{"uid":"4e31-526"},{"uid":"4e31-524"},{"uid":"4e31-522"},{"uid":"4e31-634"},{"uid":"4e31-736"},{"uid":"4e31-2216"},{"uid":"4e31-674"},{"uid":"4e31-534"}]},"4e31-530":{"id":"modules/actions/split.js","moduleParts":{"dist/rapid.js":"4e31-531"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-2210"},{"uid":"4e31-2208"},{"uid":"4e31-518"},{"uid":"4e31-2206"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-666"},{"uid":"4e31-534"},{"uid":"4e31-686"}]},"4e31-532":{"id":"modules/core/Graph.js","moduleParts":{"dist/rapid.js":"4e31-533"},"imported":[{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-590"},{"uid":"4e31-738"},{"uid":"4e31-534"},{"uid":"4e31-1988"}]},"4e31-534":{"id":"modules/osm/intersection.js","moduleParts":{"dist/rapid.js":"4e31-535"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-528"},{"uid":"4e31-112"},{"uid":"4e31-530"},{"uid":"4e31-532"},{"uid":"4e31-408"}],"importedBy":[{"uid":"4e31-512"}]},"4e31-536":{"id":"modules/svg/icon.js","moduleParts":{"dist/rapid.js":"4e31-537"},"imported":[],"importedBy":[{"uid":"4e31-2222"},{"uid":"4e31-538"},{"uid":"4e31-2176"},{"uid":"4e31-2186"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-1500"},{"uid":"4e31-1966"},{"uid":"4e31-2074"},{"uid":"4e31-2060"},{"uid":"4e31-2064"},{"uid":"4e31-2066"},{"uid":"4e31-810"},{"uid":"4e31-2088"},{"uid":"4e31-1992"},{"uid":"4e31-2098"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-2008"},{"uid":"4e31-2076"},{"uid":"4e31-2082"},{"uid":"4e31-2108"},{"uid":"4e31-1948"},{"uid":"4e31-802"},{"uid":"4e31-788"},{"uid":"4e31-812"},{"uid":"4e31-784"},{"uid":"4e31-1952"},{"uid":"4e31-828"},{"uid":"4e31-826"},{"uid":"4e31-806"},{"uid":"4e31-1954"},{"uid":"4e31-1990"},{"uid":"4e31-1988"},{"uid":"4e31-798"},{"uid":"4e31-1960"},{"uid":"4e31-830"},{"uid":"4e31-1446"},{"uid":"4e31-1974"},{"uid":"4e31-1976"},{"uid":"4e31-1454"},{"uid":"4e31-1450"},{"uid":"4e31-586"},{"uid":"4e31-1456"},{"uid":"4e31-1464"},{"uid":"4e31-1458"},{"uid":"4e31-1460"},{"uid":"4e31-1994"},{"uid":"4e31-2010"},{"uid":"4e31-2020"},{"uid":"4e31-822"},{"uid":"4e31-796"},{"uid":"4e31-2050"},{"uid":"4e31-1462"},{"uid":"4e31-1452"},{"uid":"4e31-2054"},{"uid":"4e31-2038"},{"uid":"4e31-1508"},{"uid":"4e31-2042"},{"uid":"4e31-2040"},{"uid":"4e31-1472"},{"uid":"4e31-2058"},{"uid":"4e31-1980"},{"uid":"4e31-1986"},{"uid":"4e31-2056"},{"uid":"4e31-1470"},{"uid":"4e31-2022"},{"uid":"4e31-2026"},{"uid":"4e31-2028"},{"uid":"4e31-2030"},{"uid":"4e31-2032"},{"uid":"4e31-2034"}]},"4e31-538":{"id":"modules/ui/fields/check.js","moduleParts":{"dist/rapid.js":"4e31-539"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-508"},{"uid":"4e31-498"},{"uid":"4e31-112"},{"uid":"4e31-512"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-540":{"id":"modules/ui/fields/index.js","moduleParts":{"dist/rapid.js":"4e31-541"},"imported":[{"uid":"4e31-538"},{"uid":"4e31-2174"},{"uid":"4e31-2176"},{"uid":"4e31-2178"},{"uid":"4e31-2180"},{"uid":"4e31-2182"},{"uid":"4e31-2184"},{"uid":"4e31-2186"},{"uid":"4e31-2188"},{"uid":"4e31-2190"},{"uid":"4e31-2246"},{"uid":"4e31-2192"},{"uid":"4e31-2194"},{"uid":"4e31-2196"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-2198"},{"uid":"4e31-798"}]},"4e31-542":{"id":"node_modules/d3-fetch/src/text.js","moduleParts":{"dist/rapid.js":"4e31-543"},"imported":[],"importedBy":[{"uid":"4e31-546"},{"uid":"4e31-2334"},{"uid":"4e31-548"}]},"4e31-544":{"id":"node_modules/d3-fetch/src/json.js","moduleParts":{"dist/rapid.js":"4e31-545"},"imported":[],"importedBy":[{"uid":"4e31-546"}]},"4e31-546":{"id":"node_modules/d3-fetch/src/index.js","moduleParts":{"dist/rapid.js":"4e31-547"},"imported":[{"uid":"4e31-2332"},{"uid":"4e31-2333"},{"uid":"4e31-2334"},{"uid":"4e31-2335"},{"uid":"4e31-544"},{"uid":"4e31-542"},{"uid":"4e31-548"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-1514"},{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2128"},{"uid":"4e31-2144"},{"uid":"4e31-2148"},{"uid":"4e31-2150"},{"uid":"4e31-2152"},{"uid":"4e31-2156"},{"uid":"4e31-2168"},{"uid":"4e31-2170"},{"uid":"4e31-1946"},{"uid":"4e31-1930"}]},"4e31-548":{"id":"node_modules/d3-fetch/src/xml.js","moduleParts":{"dist/rapid.js":"4e31-549"},"imported":[{"uid":"4e31-542"}],"importedBy":[{"uid":"4e31-546"}]},"4e31-550":{"id":"node_modules/lodash-es/isObject.js","moduleParts":{"dist/rapid.js":"4e31-551"},"imported":[],"importedBy":[{"uid":"4e31-576"},{"uid":"4e31-740"},{"uid":"4e31-574"}]},"4e31-552":{"id":"node_modules/lodash-es/_freeGlobal.js","moduleParts":{"dist/rapid.js":"4e31-553"},"imported":[],"importedBy":[{"uid":"4e31-554"}]},"4e31-554":{"id":"node_modules/lodash-es/_root.js","moduleParts":{"dist/rapid.js":"4e31-555"},"imported":[{"uid":"4e31-552"}],"importedBy":[{"uid":"4e31-556"},{"uid":"4e31-562"}]},"4e31-556":{"id":"node_modules/lodash-es/now.js","moduleParts":{"dist/rapid.js":"4e31-557"},"imported":[{"uid":"4e31-554"}],"importedBy":[{"uid":"4e31-576"}]},"4e31-558":{"id":"node_modules/lodash-es/_trimmedEndIndex.js","moduleParts":{"dist/rapid.js":"4e31-559"},"imported":[],"importedBy":[{"uid":"4e31-560"}]},"4e31-560":{"id":"node_modules/lodash-es/_baseTrim.js","moduleParts":{"dist/rapid.js":"4e31-561"},"imported":[{"uid":"4e31-558"}],"importedBy":[{"uid":"4e31-574"}]},"4e31-562":{"id":"node_modules/lodash-es/_Symbol.js","moduleParts":{"dist/rapid.js":"4e31-563"},"imported":[{"uid":"4e31-554"}],"importedBy":[{"uid":"4e31-568"},{"uid":"4e31-564"}]},"4e31-564":{"id":"node_modules/lodash-es/_getRawTag.js","moduleParts":{"dist/rapid.js":"4e31-565"},"imported":[{"uid":"4e31-562"}],"importedBy":[{"uid":"4e31-568"}]},"4e31-566":{"id":"node_modules/lodash-es/_objectToString.js","moduleParts":{"dist/rapid.js":"4e31-567"},"imported":[],"importedBy":[{"uid":"4e31-568"}]},"4e31-568":{"id":"node_modules/lodash-es/_baseGetTag.js","moduleParts":{"dist/rapid.js":"4e31-569"},"imported":[{"uid":"4e31-562"},{"uid":"4e31-564"},{"uid":"4e31-566"}],"importedBy":[{"uid":"4e31-572"}]},"4e31-570":{"id":"node_modules/lodash-es/isObjectLike.js","moduleParts":{"dist/rapid.js":"4e31-571"},"imported":[],"importedBy":[{"uid":"4e31-572"}]},"4e31-572":{"id":"node_modules/lodash-es/isSymbol.js","moduleParts":{"dist/rapid.js":"4e31-573"},"imported":[{"uid":"4e31-568"},{"uid":"4e31-570"}],"importedBy":[{"uid":"4e31-574"}]},"4e31-574":{"id":"node_modules/lodash-es/toNumber.js","moduleParts":{"dist/rapid.js":"4e31-575"},"imported":[{"uid":"4e31-560"},{"uid":"4e31-550"},{"uid":"4e31-572"}],"importedBy":[{"uid":"4e31-576"}]},"4e31-576":{"id":"node_modules/lodash-es/debounce.js","moduleParts":{"dist/rapid.js":"4e31-577"},"imported":[{"uid":"4e31-550"},{"uid":"4e31-556"},{"uid":"4e31-574"}],"importedBy":[{"uid":"4e31-2110"},{"uid":"4e31-2150"},{"uid":"4e31-2156"},{"uid":"4e31-1964"},{"uid":"4e31-1970"},{"uid":"4e31-2064"},{"uid":"4e31-2070"},{"uid":"4e31-2076"},{"uid":"4e31-2082"},{"uid":"4e31-1952"},{"uid":"4e31-2010"},{"uid":"4e31-740"},{"uid":"4e31-2026"},{"uid":"4e31-2028"},{"uid":"4e31-2034"},{"uid":"4e31-2046"}]},"4e31-578":{"id":"node_modules/@tmcw/togeojson/dist/togeojson.es.mjs","moduleParts":{"dist/rapid.js":"4e31-579"},"imported":[],"importedBy":[{"uid":"4e31-580"},{"uid":"4e31-1930"}]},"4e31-580":{"id":"modules/core/rapid_context.js","moduleParts":{"dist/rapid.js":"4e31-581"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-578"},{"uid":"4e31-406"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-2110"}]},"4e31-582":{"id":"modules/core/Difference.js","moduleParts":{"dist/rapid.js":"4e31-583"},"imported":[{"uid":"4e31-52"},{"uid":"4e31-406"},{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-590"},{"uid":"4e31-728"},{"uid":"4e31-584"}]},"4e31-584":{"id":"modules/core/Tree.js","moduleParts":{"dist/rapid.js":"4e31-585"},"imported":[{"uid":"4e31-54"},{"uid":"4e31-582"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-590"}]},"4e31-586":{"id":"modules/ui/modal.js","moduleParts":{"dist/rapid.js":"4e31-587"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-536"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-786"},{"uid":"4e31-588"},{"uid":"4e31-1982"},{"uid":"4e31-2236"},{"uid":"4e31-1506"},{"uid":"4e31-2042"},{"uid":"4e31-2044"},{"uid":"4e31-1504"},{"uid":"4e31-2106"},{"uid":"4e31-1496"},{"uid":"4e31-1986"}]},"4e31-588":{"id":"modules/ui/loading.js","moduleParts":{"dist/rapid.js":"4e31-589"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-586"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-590"},{"uid":"4e31-2108"},{"uid":"4e31-1960"}]},"4e31-590":{"id":"modules/core/history.js","moduleParts":{"dist/rapid.js":"4e31-591"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-384"},{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-532"},{"uid":"4e31-582"},{"uid":"4e31-408"},{"uid":"4e31-416"},{"uid":"4e31-584"},{"uid":"4e31-588"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-2110"}]},"4e31-592":{"id":"modules/actions/add_midpoint.js","moduleParts":{"dist/rapid.js":"4e31-593"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-758"},{"uid":"4e31-764"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-674"},{"uid":"4e31-682"},{"uid":"4e31-686"}]},"4e31-594":{"id":"modules/geo/geom.js","moduleParts":{"dist/rapid.js":"4e31-595"},"imported":[{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-596"}]},"4e31-596":{"id":"modules/geo/index.js","moduleParts":{"dist/rapid.js":"4e31-597"},"imported":[{"uid":"4e31-594"},{"uid":"4e31-598"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-654"},{"uid":"4e31-648"},{"uid":"4e31-758"},{"uid":"4e31-764"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-674"},{"uid":"4e31-2180"},{"uid":"4e31-682"},{"uid":"4e31-702"}]},"4e31-598":{"id":"modules/geo/ortho.js","moduleParts":{"dist/rapid.js":"4e31-599"},"imported":[{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-596"},{"uid":"4e31-726"}]},"4e31-600":{"id":"modules/operations/index.js","moduleParts":{"dist/rapid.js":"4e31-601"},"imported":[{"uid":"4e31-608"},{"uid":"4e31-610"},{"uid":"4e31-614"},{"uid":"4e31-618"},{"uid":"4e31-620"},{"uid":"4e31-624"},{"uid":"4e31-628"},{"uid":"4e31-632"},{"uid":"4e31-644"},{"uid":"4e31-646"},{"uid":"4e31-650"},{"uid":"4e31-656"},{"uid":"4e31-660"},{"uid":"4e31-662"},{"uid":"4e31-664"},{"uid":"4e31-666"},{"uid":"4e31-672"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-674"},{"uid":"4e31-722"}]},"4e31-602":{"id":"modules/actions/circularize.js","moduleParts":{"dist/rapid.js":"4e31-603"},"imported":[{"uid":"4e31-122"},{"uid":"4e31-162"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-514"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-608"}]},"4e31-604":{"id":"modules/behaviors/AbstractBehavior.js","moduleParts":{"dist/rapid.js":"4e31-605"},"imported":[{"uid":"4e31-420"}],"importedBy":[{"uid":"4e31-744"},{"uid":"4e31-746"},{"uid":"4e31-748"},{"uid":"4e31-606"},{"uid":"4e31-750"},{"uid":"4e31-752"},{"uid":"4e31-756"},{"uid":"4e31-758"},{"uid":"4e31-754"}]},"4e31-606":{"id":"modules/behaviors/BehaviorKeyOperation.js","moduleParts":{"dist/rapid.js":"4e31-607"},"imported":[{"uid":"4e31-604"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-608"},{"uid":"4e31-610"},{"uid":"4e31-614"},{"uid":"4e31-618"},{"uid":"4e31-620"},{"uid":"4e31-624"},{"uid":"4e31-628"},{"uid":"4e31-632"},{"uid":"4e31-644"},{"uid":"4e31-646"},{"uid":"4e31-650"},{"uid":"4e31-660"},{"uid":"4e31-662"},{"uid":"4e31-664"},{"uid":"4e31-666"},{"uid":"4e31-672"}]},"4e31-608":{"id":"modules/operations/circularize.js","moduleParts":{"dist/rapid.js":"4e31-609"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-602"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-610":{"id":"modules/operations/continue.js","moduleParts":{"dist/rapid.js":"4e31-611"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-606"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-612":{"id":"modules/actions/noop.js","moduleParts":{"dist/rapid.js":"4e31-613"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-738"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-780"},{"uid":"4e31-1476"},{"uid":"4e31-614"},{"uid":"4e31-2076"}]},"4e31-614":{"id":"modules/operations/cycle_highway_tag.js","moduleParts":{"dist/rapid.js":"4e31-615"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-108"},{"uid":"4e31-612"},{"uid":"4e31-606"},{"uid":"4e31-674"},{"uid":"4e31-2198"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-616":{"id":"modules/ui/cmd.js","moduleParts":{"dist/rapid.js":"4e31-617"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-412"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-674"},{"uid":"4e31-618"},{"uid":"4e31-620"},{"uid":"4e31-628"},{"uid":"4e31-656"},{"uid":"4e31-2064"},{"uid":"4e31-2088"},{"uid":"4e31-2108"},{"uid":"4e31-1988"},{"uid":"4e31-1958"},{"uid":"4e31-1974"},{"uid":"4e31-2054"},{"uid":"4e31-1480"},{"uid":"4e31-1986"},{"uid":"4e31-2030"},{"uid":"4e31-2034"},{"uid":"4e31-2046"}]},"4e31-618":{"id":"modules/operations/copy.js","moduleParts":{"dist/rapid.js":"4e31-619"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-616"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-620":{"id":"modules/operations/delete.js","moduleParts":{"dist/rapid.js":"4e31-621"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-526"},{"uid":"4e31-606"},{"uid":"4e31-674"},{"uid":"4e31-416"},{"uid":"4e31-616"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-600"},{"uid":"4e31-2010"},{"uid":"4e31-688"},{"uid":"4e31-712"}]},"4e31-622":{"id":"modules/actions/disconnect.js","moduleParts":{"dist/rapid.js":"4e31-623"},"imported":[{"uid":"4e31-514"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-624"}]},"4e31-624":{"id":"modules/operations/disconnect.js","moduleParts":{"dist/rapid.js":"4e31-625"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-622"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-2200"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-626":{"id":"modules/actions/change_tags.js","moduleParts":{"dist/rapid.js":"4e31-627"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-764"},{"uid":"4e31-628"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-1990"},{"uid":"4e31-682"},{"uid":"4e31-686"},{"uid":"4e31-702"},{"uid":"4e31-718"},{"uid":"4e31-720"},{"uid":"4e31-724"}]},"4e31-628":{"id":"modules/operations/downgrade.js","moduleParts":{"dist/rapid.js":"4e31-629"},"imported":[{"uid":"4e31-626"},{"uid":"4e31-606"},{"uid":"4e31-674"},{"uid":"4e31-498"},{"uid":"4e31-616"},{"uid":"4e31-2198"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-630":{"id":"modules/actions/extract.js","moduleParts":{"dist/rapid.js":"4e31-631"},"imported":[{"uid":"4e31-162"},{"uid":"4e31-406"},{"uid":"4e31-514"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-632"},{"uid":"4e31-702"}]},"4e31-632":{"id":"modules/operations/extract.js","moduleParts":{"dist/rapid.js":"4e31-633"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-630"},{"uid":"4e31-606"},{"uid":"4e31-674"},{"uid":"4e31-498"},{"uid":"4e31-416"},{"uid":"4e31-2198"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-634":{"id":"modules/actions/join.js","moduleParts":{"dist/rapid.js":"4e31-635"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-528"},{"uid":"4e31-522"},{"uid":"4e31-114"},{"uid":"4e31-2208"},{"uid":"4e31-416"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-644"}]},"4e31-636":{"id":"modules/actions/merge.js","moduleParts":{"dist/rapid.js":"4e31-637"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-114"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-644"}]},"4e31-638":{"id":"modules/actions/connect.js","moduleParts":{"dist/rapid.js":"4e31-639"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-524"},{"uid":"4e31-522"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-640"},{"uid":"4e31-770"}]},"4e31-640":{"id":"modules/actions/merge_nodes.js","moduleParts":{"dist/rapid.js":"4e31-641"},"imported":[{"uid":"4e31-638"},{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-644"},{"uid":"4e31-682"},{"uid":"4e31-684"},{"uid":"4e31-686"},{"uid":"4e31-702"}]},"4e31-642":{"id":"modules/actions/merge_polygon.js","moduleParts":{"dist/rapid.js":"4e31-643"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-512"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-644"}]},"4e31-644":{"id":"modules/operations/merge.js","moduleParts":{"dist/rapid.js":"4e31-645"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-634"},{"uid":"4e31-636"},{"uid":"4e31-640"},{"uid":"4e31-642"},{"uid":"4e31-606"},{"uid":"4e31-674"},{"uid":"4e31-2198"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-646":{"id":"modules/operations/move.js","moduleParts":{"dist/rapid.js":"4e31-647"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-2200"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-648":{"id":"modules/actions/orthogonalize.js","moduleParts":{"dist/rapid.js":"4e31-649"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-524"},{"uid":"4e31-596"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-650"},{"uid":"4e31-726"}]},"4e31-650":{"id":"modules/operations/orthogonalize.js","moduleParts":{"dist/rapid.js":"4e31-651"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-648"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-652":{"id":"modules/actions/copy_entities.js","moduleParts":{"dist/rapid.js":"4e31-653"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-756"},{"uid":"4e31-656"}]},"4e31-654":{"id":"modules/actions/move.js","moduleParts":{"dist/rapid.js":"4e31-655"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-596"},{"uid":"4e31-514"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-756"},{"uid":"4e31-776"},{"uid":"4e31-656"}]},"4e31-656":{"id":"modules/operations/paste.js","moduleParts":{"dist/rapid.js":"4e31-657"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-652"},{"uid":"4e31-654"},{"uid":"4e31-674"},{"uid":"4e31-498"},{"uid":"4e31-616"},{"uid":"4e31-2200"}],"importedBy":[{"uid":"4e31-600"},{"uid":"4e31-766"}]},"4e31-658":{"id":"modules/actions/reflect.js","moduleParts":{"dist/rapid.js":"4e31-659"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-660"}]},"4e31-660":{"id":"modules/operations/reflect.js","moduleParts":{"dist/rapid.js":"4e31-661"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-658"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-2200"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-662":{"id":"modules/operations/reverse.js","moduleParts":{"dist/rapid.js":"4e31-663"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-112"},{"uid":"4e31-606"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-664":{"id":"modules/operations/rotate.js","moduleParts":{"dist/rapid.js":"4e31-665"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-2200"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-666":{"id":"modules/operations/split.js","moduleParts":{"dist/rapid.js":"4e31-667"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-530"},{"uid":"4e31-606"},{"uid":"4e31-674"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-668":{"id":"modules/actions/straighten_nodes.js","moduleParts":{"dist/rapid.js":"4e31-669"},"imported":[{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-672"}]},"4e31-670":{"id":"modules/actions/straighten_way.js","moduleParts":{"dist/rapid.js":"4e31-671"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-524"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-672"}]},"4e31-672":{"id":"modules/operations/straighten.js","moduleParts":{"dist/rapid.js":"4e31-673"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-668"},{"uid":"4e31-670"},{"uid":"4e31-606"},{"uid":"4e31-416"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-600"}]},"4e31-674":{"id":"modules/modes/select.js","moduleParts":{"dist/rapid.js":"4e31-675"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-496"},{"uid":"4e31-592"},{"uid":"4e31-528"},{"uid":"4e31-596"},{"uid":"4e31-512"},{"uid":"4e31-600"},{"uid":"4e31-616"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-750"},{"uid":"4e31-758"},{"uid":"4e31-2110"},{"uid":"4e31-728"},{"uid":"4e31-764"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-780"},{"uid":"4e31-614"},{"uid":"4e31-620"},{"uid":"4e31-628"},{"uid":"4e31-632"},{"uid":"4e31-644"},{"uid":"4e31-656"},{"uid":"4e31-666"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-2008"},{"uid":"4e31-1988"},{"uid":"4e31-832"},{"uid":"4e31-1448"},{"uid":"4e31-686"},{"uid":"4e31-702"},{"uid":"4e31-742"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1494"},{"uid":"4e31-1498"},{"uid":"4e31-1466"}]},"4e31-676":{"id":"modules/validations/index.js","moduleParts":{"dist/rapid.js":"4e31-677"},"imported":[{"uid":"4e31-682"},{"uid":"4e31-684"},{"uid":"4e31-686"},{"uid":"4e31-688"},{"uid":"4e31-690"},{"uid":"4e31-692"},{"uid":"4e31-694"},{"uid":"4e31-696"},{"uid":"4e31-698"},{"uid":"4e31-700"},{"uid":"4e31-702"},{"uid":"4e31-710"},{"uid":"4e31-712"},{"uid":"4e31-718"},{"uid":"4e31-720"},{"uid":"4e31-722"},{"uid":"4e31-724"},{"uid":"4e31-726"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-728"}]},"4e31-678":{"id":"modules/core/validation/models.js","moduleParts":{"dist/rapid.js":"4e31-679"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-414"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-680"}]},"4e31-680":{"id":"modules/core/validation/index.js","moduleParts":{"dist/rapid.js":"4e31-681"},"imported":[{"uid":"4e31-678"}],"importedBy":[{"uid":"4e31-2126"},{"uid":"4e31-682"},{"uid":"4e31-684"},{"uid":"4e31-686"},{"uid":"4e31-688"},{"uid":"4e31-690"},{"uid":"4e31-692"},{"uid":"4e31-694"},{"uid":"4e31-696"},{"uid":"4e31-698"},{"uid":"4e31-702"},{"uid":"4e31-710"},{"uid":"4e31-712"},{"uid":"4e31-718"},{"uid":"4e31-720"},{"uid":"4e31-722"},{"uid":"4e31-724"},{"uid":"4e31-726"}]},"4e31-682":{"id":"modules/validations/almost_junction.js","moduleParts":{"dist/rapid.js":"4e31-683"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-592"},{"uid":"4e31-626"},{"uid":"4e31-640"},{"uid":"4e31-596"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-114"},{"uid":"4e31-680"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-684":{"id":"modules/validations/close_nodes.js","moduleParts":{"dist/rapid.js":"4e31-685"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-640"},{"uid":"4e31-414"},{"uid":"4e31-498"},{"uid":"4e31-680"},{"uid":"4e31-114"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-686":{"id":"modules/validations/crossing_ways.js","moduleParts":{"dist/rapid.js":"4e31-687"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-592"},{"uid":"4e31-626"},{"uid":"4e31-640"},{"uid":"4e31-530"},{"uid":"4e31-674"},{"uid":"4e31-514"},{"uid":"4e31-114"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-688":{"id":"modules/validations/disconnected_way.js","moduleParts":{"dist/rapid.js":"4e31-689"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-498"},{"uid":"4e31-620"},{"uid":"4e31-414"},{"uid":"4e31-114"},{"uid":"4e31-680"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-690":{"id":"modules/validations/duplicate_way_segments.js","moduleParts":{"dist/rapid.js":"4e31-691"},"imported":[{"uid":"4e31-414"},{"uid":"4e31-498"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-692":{"id":"modules/validations/invalid_format.js","moduleParts":{"dist/rapid.js":"4e31-693"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-694":{"id":"modules/validations/help_request.js","moduleParts":{"dist/rapid.js":"4e31-695"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-696":{"id":"modules/validations/impossible_oneway.js","moduleParts":{"dist/rapid.js":"4e31-697"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-498"},{"uid":"4e31-112"},{"uid":"4e31-414"},{"uid":"4e31-114"},{"uid":"4e31-680"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-698":{"id":"modules/validations/incompatible_source.js","moduleParts":{"dist/rapid.js":"4e31-699"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-700":{"id":"modules/validations/maprules.js","moduleParts":{"dist/rapid.js":"4e31-701"},"imported":[{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-702":{"id":"modules/validations/mismatched_geometry.js","moduleParts":{"dist/rapid.js":"4e31-703"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-52"},{"uid":"4e31-704"},{"uid":"4e31-626"},{"uid":"4e31-640"},{"uid":"4e31-630"},{"uid":"4e31-674"},{"uid":"4e31-2208"},{"uid":"4e31-114"},{"uid":"4e31-2198"},{"uid":"4e31-596"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-704":{"id":"modules/actions/add_vertex.js","moduleParts":{"dist/rapid.js":"4e31-705"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-702"}]},"4e31-706":{"id":"modules/actions/change_member.js","moduleParts":{"dist/rapid.js":"4e31-707"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-710"}]},"4e31-708":{"id":"modules/actions/delete_member.js","moduleParts":{"dist/rapid.js":"4e31-709"},"imported":[{"uid":"4e31-528"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-2002"},{"uid":"4e31-710"},{"uid":"4e31-2004"}]},"4e31-710":{"id":"modules/validations/missing_role.js","moduleParts":{"dist/rapid.js":"4e31-711"},"imported":[{"uid":"4e31-706"},{"uid":"4e31-708"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-712":{"id":"modules/validations/missing_tag.js","moduleParts":{"dist/rapid.js":"4e31-713"},"imported":[{"uid":"4e31-620"},{"uid":"4e31-114"},{"uid":"4e31-2208"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-714":{"id":"modules/actions/change_preset.js","moduleParts":{"dist/rapid.js":"4e31-715"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-2010"},{"uid":"4e31-718"},{"uid":"4e31-1488"},{"uid":"4e31-1494"}]},"4e31-716":{"id":"modules/actions/upgrade_tags.js","moduleParts":{"dist/rapid.js":"4e31-717"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-718"}]},"4e31-718":{"id":"modules/validations/outdated_tags.js","moduleParts":{"dist/rapid.js":"4e31-719"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-714"},{"uid":"4e31-626"},{"uid":"4e31-716"},{"uid":"4e31-2112"},{"uid":"4e31-2198"},{"uid":"4e31-2172"},{"uid":"4e31-2208"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-720":{"id":"modules/validations/private_data.js","moduleParts":{"dist/rapid.js":"4e31-721"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-626"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-722":{"id":"modules/validations/y_shaped_connection.js","moduleParts":{"dist/rapid.js":"4e31-723"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-600"},{"uid":"4e31-498"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-724":{"id":"modules/validations/suspicious_name.js","moduleParts":{"dist/rapid.js":"4e31-725"},"imported":[{"uid":"4e31-626"},{"uid":"4e31-2198"},{"uid":"4e31-2172"},{"uid":"4e31-498"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-726":{"id":"modules/validations/unsquare_way.js","moduleParts":{"dist/rapid.js":"4e31-727"},"imported":[{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-648"},{"uid":"4e31-598"},{"uid":"4e31-414"},{"uid":"4e31-680"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-676"}]},"4e31-728":{"id":"modules/core/validator.js","moduleParts":{"dist/rapid.js":"4e31-729"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-416"},{"uid":"4e31-582"},{"uid":"4e31-674"},{"uid":"4e31-414"},{"uid":"4e31-676"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-2110"}]},"4e31-730":{"id":"modules/actions/discard_tags.js","moduleParts":{"dist/rapid.js":"4e31-731"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-738"},{"uid":"4e31-810"}]},"4e31-732":{"id":"modules/actions/merge_remote_changes.js","moduleParts":{"dist/rapid.js":"4e31-733"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-52"},{"uid":"4e31-734"},{"uid":"4e31-498"},{"uid":"4e31-526"},{"uid":"4e31-512"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-738"}]},"4e31-734":{"id":"node_modules/node-diff3/index.mjs","moduleParts":{"dist/rapid.js":"4e31-735"},"imported":[],"importedBy":[{"uid":"4e31-732"}]},"4e31-736":{"id":"modules/actions/revert.js","moduleParts":{"dist/rapid.js":"4e31-737"},"imported":[{"uid":"4e31-528"},{"uid":"4e31-522"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-738"}]},"4e31-738":{"id":"modules/core/uploader.js","moduleParts":{"dist/rapid.js":"4e31-739"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-418"},{"uid":"4e31-730"},{"uid":"4e31-732"},{"uid":"4e31-612"},{"uid":"4e31-736"},{"uid":"4e31-532"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2112"},{"uid":"4e31-2110"}]},"4e31-740":{"id":"node_modules/lodash-es/throttle.js","moduleParts":{"dist/rapid.js":"4e31-741"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-550"}],"importedBy":[{"uid":"4e31-2148"},{"uid":"4e31-1950"},{"uid":"4e31-2014"},{"uid":"4e31-2020"},{"uid":"4e31-742"}]},"4e31-742":{"id":"modules/core/UrlHash.js","moduleParts":{"dist/rapid.js":"4e31-743"},"imported":[{"uid":"4e31-420"},{"uid":"4e31-110"},{"uid":"4e31-740"},{"uid":"4e31-498"},{"uid":"4e31-674"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2110"}]},"4e31-744":{"id":"modules/behaviors/BehaviorDrag.js","moduleParts":{"dist/rapid.js":"4e31-745"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-604"},{"uid":"4e31-512"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-2110"}]},"4e31-746":{"id":"modules/behaviors/BehaviorDraw.js","moduleParts":{"dist/rapid.js":"4e31-747"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-604"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-2110"}]},"4e31-748":{"id":"modules/behaviors/BehaviorHover.js","moduleParts":{"dist/rapid.js":"4e31-749"},"imported":[{"uid":"4e31-604"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-2110"}]},"4e31-750":{"id":"modules/behaviors/BehaviorLasso.js","moduleParts":{"dist/rapid.js":"4e31-751"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-496"},{"uid":"4e31-674"},{"uid":"4e31-604"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-2110"}]},"4e31-752":{"id":"modules/behaviors/BehaviorMapInteraction.js","moduleParts":{"dist/rapid.js":"4e31-753"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-604"},{"uid":"4e31-512"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-2110"}]},"4e31-754":{"id":"modules/behaviors/BehaviorMapNudging.js","moduleParts":{"dist/rapid.js":"4e31-755"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-604"}],"importedBy":[{"uid":"4e31-2110"}]},"4e31-756":{"id":"modules/behaviors/BehaviorPaste.js","moduleParts":{"dist/rapid.js":"4e31-757"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-604"},{"uid":"4e31-652"},{"uid":"4e31-654"},{"uid":"4e31-412"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-2110"}]},"4e31-758":{"id":"modules/behaviors/BehaviorSelect.js","moduleParts":{"dist/rapid.js":"4e31-759"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-604"},{"uid":"4e31-674"},{"uid":"4e31-512"},{"uid":"4e31-2172"},{"uid":"4e31-592"},{"uid":"4e31-514"},{"uid":"4e31-2206"},{"uid":"4e31-498"},{"uid":"4e31-596"}],"importedBy":[{"uid":"4e31-2220"},{"uid":"4e31-2110"}]},"4e31-760":{"id":"modules/modes/AbstractMode.js","moduleParts":{"dist/rapid.js":"4e31-761"},"imported":[],"importedBy":[{"uid":"4e31-762"},{"uid":"4e31-764"},{"uid":"4e31-766"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-780"},{"uid":"4e31-824"},{"uid":"4e31-1510"}]},"4e31-762":{"id":"modules/modes/ModeAddNote.js","moduleParts":{"dist/rapid.js":"4e31-763"},"imported":[{"uid":"4e31-760"},{"uid":"4e31-516"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-764":{"id":"modules/modes/ModeAddPoint.js","moduleParts":{"dist/rapid.js":"4e31-765"},"imported":[{"uid":"4e31-760"},{"uid":"4e31-106"},{"uid":"4e31-626"},{"uid":"4e31-592"},{"uid":"4e31-596"},{"uid":"4e31-496"},{"uid":"4e31-674"},{"uid":"4e31-514"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-766":{"id":"modules/modes/ModeBrowse.js","moduleParts":{"dist/rapid.js":"4e31-767"},"imported":[{"uid":"4e31-760"},{"uid":"4e31-656"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-768":{"id":"modules/actions/move_node.js","moduleParts":{"dist/rapid.js":"4e31-769"},"imported":[{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"}]},"4e31-770":{"id":"modules/modes/ModeDragNode.js","moduleParts":{"dist/rapid.js":"4e31-771"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-760"},{"uid":"4e31-592"},{"uid":"4e31-638"},{"uid":"4e31-768"},{"uid":"4e31-612"},{"uid":"4e31-596"},{"uid":"4e31-496"},{"uid":"4e31-674"},{"uid":"4e31-512"},{"uid":"4e31-2198"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-772":{"id":"modules/modes/ModeDrawArea.js","moduleParts":{"dist/rapid.js":"4e31-773"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-760"},{"uid":"4e31-106"},{"uid":"4e31-592"},{"uid":"4e31-704"},{"uid":"4e31-768"},{"uid":"4e31-612"},{"uid":"4e31-596"},{"uid":"4e31-496"},{"uid":"4e31-674"},{"uid":"4e31-512"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-774":{"id":"modules/modes/ModeDrawLine.js","moduleParts":{"dist/rapid.js":"4e31-775"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-760"},{"uid":"4e31-106"},{"uid":"4e31-592"},{"uid":"4e31-704"},{"uid":"4e31-768"},{"uid":"4e31-612"},{"uid":"4e31-596"},{"uid":"4e31-496"},{"uid":"4e31-674"},{"uid":"4e31-512"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-776":{"id":"modules/modes/ModeMove.js","moduleParts":{"dist/rapid.js":"4e31-777"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-760"},{"uid":"4e31-654"},{"uid":"4e31-612"},{"uid":"4e31-496"},{"uid":"4e31-674"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-778":{"id":"modules/actions/rotate.js","moduleParts":{"dist/rapid.js":"4e31-779"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-780"}]},"4e31-780":{"id":"modules/modes/ModeRotate.js","moduleParts":{"dist/rapid.js":"4e31-781"},"imported":[{"uid":"4e31-162"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-760"},{"uid":"4e31-778"},{"uid":"4e31-612"},{"uid":"4e31-674"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-782":{"id":"modules/util/jxon.js","moduleParts":{"dist/rapid.js":"4e31-783"},"imported":[],"importedBy":[{"uid":"4e31-2148"},{"uid":"4e31-810"},{"uid":"4e31-784"},{"uid":"4e31-2022"}]},"4e31-784":{"id":"modules/ui/conflicts.js","moduleParts":{"dist/rapid.js":"4e31-785"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-782"},{"uid":"4e31-512"},{"uid":"4e31-536"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-824"}]},"4e31-786":{"id":"modules/ui/confirm.js","moduleParts":{"dist/rapid.js":"4e31-787"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-586"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-824"},{"uid":"4e31-2062"},{"uid":"4e31-2086"}]},"4e31-788":{"id":"modules/ui/commit.js","moduleParts":{"dist/rapid.js":"4e31-789"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-52"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-512"},{"uid":"4e31-536"},{"uid":"4e31-2172"},{"uid":"4e31-792"},{"uid":"4e31-802"},{"uid":"4e31-810"},{"uid":"4e31-812"},{"uid":"4e31-814"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-824"}]},"4e31-790":{"id":"modules/ui/popover.js","moduleParts":{"dist/rapid.js":"4e31-791"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-2200"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-792"}]},"4e31-792":{"id":"modules/ui/tooltip.js","moduleParts":{"dist/rapid.js":"4e31-793"},"imported":[{"uid":"4e31-2200"},{"uid":"4e31-498"},{"uid":"4e31-790"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2186"},{"uid":"4e31-2074"},{"uid":"4e31-2064"},{"uid":"4e31-2088"},{"uid":"4e31-1996"},{"uid":"4e31-2090"},{"uid":"4e31-2100"},{"uid":"4e31-2092"},{"uid":"4e31-2070"},{"uid":"4e31-2094"},{"uid":"4e31-2098"},{"uid":"4e31-2006"},{"uid":"4e31-2080"},{"uid":"4e31-2108"},{"uid":"4e31-788"},{"uid":"4e31-812"},{"uid":"4e31-1954"},{"uid":"4e31-1956"},{"uid":"4e31-798"},{"uid":"4e31-1960"},{"uid":"4e31-1976"},{"uid":"4e31-2010"},{"uid":"4e31-2050"},{"uid":"4e31-2054"},{"uid":"4e31-1508"},{"uid":"4e31-2058"},{"uid":"4e31-2056"},{"uid":"4e31-2022"},{"uid":"4e31-2026"},{"uid":"4e31-2028"},{"uid":"4e31-2030"},{"uid":"4e31-2032"},{"uid":"4e31-2034"},{"uid":"4e31-2046"}]},"4e31-794":{"id":"modules/ui/combobox.js","moduleParts":{"dist/rapid.js":"4e31-795"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2174"},{"uid":"4e31-2178"},{"uid":"4e31-2180"},{"uid":"4e31-2182"},{"uid":"4e31-2186"},{"uid":"4e31-2188"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-802"},{"uid":"4e31-800"},{"uid":"4e31-2040"}]},"4e31-796":{"id":"modules/ui/tag_reference.js","moduleParts":{"dist/rapid.js":"4e31-797"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1996"},{"uid":"4e31-814"},{"uid":"4e31-798"},{"uid":"4e31-2010"}]},"4e31-798":{"id":"modules/ui/field.js","moduleParts":{"dist/rapid.js":"4e31-799"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-496"},{"uid":"4e31-536"},{"uid":"4e31-792"},{"uid":"4e31-540"},{"uid":"4e31-796"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2190"},{"uid":"4e31-1998"},{"uid":"4e31-802"}]},"4e31-800":{"id":"modules/ui/form_fields.js","moduleParts":{"dist/rapid.js":"4e31-801"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-794"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1998"},{"uid":"4e31-802"}]},"4e31-802":{"id":"modules/ui/changeset_editor.js","moduleParts":{"dist/rapid.js":"4e31-803"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-794"},{"uid":"4e31-798"},{"uid":"4e31-800"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-788"}]},"4e31-804":{"id":"modules/ui/toggle.js","moduleParts":{"dist/rapid.js":"4e31-805"},"imported":[{"uid":"4e31-266"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-806"},{"uid":"4e31-1482"}]},"4e31-806":{"id":"modules/ui/disclosure.js","moduleParts":{"dist/rapid.js":"4e31-807"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-498"},{"uid":"4e31-416"},{"uid":"4e31-536"},{"uid":"4e31-414"},{"uid":"4e31-508"},{"uid":"4e31-804"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-822"},{"uid":"4e31-808"}]},"4e31-808":{"id":"modules/ui/section.js","moduleParts":{"dist/rapid.js":"4e31-809"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-806"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2060"},{"uid":"4e31-2064"},{"uid":"4e31-2066"},{"uid":"4e31-810"},{"uid":"4e31-2088"},{"uid":"4e31-1992"},{"uid":"4e31-1996"},{"uid":"4e31-2090"},{"uid":"4e31-2100"},{"uid":"4e31-2092"},{"uid":"4e31-2070"},{"uid":"4e31-2094"},{"uid":"4e31-1998"},{"uid":"4e31-2098"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-2008"},{"uid":"4e31-2076"},{"uid":"4e31-2078"},{"uid":"4e31-2080"},{"uid":"4e31-2082"},{"uid":"4e31-2068"}]},"4e31-810":{"id":"modules/ui/sections/changes.js","moduleParts":{"dist/rapid.js":"4e31-811"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-418"},{"uid":"4e31-498"},{"uid":"4e31-782"},{"uid":"4e31-730"},{"uid":"4e31-512"},{"uid":"4e31-536"},{"uid":"4e31-808"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-788"}]},"4e31-812":{"id":"modules/ui/commit_warnings.js","moduleParts":{"dist/rapid.js":"4e31-813"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-788"}]},"4e31-814":{"id":"modules/ui/sections/raw_tag_editor.js","moduleParts":{"dist/rapid.js":"4e31-815"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-794"},{"uid":"4e31-808"},{"uid":"4e31-796"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-788"},{"uid":"4e31-828"},{"uid":"4e31-1990"}]},"4e31-816":{"id":"node_modules/osm-community-index/lib/simplify.js","moduleParts":{"dist/rapid.js":"4e31-817"},"imported":[{"uid":"4e31-2"}],"importedBy":[{"uid":"4e31-818"}]},"4e31-818":{"id":"node_modules/osm-community-index/lib/resolve_strings.js","moduleParts":{"dist/rapid.js":"4e31-819"},"imported":[{"uid":"4e31-816"}],"importedBy":[{"uid":"4e31-820"}]},"4e31-820":{"id":"node_modules/osm-community-index/index.mjs","moduleParts":{"dist/rapid.js":"4e31-821"},"imported":[{"uid":"4e31-818"}],"importedBy":[{"uid":"4e31-822"}]},"4e31-822":{"id":"modules/ui/success.js","moduleParts":{"dist/rapid.js":"4e31-823"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-820"},{"uid":"4e31-418"},{"uid":"4e31-496"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-806"},{"uid":"4e31-508"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-824"}]},"4e31-824":{"id":"modules/modes/ModeSave.js","moduleParts":{"dist/rapid.js":"4e31-825"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-760"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-784"},{"uid":"4e31-786"},{"uid":"4e31-788"},{"uid":"4e31-822"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-826":{"id":"modules/ui/data_header.js","moduleParts":{"dist/rapid.js":"4e31-827"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-828"}]},"4e31-828":{"id":"modules/ui/data_editor.js","moduleParts":{"dist/rapid.js":"4e31-829"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-826"},{"uid":"4e31-814"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1510"},{"uid":"4e31-2014"}]},"4e31-830":{"id":"modules/ui/improveOSM_comments.js","moduleParts":{"dist/rapid.js":"4e31-831"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1446"}]},"4e31-832":{"id":"modules/ui/improveOSM_details.js","moduleParts":{"dist/rapid.js":"4e31-833"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-2198"},{"uid":"4e31-674"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1446"}]},"4e31-834":{"id":"node_modules/@pixi/core/node_modules/@pixi/color/lib/Color.mjs","moduleParts":{"dist/rapid.js":"4e31-835"},"imported":[{"uid":"4e31-446"},{"uid":"4e31-448"}],"importedBy":[{"uid":"4e31-836"}]},"4e31-836":{"id":"node_modules/@pixi/core/node_modules/@pixi/color/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-837"},"imported":[{"uid":"4e31-834"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-950"},{"uid":"4e31-942"},{"uid":"4e31-962"},{"uid":"4e31-1014"}]},"4e31-838":{"id":"node_modules/@pixi/extensions/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-839"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1064"},{"uid":"4e31-950"},{"uid":"4e31-942"},{"uid":"4e31-954"},{"uid":"4e31-956"},{"uid":"4e31-982"},{"uid":"4e31-986"},{"uid":"4e31-1072"},{"uid":"4e31-1076"},{"uid":"4e31-988"},{"uid":"4e31-1000"},{"uid":"4e31-1004"},{"uid":"4e31-1006"},{"uid":"4e31-1008"},{"uid":"4e31-1010"},{"uid":"4e31-1078"},{"uid":"4e31-1080"},{"uid":"4e31-1012"},{"uid":"4e31-1014"},{"uid":"4e31-1026"},{"uid":"4e31-1028"},{"uid":"4e31-1032"},{"uid":"4e31-1036"},{"uid":"4e31-1042"},{"uid":"4e31-1044"},{"uid":"4e31-1046"},{"uid":"4e31-1062"}]},"4e31-840":{"id":"node_modules/@pixi/core/lib/geometry/ViewableBuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-841"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"}]},"4e31-842":{"id":"node_modules/@pixi/core/lib/shader/utils/checkMaxIfStatementsInShader.mjs","moduleParts":{"dist/rapid.js":"4e31-843"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"},{"uid":"4e31-898"}]},"4e31-844":{"id":"node_modules/@pixi/core/lib/state/State.mjs","moduleParts":{"dist/rapid.js":"4e31-845"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"},{"uid":"4e31-948"},{"uid":"4e31-1032"}]},"4e31-846":{"id":"node_modules/@pixi/core/lib/textures/resources/autoDetectResource.mjs","moduleParts":{"dist/rapid.js":"4e31-847"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-856"},{"uid":"4e31-1086"},{"uid":"4e31-1082"}]},"4e31-848":{"id":"node_modules/@pixi/runner/lib/Runner.mjs","moduleParts":{"dist/rapid.js":"4e31-849"},"imported":[],"importedBy":[{"uid":"4e31-850"}]},"4e31-850":{"id":"node_modules/@pixi/runner/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-851"},"imported":[{"uid":"4e31-848"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-960"},{"uid":"4e31-860"},{"uid":"4e31-866"},{"uid":"4e31-926"},{"uid":"4e31-2661"},{"uid":"4e31-1034"},{"uid":"4e31-852"}]},"4e31-852":{"id":"node_modules/@pixi/core/lib/textures/resources/Resource.mjs","moduleParts":{"dist/rapid.js":"4e31-853"},"imported":[{"uid":"4e31-850"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-856"},{"uid":"4e31-1086"},{"uid":"4e31-964"},{"uid":"4e31-1082"},{"uid":"4e31-854"}]},"4e31-854":{"id":"node_modules/@pixi/core/lib/textures/resources/BufferResource.mjs","moduleParts":{"dist/rapid.js":"4e31-855"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-852"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-856"},{"uid":"4e31-1086"},{"uid":"4e31-958"}]},"4e31-856":{"id":"node_modules/@pixi/core/lib/textures/BaseTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-857"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-424"},{"uid":"4e31-420"},{"uid":"4e31-846"},{"uid":"4e31-854"},{"uid":"4e31-852"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-942"},{"uid":"4e31-960"},{"uid":"4e31-962"},{"uid":"4e31-970"},{"uid":"4e31-1042"},{"uid":"4e31-1082"}]},"4e31-858":{"id":"node_modules/@pixi/core/lib/batch/BatchDrawCall.mjs","moduleParts":{"dist/rapid.js":"4e31-859"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"}]},"4e31-860":{"id":"node_modules/@pixi/core/lib/geometry/Buffer.mjs","moduleParts":{"dist/rapid.js":"4e31-861"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-850"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-868"},{"uid":"4e31-866"},{"uid":"4e31-924"},{"uid":"4e31-978"}]},"4e31-862":{"id":"node_modules/@pixi/core/lib/geometry/Attribute.mjs","moduleParts":{"dist/rapid.js":"4e31-863"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-866"}]},"4e31-864":{"id":"node_modules/@pixi/core/lib/geometry/utils/interleaveTypedArrays.mjs","moduleParts":{"dist/rapid.js":"4e31-865"},"imported":[{"uid":"4e31-420"}],"importedBy":[{"uid":"4e31-866"}]},"4e31-866":{"id":"node_modules/@pixi/core/lib/geometry/Geometry.mjs","moduleParts":{"dist/rapid.js":"4e31-867"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-850"},{"uid":"4e31-420"},{"uid":"4e31-862"},{"uid":"4e31-860"},{"uid":"4e31-864"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-868"},{"uid":"4e31-976"},{"uid":"4e31-978"}]},"4e31-868":{"id":"node_modules/@pixi/core/lib/batch/BatchGeometry.mjs","moduleParts":{"dist/rapid.js":"4e31-869"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-860"},{"uid":"4e31-866"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"}]},"4e31-870":{"id":"node_modules/@pixi/math/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-871"},"imported":[],"importedBy":[{"uid":"4e31-878"},{"uid":"4e31-876"},{"uid":"4e31-880"},{"uid":"4e31-882"},{"uid":"4e31-874"},{"uid":"4e31-884"},{"uid":"4e31-886"}]},"4e31-872":{"id":"node_modules/@pixi/math/lib/Point.mjs","moduleParts":{"dist/rapid.js":"4e31-873"},"imported":[],"importedBy":[{"uid":"4e31-878"},{"uid":"4e31-874"},{"uid":"4e31-886"}]},"4e31-874":{"id":"node_modules/@pixi/math/lib/shapes/Rectangle.mjs","moduleParts":{"dist/rapid.js":"4e31-875"},"imported":[{"uid":"4e31-870"},{"uid":"4e31-872"}],"importedBy":[{"uid":"4e31-878"},{"uid":"4e31-876"},{"uid":"4e31-880"}]},"4e31-876":{"id":"node_modules/@pixi/math/lib/shapes/Circle.mjs","moduleParts":{"dist/rapid.js":"4e31-877"},"imported":[{"uid":"4e31-870"},{"uid":"4e31-874"}],"importedBy":[{"uid":"4e31-878"}]},"4e31-878":{"id":"node_modules/@pixi/math/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-879"},"imported":[{"uid":"4e31-876"},{"uid":"4e31-880"},{"uid":"4e31-882"},{"uid":"4e31-874"},{"uid":"4e31-884"},{"uid":"4e31-888"},{"uid":"4e31-2679"},{"uid":"4e31-2680"},{"uid":"4e31-886"},{"uid":"4e31-890"},{"uid":"4e31-872"},{"uid":"4e31-892"},{"uid":"4e31-870"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1520"},{"uid":"4e31-928"},{"uid":"4e31-980"},{"uid":"4e31-982"},{"uid":"4e31-996"},{"uid":"4e31-986"},{"uid":"4e31-1004"},{"uid":"4e31-1010"},{"uid":"4e31-1080"},{"uid":"4e31-1012"},{"uid":"4e31-1014"},{"uid":"4e31-970"},{"uid":"4e31-990"},{"uid":"4e31-968"},{"uid":"4e31-1046"}]},"4e31-880":{"id":"node_modules/@pixi/math/lib/shapes/Ellipse.mjs","moduleParts":{"dist/rapid.js":"4e31-881"},"imported":[{"uid":"4e31-870"},{"uid":"4e31-874"}],"importedBy":[{"uid":"4e31-878"}]},"4e31-882":{"id":"node_modules/@pixi/math/lib/shapes/Polygon.mjs","moduleParts":{"dist/rapid.js":"4e31-883"},"imported":[{"uid":"4e31-870"}],"importedBy":[{"uid":"4e31-878"}]},"4e31-884":{"id":"node_modules/@pixi/math/lib/shapes/RoundedRectangle.mjs","moduleParts":{"dist/rapid.js":"4e31-885"},"imported":[{"uid":"4e31-870"}],"importedBy":[{"uid":"4e31-878"}]},"4e31-886":{"id":"node_modules/@pixi/math/lib/Matrix.mjs","moduleParts":{"dist/rapid.js":"4e31-887"},"imported":[{"uid":"4e31-870"},{"uid":"4e31-872"}],"importedBy":[{"uid":"4e31-878"},{"uid":"4e31-888"},{"uid":"4e31-892"}]},"4e31-888":{"id":"node_modules/@pixi/math/lib/groupD8.mjs","moduleParts":{"dist/rapid.js":"4e31-889"},"imported":[{"uid":"4e31-886"}],"importedBy":[{"uid":"4e31-878"}]},"4e31-890":{"id":"node_modules/@pixi/math/lib/ObservablePoint.mjs","moduleParts":{"dist/rapid.js":"4e31-891"},"imported":[],"importedBy":[{"uid":"4e31-878"},{"uid":"4e31-892"}]},"4e31-892":{"id":"node_modules/@pixi/math/lib/Transform.mjs","moduleParts":{"dist/rapid.js":"4e31-893"},"imported":[{"uid":"4e31-886"},{"uid":"4e31-890"}],"importedBy":[{"uid":"4e31-878"}]},"4e31-894":{"id":"node_modules/@pixi/core/lib/shader/defaultProgram.mjs","moduleParts":{"dist/rapid.js":"4e31-895"},"imported":[],"importedBy":[{"uid":"4e31-922"}]},"4e31-896":{"id":"node_modules/@pixi/core/lib/shader/defaultProgram2.mjs","moduleParts":{"dist/rapid.js":"4e31-897"},"imported":[],"importedBy":[{"uid":"4e31-922"}]},"4e31-898":{"id":"node_modules/@pixi/core/lib/shader/utils/index.mjs","moduleParts":{"dist/rapid.js":"4e31-899"},"imported":[{"uid":"4e31-842"},{"uid":"4e31-900"},{"uid":"4e31-902"},{"uid":"4e31-906"},{"uid":"4e31-910"},{"uid":"4e31-908"},{"uid":"4e31-912"},{"uid":"4e31-914"},{"uid":"4e31-916"},{"uid":"4e31-918"},{"uid":"4e31-904"},{"uid":"4e31-920"}],"importedBy":[{"uid":"4e31-922"},{"uid":"4e31-1026"},{"uid":"4e31-1024"}]},"4e31-900":{"id":"node_modules/@pixi/core/lib/shader/utils/compileShader.mjs","moduleParts":{"dist/rapid.js":"4e31-901"},"imported":[],"importedBy":[{"uid":"4e31-1022"},{"uid":"4e31-898"}]},"4e31-902":{"id":"node_modules/@pixi/core/lib/shader/utils/defaultValue.mjs","moduleParts":{"dist/rapid.js":"4e31-903"},"imported":[],"importedBy":[{"uid":"4e31-1022"},{"uid":"4e31-898"},{"uid":"4e31-1020"}]},"4e31-904":{"id":"node_modules/@pixi/core/lib/shader/utils/uniformParsers.mjs","moduleParts":{"dist/rapid.js":"4e31-905"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1024"},{"uid":"4e31-898"},{"uid":"4e31-906"}]},"4e31-906":{"id":"node_modules/@pixi/core/lib/shader/utils/generateUniformsSync.mjs","moduleParts":{"dist/rapid.js":"4e31-907"},"imported":[{"uid":"4e31-904"}],"importedBy":[{"uid":"4e31-1026"},{"uid":"4e31-898"}]},"4e31-908":{"id":"node_modules/@pixi/core/lib/shader/utils/getTestContext.mjs","moduleParts":{"dist/rapid.js":"4e31-909"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-898"},{"uid":"4e31-910"}]},"4e31-910":{"id":"node_modules/@pixi/core/lib/shader/utils/getMaxFragmentPrecision.mjs","moduleParts":{"dist/rapid.js":"4e31-911"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-908"}],"importedBy":[{"uid":"4e31-922"},{"uid":"4e31-898"}]},"4e31-912":{"id":"node_modules/@pixi/core/lib/shader/utils/logProgramError.mjs","moduleParts":{"dist/rapid.js":"4e31-913"},"imported":[],"importedBy":[{"uid":"4e31-1022"},{"uid":"4e31-898"}]},"4e31-914":{"id":"node_modules/@pixi/core/lib/shader/utils/mapSize.mjs","moduleParts":{"dist/rapid.js":"4e31-915"},"imported":[],"importedBy":[{"uid":"4e31-1024"},{"uid":"4e31-898"},{"uid":"4e31-1018"}]},"4e31-916":{"id":"node_modules/@pixi/core/lib/shader/utils/mapType.mjs","moduleParts":{"dist/rapid.js":"4e31-917"},"imported":[],"importedBy":[{"uid":"4e31-898"},{"uid":"4e31-1018"},{"uid":"4e31-1020"}]},"4e31-918":{"id":"node_modules/@pixi/core/lib/shader/utils/setPrecision.mjs","moduleParts":{"dist/rapid.js":"4e31-919"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-922"},{"uid":"4e31-898"}]},"4e31-920":{"id":"node_modules/@pixi/core/lib/shader/utils/unsafeEvalSupported.mjs","moduleParts":{"dist/rapid.js":"4e31-921"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1026"},{"uid":"4e31-898"}]},"4e31-922":{"id":"node_modules/@pixi/core/lib/shader/Program.mjs","moduleParts":{"dist/rapid.js":"4e31-923"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-420"},{"uid":"4e31-894"},{"uid":"4e31-896"},{"uid":"4e31-898"},{"uid":"4e31-918"},{"uid":"4e31-910"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-928"},{"uid":"4e31-948"},{"uid":"4e31-926"}]},"4e31-924":{"id":"node_modules/@pixi/core/lib/shader/UniformGroup.mjs","moduleParts":{"dist/rapid.js":"4e31-925"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-860"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-928"},{"uid":"4e31-982"},{"uid":"4e31-1080"},{"uid":"4e31-926"}]},"4e31-926":{"id":"node_modules/@pixi/core/lib/shader/Shader.mjs","moduleParts":{"dist/rapid.js":"4e31-927"},"imported":[{"uid":"4e31-850"},{"uid":"4e31-922"},{"uid":"4e31-924"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-928"},{"uid":"4e31-948"}]},"4e31-928":{"id":"node_modules/@pixi/core/lib/batch/BatchShaderGenerator.mjs","moduleParts":{"dist/rapid.js":"4e31-929"},"imported":[{"uid":"4e31-878"},{"uid":"4e31-922"},{"uid":"4e31-926"},{"uid":"4e31-924"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"}]},"4e31-930":{"id":"node_modules/@pixi/core/lib/batch/BatchTextureArray.mjs","moduleParts":{"dist/rapid.js":"4e31-931"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"}]},"4e31-932":{"id":"node_modules/@pixi/core/lib/batch/canUploadSameBuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-933"},"imported":[{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-942"}]},"4e31-934":{"id":"node_modules/@pixi/core/lib/batch/maxRecommendedTextures.mjs","moduleParts":{"dist/rapid.js":"4e31-935"},"imported":[{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-942"}]},"4e31-936":{"id":"node_modules/@pixi/core/lib/batch/ObjectRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-937"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-942"},{"uid":"4e31-954"}]},"4e31-938":{"id":"node_modules/@pixi/core/lib/batch/texture.mjs","moduleParts":{"dist/rapid.js":"4e31-939"},"imported":[],"importedBy":[{"uid":"4e31-942"}]},"4e31-940":{"id":"node_modules/@pixi/core/lib/batch/texture2.mjs","moduleParts":{"dist/rapid.js":"4e31-941"},"imported":[],"importedBy":[{"uid":"4e31-942"}]},"4e31-942":{"id":"node_modules/@pixi/core/lib/batch/BatchRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-943"},"imported":[{"uid":"4e31-836"},{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-424"},{"uid":"4e31-420"},{"uid":"4e31-840"},{"uid":"4e31-842"},{"uid":"4e31-844"},{"uid":"4e31-856"},{"uid":"4e31-858"},{"uid":"4e31-868"},{"uid":"4e31-928"},{"uid":"4e31-930"},{"uid":"4e31-932"},{"uid":"4e31-934"},{"uid":"4e31-936"},{"uid":"4e31-938"},{"uid":"4e31-940"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"}]},"4e31-944":{"id":"node_modules/@pixi/core/lib/filters/defaultFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-945"},"imported":[],"importedBy":[{"uid":"4e31-948"}]},"4e31-946":{"id":"node_modules/@pixi/core/lib/filters/defaultFilter2.mjs","moduleParts":{"dist/rapid.js":"4e31-947"},"imported":[],"importedBy":[{"uid":"4e31-948"}]},"4e31-948":{"id":"node_modules/@pixi/core/lib/filters/Filter.mjs","moduleParts":{"dist/rapid.js":"4e31-949"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-922"},{"uid":"4e31-926"},{"uid":"4e31-844"},{"uid":"4e31-944"},{"uid":"4e31-946"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-996"},{"uid":"4e31-998"}]},"4e31-950":{"id":"node_modules/@pixi/core/lib/background/BackgroundSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-951"},"imported":[{"uid":"4e31-836"},{"uid":"4e31-838"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-952"}]},"4e31-952":{"id":"node_modules/@pixi/core/lib/systems.mjs","moduleParts":{"dist/rapid.js":"4e31-953"},"imported":[{"uid":"4e31-950"},{"uid":"4e31-954"},{"uid":"4e31-956"},{"uid":"4e31-982"},{"uid":"4e31-986"},{"uid":"4e31-988"},{"uid":"4e31-1000"},{"uid":"4e31-1004"},{"uid":"4e31-1006"},{"uid":"4e31-1008"},{"uid":"4e31-1010"},{"uid":"4e31-1012"},{"uid":"4e31-1014"},{"uid":"4e31-1026"},{"uid":"4e31-1028"},{"uid":"4e31-1032"},{"uid":"4e31-1034"},{"uid":"4e31-1036"},{"uid":"4e31-1042"},{"uid":"4e31-1044"},{"uid":"4e31-1046"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"}]},"4e31-954":{"id":"node_modules/@pixi/core/lib/batch/BatchSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-955"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-936"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-956":{"id":"node_modules/@pixi/core/lib/context/ContextSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-957"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-952"}]},"4e31-958":{"id":"node_modules/@pixi/core/lib/textures/resources/DepthResource.mjs","moduleParts":{"dist/rapid.js":"4e31-959"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-854"}],"importedBy":[{"uid":"4e31-960"}]},"4e31-960":{"id":"node_modules/@pixi/core/lib/framebuffer/Framebuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-961"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-850"},{"uid":"4e31-856"},{"uid":"4e31-958"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-986"},{"uid":"4e31-962"}]},"4e31-962":{"id":"node_modules/@pixi/core/lib/renderTexture/BaseRenderTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-963"},"imported":[{"uid":"4e31-836"},{"uid":"4e31-456"},{"uid":"4e31-960"},{"uid":"4e31-856"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-972"},{"uid":"4e31-974"}]},"4e31-964":{"id":"node_modules/@pixi/core/lib/textures/resources/BaseImageResource.mjs","moduleParts":{"dist/rapid.js":"4e31-965"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-420"},{"uid":"4e31-852"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"},{"uid":"4e31-1088"},{"uid":"4e31-1092"},{"uid":"4e31-966"},{"uid":"4e31-1094"},{"uid":"4e31-1096"}]},"4e31-966":{"id":"node_modules/@pixi/core/lib/textures/resources/ImageResource.mjs","moduleParts":{"dist/rapid.js":"4e31-967"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-424"},{"uid":"4e31-964"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"},{"uid":"4e31-970"}]},"4e31-968":{"id":"node_modules/@pixi/core/lib/textures/TextureUvs.mjs","moduleParts":{"dist/rapid.js":"4e31-969"},"imported":[{"uid":"4e31-878"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-970"}]},"4e31-970":{"id":"node_modules/@pixi/core/lib/textures/Texture.mjs","moduleParts":{"dist/rapid.js":"4e31-971"},"imported":[{"uid":"4e31-878"},{"uid":"4e31-424"},{"uid":"4e31-420"},{"uid":"4e31-856"},{"uid":"4e31-966"},{"uid":"4e31-968"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-972"}]},"4e31-972":{"id":"node_modules/@pixi/core/lib/renderTexture/RenderTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-973"},"imported":[{"uid":"4e31-970"},{"uid":"4e31-962"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1012"},{"uid":"4e31-974"}]},"4e31-974":{"id":"node_modules/@pixi/core/lib/renderTexture/RenderTexturePool.mjs","moduleParts":{"dist/rapid.js":"4e31-975"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-420"},{"uid":"4e31-962"},{"uid":"4e31-972"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-982"}]},"4e31-976":{"id":"node_modules/@pixi/core/lib/utils/Quad.mjs","moduleParts":{"dist/rapid.js":"4e31-977"},"imported":[{"uid":"4e31-866"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-982"}]},"4e31-978":{"id":"node_modules/@pixi/core/lib/utils/QuadUv.mjs","moduleParts":{"dist/rapid.js":"4e31-979"},"imported":[{"uid":"4e31-860"},{"uid":"4e31-866"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-982"}]},"4e31-980":{"id":"node_modules/@pixi/core/lib/filters/FilterState.mjs","moduleParts":{"dist/rapid.js":"4e31-981"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-878"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-982"}]},"4e31-982":{"id":"node_modules/@pixi/core/lib/filters/FilterSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-983"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-878"},{"uid":"4e31-974"},{"uid":"4e31-924"},{"uid":"4e31-976"},{"uid":"4e31-978"},{"uid":"4e31-980"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-984":{"id":"node_modules/@pixi/core/lib/framebuffer/GLFramebuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-985"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-986"}]},"4e31-986":{"id":"node_modules/@pixi/core/lib/framebuffer/FramebufferSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-987"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-878"},{"uid":"4e31-424"},{"uid":"4e31-960"},{"uid":"4e31-984"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-988":{"id":"node_modules/@pixi/core/lib/geometry/GeometrySystem.mjs","moduleParts":{"dist/rapid.js":"4e31-989"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-990":{"id":"node_modules/@pixi/core/lib/textures/TextureMatrix.mjs","moduleParts":{"dist/rapid.js":"4e31-991"},"imported":[{"uid":"4e31-878"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-996"}]},"4e31-992":{"id":"node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter2.mjs","moduleParts":{"dist/rapid.js":"4e31-993"},"imported":[],"importedBy":[{"uid":"4e31-996"}]},"4e31-994":{"id":"node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter3.mjs","moduleParts":{"dist/rapid.js":"4e31-995"},"imported":[],"importedBy":[{"uid":"4e31-996"}]},"4e31-996":{"id":"node_modules/@pixi/core/lib/filters/spriteMask/SpriteMaskFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-997"},"imported":[{"uid":"4e31-878"},{"uid":"4e31-990"},{"uid":"4e31-948"},{"uid":"4e31-992"},{"uid":"4e31-994"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1000"}]},"4e31-998":{"id":"node_modules/@pixi/core/lib/mask/MaskData.mjs","moduleParts":{"dist/rapid.js":"4e31-999"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-948"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1000"}]},"4e31-1000":{"id":"node_modules/@pixi/core/lib/mask/MaskSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1001"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-996"},{"uid":"4e31-998"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1002":{"id":"node_modules/@pixi/core/lib/mask/AbstractMaskSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1003"},"imported":[],"importedBy":[{"uid":"4e31-1004"},{"uid":"4e31-1006"}]},"4e31-1004":{"id":"node_modules/@pixi/core/lib/mask/ScissorSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1005"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-878"},{"uid":"4e31-424"},{"uid":"4e31-1002"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1006":{"id":"node_modules/@pixi/core/lib/mask/StencilSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1007"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-424"},{"uid":"4e31-1002"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1008":{"id":"node_modules/@pixi/core/lib/plugin/PluginSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1009"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-420"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1010":{"id":"node_modules/@pixi/core/lib/projection/ProjectionSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1011"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-878"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1012":{"id":"node_modules/@pixi/core/lib/renderTexture/GenerateTextureSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1013"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-878"},{"uid":"4e31-972"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1014":{"id":"node_modules/@pixi/core/lib/renderTexture/RenderTextureSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1015"},"imported":[{"uid":"4e31-836"},{"uid":"4e31-838"},{"uid":"4e31-878"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1016":{"id":"node_modules/@pixi/core/lib/shader/GLProgram.mjs","moduleParts":{"dist/rapid.js":"4e31-1017"},"imported":[],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1022"}]},"4e31-1018":{"id":"node_modules/@pixi/core/lib/shader/utils/getAttributeData.mjs","moduleParts":{"dist/rapid.js":"4e31-1019"},"imported":[{"uid":"4e31-914"},{"uid":"4e31-916"}],"importedBy":[{"uid":"4e31-1022"}]},"4e31-1020":{"id":"node_modules/@pixi/core/lib/shader/utils/getUniformData.mjs","moduleParts":{"dist/rapid.js":"4e31-1021"},"imported":[{"uid":"4e31-902"},{"uid":"4e31-916"}],"importedBy":[{"uid":"4e31-1022"}]},"4e31-1022":{"id":"node_modules/@pixi/core/lib/shader/utils/generateProgram.mjs","moduleParts":{"dist/rapid.js":"4e31-1023"},"imported":[{"uid":"4e31-1016"},{"uid":"4e31-900"},{"uid":"4e31-902"},{"uid":"4e31-1018"},{"uid":"4e31-1020"},{"uid":"4e31-912"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1026"}]},"4e31-1024":{"id":"node_modules/@pixi/core/lib/shader/utils/generateUniformBufferSync.mjs","moduleParts":{"dist/rapid.js":"4e31-1025"},"imported":[{"uid":"4e31-898"},{"uid":"4e31-904"},{"uid":"4e31-914"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1026"}]},"4e31-1026":{"id":"node_modules/@pixi/core/lib/shader/ShaderSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1027"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-898"},{"uid":"4e31-1022"},{"uid":"4e31-1024"},{"uid":"4e31-920"},{"uid":"4e31-906"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1028":{"id":"node_modules/@pixi/core/lib/startup/StartupSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1029"},"imported":[{"uid":"4e31-838"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-952"}]},"4e31-1030":{"id":"node_modules/@pixi/core/lib/state/utils/mapWebGLBlendModesToPixi.mjs","moduleParts":{"dist/rapid.js":"4e31-1031"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-1032"}]},"4e31-1032":{"id":"node_modules/@pixi/core/lib/state/StateSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1033"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-844"},{"uid":"4e31-1030"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1034":{"id":"node_modules/@pixi/core/lib/system/SystemManager.mjs","moduleParts":{"dist/rapid.js":"4e31-1035"},"imported":[{"uid":"4e31-850"},{"uid":"4e31-420"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1080"},{"uid":"4e31-952"}]},"4e31-1036":{"id":"node_modules/@pixi/core/lib/textures/TextureGCSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1037"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-952"}]},"4e31-1038":{"id":"node_modules/@pixi/core/lib/textures/GLTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-1039"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1042"}]},"4e31-1040":{"id":"node_modules/@pixi/core/lib/textures/utils/mapTypeAndFormatToInternalFormat.mjs","moduleParts":{"dist/rapid.js":"4e31-1041"},"imported":[{"uid":"4e31-456"}],"importedBy":[{"uid":"4e31-1042"}]},"4e31-1042":{"id":"node_modules/@pixi/core/lib/textures/TextureSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1043"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-420"},{"uid":"4e31-856"},{"uid":"4e31-1038"},{"uid":"4e31-1040"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1044":{"id":"node_modules/@pixi/core/lib/transformFeedback/TransformFeedbackSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1045"},"imported":[{"uid":"4e31-838"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-952"}]},"4e31-1046":{"id":"node_modules/@pixi/core/lib/view/ViewSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1047"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-878"},{"uid":"4e31-424"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1048"},{"uid":"4e31-952"}]},"4e31-1048":{"id":"node_modules/@pixi/core/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1049"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-424"},{"uid":"4e31-420"},{"uid":"4e31-942"},{"uid":"4e31-948"},{"uid":"4e31-922"},{"uid":"4e31-952"},{"uid":"4e31-856"},{"uid":"4e31-956"},{"uid":"4e31-950"},{"uid":"4e31-1046"},{"uid":"4e31-1028"},{"uid":"4e31-1036"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1050":{"id":"node_modules/@pixi/core/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1051"},"imported":[{"uid":"4e31-1048"},{"uid":"4e31-836"},{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-878"},{"uid":"4e31-850"},{"uid":"4e31-424"},{"uid":"4e31-1060"},{"uid":"4e31-420"},{"uid":"4e31-1064"},{"uid":"4e31-950"},{"uid":"4e31-858"},{"uid":"4e31-868"},{"uid":"4e31-942"},{"uid":"4e31-928"},{"uid":"4e31-954"},{"uid":"4e31-930"},{"uid":"4e31-936"},{"uid":"4e31-956"},{"uid":"4e31-948"},{"uid":"4e31-980"},{"uid":"4e31-982"},{"uid":"4e31-2658"},{"uid":"4e31-996"},{"uid":"4e31-1070"},{"uid":"4e31-960"},{"uid":"4e31-986"},{"uid":"4e31-984"},{"uid":"4e31-1072"},{"uid":"4e31-862"},{"uid":"4e31-860"},{"uid":"4e31-1076"},{"uid":"4e31-866"},{"uid":"4e31-988"},{"uid":"4e31-840"},{"uid":"4e31-2659"},{"uid":"4e31-998"},{"uid":"4e31-1000"},{"uid":"4e31-1004"},{"uid":"4e31-1006"},{"uid":"4e31-1008"},{"uid":"4e31-1010"},{"uid":"4e31-1078"},{"uid":"4e31-1080"},{"uid":"4e31-962"},{"uid":"4e31-1012"},{"uid":"4e31-972"},{"uid":"4e31-974"},{"uid":"4e31-1014"},{"uid":"4e31-1016"},{"uid":"4e31-922"},{"uid":"4e31-926"},{"uid":"4e31-1026"},{"uid":"4e31-924"},{"uid":"4e31-842"},{"uid":"4e31-1022"},{"uid":"4e31-1024"},{"uid":"4e31-908"},{"uid":"4e31-904"},{"uid":"4e31-920"},{"uid":"4e31-1028"},{"uid":"4e31-844"},{"uid":"4e31-1032"},{"uid":"4e31-2660"},{"uid":"4e31-952"},{"uid":"4e31-856"},{"uid":"4e31-1038"},{"uid":"4e31-1086"},{"uid":"4e31-970"},{"uid":"4e31-1036"},{"uid":"4e31-990"},{"uid":"4e31-1042"},{"uid":"4e31-968"},{"uid":"4e31-2661"},{"uid":"4e31-1044"},{"uid":"4e31-976"},{"uid":"4e31-978"},{"uid":"4e31-1046"},{"uid":"4e31-1034"},{"uid":"4e31-964"},{"uid":"4e31-852"},{"uid":"4e31-1082"},{"uid":"4e31-1084"},{"uid":"4e31-846"},{"uid":"4e31-854"},{"uid":"4e31-1088"},{"uid":"4e31-1090"},{"uid":"4e31-1092"},{"uid":"4e31-966"},{"uid":"4e31-1094"},{"uid":"4e31-1096"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1112"},{"uid":"4e31-1116"},{"uid":"4e31-1162"},{"uid":"4e31-1520"},{"uid":"4e31-1186"},{"uid":"4e31-1190"},{"uid":"4e31-1194"},{"uid":"4e31-1196"},{"uid":"4e31-1242"},{"uid":"4e31-1214"},{"uid":"4e31-1248"},{"uid":"4e31-1252"},{"uid":"4e31-1256"},{"uid":"4e31-1258"},{"uid":"4e31-1222"},{"uid":"4e31-1224"},{"uid":"4e31-1226"},{"uid":"4e31-1234"},{"uid":"4e31-1232"},{"uid":"4e31-1230"},{"uid":"4e31-1260"},{"uid":"4e31-1204"},{"uid":"4e31-1268"},{"uid":"4e31-1284"},{"uid":"4e31-1286"},{"uid":"4e31-1288"},{"uid":"4e31-1282"},{"uid":"4e31-1272"},{"uid":"4e31-1098"},{"uid":"4e31-1100"},{"uid":"4e31-1104"},{"uid":"4e31-1102"},{"uid":"4e31-1176"},{"uid":"4e31-1180"},{"uid":"4e31-1168"},{"uid":"4e31-1182"},{"uid":"4e31-1170"},{"uid":"4e31-1290"},{"uid":"4e31-1120"},{"uid":"4e31-1130"},{"uid":"4e31-1128"},{"uid":"4e31-1136"},{"uid":"4e31-1144"},{"uid":"4e31-1152"},{"uid":"4e31-1158"},{"uid":"4e31-1296"},{"uid":"4e31-1326"},{"uid":"4e31-1320"},{"uid":"4e31-1322"},{"uid":"4e31-1298"},{"uid":"4e31-1294"},{"uid":"4e31-1312"},{"uid":"4e31-1306"},{"uid":"4e31-1330"},{"uid":"4e31-1334"},{"uid":"4e31-1340"},{"uid":"4e31-2664"},{"uid":"4e31-2665"},{"uid":"4e31-2666"},{"uid":"4e31-1346"},{"uid":"4e31-1348"},{"uid":"4e31-1358"},{"uid":"4e31-1360"},{"uid":"4e31-1374"},{"uid":"4e31-1378"},{"uid":"4e31-1108"},{"uid":"4e31-2668"},{"uid":"4e31-1382"},{"uid":"4e31-1396"},{"uid":"4e31-1398"},{"uid":"4e31-1402"},{"uid":"4e31-1370"},{"uid":"4e31-1366"},{"uid":"4e31-1368"},{"uid":"4e31-1426"},{"uid":"4e31-1434"},{"uid":"4e31-1436"},{"uid":"4e31-1412"},{"uid":"4e31-1440"},{"uid":"4e31-1438"},{"uid":"4e31-1522"},{"uid":"4e31-1528"},{"uid":"4e31-1530"},{"uid":"4e31-1532"},{"uid":"4e31-1824"},{"uid":"4e31-1826"},{"uid":"4e31-1828"},{"uid":"4e31-1830"},{"uid":"4e31-1832"},{"uid":"4e31-1834"},{"uid":"4e31-1836"},{"uid":"4e31-1838"},{"uid":"4e31-1840"},{"uid":"4e31-1842"},{"uid":"4e31-1844"},{"uid":"4e31-1846"},{"uid":"4e31-1848"},{"uid":"4e31-1850"},{"uid":"4e31-1852"},{"uid":"4e31-1854"},{"uid":"4e31-1526"},{"uid":"4e31-1856"},{"uid":"4e31-1858"},{"uid":"4e31-1860"},{"uid":"4e31-1862"},{"uid":"4e31-1864"},{"uid":"4e31-1866"},{"uid":"4e31-1868"},{"uid":"4e31-1870"},{"uid":"4e31-1872"},{"uid":"4e31-1874"},{"uid":"4e31-1876"},{"uid":"4e31-1878"},{"uid":"4e31-1880"},{"uid":"4e31-1886"},{"uid":"4e31-1216"},{"uid":"4e31-1240"},{"uid":"4e31-1166"},{"uid":"4e31-1352"},{"uid":"4e31-1416"}]},"4e31-1052":{"id":"node_modules/@pixi/ticker/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1053"},"imported":[{"uid":"4e31-424"},{"uid":"4e31-420"},{"uid":"4e31-1058"}],"importedBy":[{"uid":"4e31-1060"}]},"4e31-1054":{"id":"node_modules/@pixi/ticker/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-1055"},"imported":[],"importedBy":[{"uid":"4e31-1060"},{"uid":"4e31-1058"},{"uid":"4e31-1062"}]},"4e31-1056":{"id":"node_modules/@pixi/ticker/lib/TickerListener.mjs","moduleParts":{"dist/rapid.js":"4e31-1057"},"imported":[],"importedBy":[{"uid":"4e31-1058"}]},"4e31-1058":{"id":"node_modules/@pixi/ticker/lib/Ticker.mjs","moduleParts":{"dist/rapid.js":"4e31-1059"},"imported":[{"uid":"4e31-1054"},{"uid":"4e31-1056"}],"importedBy":[{"uid":"4e31-1060"},{"uid":"4e31-1052"},{"uid":"4e31-1062"}]},"4e31-1060":{"id":"node_modules/@pixi/ticker/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1061"},"imported":[{"uid":"4e31-1052"},{"uid":"4e31-1054"},{"uid":"4e31-1058"},{"uid":"4e31-1062"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1096"}]},"4e31-1062":{"id":"node_modules/@pixi/ticker/lib/TickerPlugin.mjs","moduleParts":{"dist/rapid.js":"4e31-1063"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-1054"},{"uid":"4e31-1058"}],"importedBy":[{"uid":"4e31-1060"}]},"4e31-1064":{"id":"node_modules/@pixi/core/lib/autoDetectRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1065"},"imported":[{"uid":"4e31-838"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1066":{"id":"node_modules/@pixi/core/lib/fragments/default.mjs","moduleParts":{"dist/rapid.js":"4e31-1067"},"imported":[],"importedBy":[{"uid":"4e31-1070"}]},"4e31-1068":{"id":"node_modules/@pixi/core/lib/fragments/defaultFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1069"},"imported":[],"importedBy":[{"uid":"4e31-1070"}]},"4e31-1070":{"id":"node_modules/@pixi/core/lib/fragments/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1071"},"imported":[{"uid":"4e31-1066"},{"uid":"4e31-1068"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1072":{"id":"node_modules/@pixi/core/lib/framebuffer/MultisampleSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1073"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1074":{"id":"node_modules/@pixi/core/lib/geometry/GLBuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1075"},"imported":[],"importedBy":[{"uid":"4e31-1076"}]},"4e31-1076":{"id":"node_modules/@pixi/core/lib/geometry/BufferSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1077"},"imported":[{"uid":"4e31-838"},{"uid":"4e31-1074"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1078":{"id":"node_modules/@pixi/core/lib/render/ObjectRendererSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1079"},"imported":[{"uid":"4e31-838"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1080":{"id":"node_modules/@pixi/core/lib/Renderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1081"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-838"},{"uid":"4e31-878"},{"uid":"4e31-424"},{"uid":"4e31-420"},{"uid":"4e31-924"},{"uid":"4e31-1034"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1082":{"id":"node_modules/@pixi/core/lib/textures/resources/AbstractMultiResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1083"},"imported":[{"uid":"4e31-856"},{"uid":"4e31-846"},{"uid":"4e31-852"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"},{"uid":"4e31-1084"},{"uid":"4e31-1090"}]},"4e31-1084":{"id":"node_modules/@pixi/core/lib/textures/resources/ArrayResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1085"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-1082"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"}]},"4e31-1086":{"id":"node_modules/@pixi/core/lib/textures/resources/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1087"},"imported":[{"uid":"4e31-1084"},{"uid":"4e31-846"},{"uid":"4e31-854"},{"uid":"4e31-1088"},{"uid":"4e31-1090"},{"uid":"4e31-1092"},{"uid":"4e31-966"},{"uid":"4e31-1094"},{"uid":"4e31-1096"},{"uid":"4e31-964"},{"uid":"4e31-852"},{"uid":"4e31-1082"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-1088":{"id":"node_modules/@pixi/core/lib/textures/resources/CanvasResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1089"},"imported":[{"uid":"4e31-964"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"}]},"4e31-1090":{"id":"node_modules/@pixi/core/lib/textures/resources/CubeResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1091"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-1082"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"}]},"4e31-1092":{"id":"node_modules/@pixi/core/lib/textures/resources/ImageBitmapResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1093"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-424"},{"uid":"4e31-964"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"}]},"4e31-1094":{"id":"node_modules/@pixi/core/lib/textures/resources/SVGResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1095"},"imported":[{"uid":"4e31-424"},{"uid":"4e31-420"},{"uid":"4e31-964"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"}]},"4e31-1096":{"id":"node_modules/@pixi/core/lib/textures/resources/VideoResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1097"},"imported":[{"uid":"4e31-1060"},{"uid":"4e31-964"}],"importedBy":[{"uid":"4e31-1050"},{"uid":"4e31-1086"}]},"4e31-1098":{"id":"node_modules/@pixi/display/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1099"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1104"}],"importedBy":[{"uid":"4e31-1106"}]},"4e31-1100":{"id":"node_modules/@pixi/display/lib/Bounds.mjs","moduleParts":{"dist/rapid.js":"4e31-1101"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1106"},{"uid":"4e31-1102"}]},"4e31-1102":{"id":"node_modules/@pixi/display/lib/DisplayObject.mjs","moduleParts":{"dist/rapid.js":"4e31-1103"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1100"}],"importedBy":[{"uid":"4e31-1106"},{"uid":"4e31-1104"}]},"4e31-1104":{"id":"node_modules/@pixi/display/lib/Container.mjs","moduleParts":{"dist/rapid.js":"4e31-1105"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1102"}],"importedBy":[{"uid":"4e31-1106"},{"uid":"4e31-1098"}]},"4e31-1106":{"id":"node_modules/@pixi/display/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1107"},"imported":[{"uid":"4e31-1098"},{"uid":"4e31-1100"},{"uid":"4e31-1104"},{"uid":"4e31-1102"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1112"},{"uid":"4e31-1114"},{"uid":"4e31-1116"},{"uid":"4e31-1186"},{"uid":"4e31-1190"},{"uid":"4e31-1182"},{"uid":"4e31-1326"},{"uid":"4e31-1320"},{"uid":"4e31-1330"},{"uid":"4e31-1348"},{"uid":"4e31-1374"},{"uid":"4e31-1108"},{"uid":"4e31-1434"}]},"4e31-1108":{"id":"node_modules/@pixi/sprite/lib/Sprite.mjs","moduleParts":{"dist/rapid.js":"4e31-1109"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"}],"importedBy":[{"uid":"4e31-1110"}]},"4e31-1110":{"id":"node_modules/@pixi/sprite/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1111"},"imported":[{"uid":"4e31-1108"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1112"},{"uid":"4e31-2668"},{"uid":"4e31-1382"},{"uid":"4e31-1370"},{"uid":"4e31-1440"}]},"4e31-1112":{"id":"node_modules/@pixi/mixin-cache-as-bitmap/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1113"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1110"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1114":{"id":"node_modules/@pixi/mixin-get-child-by-name/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1115"},"imported":[{"uid":"4e31-1106"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1116":{"id":"node_modules/@pixi/mixin-get-global-position/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1117"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1118":{"id":"node_modules/@pixi/filter-alpha/lib/alpha.mjs","moduleParts":{"dist/rapid.js":"4e31-1119"},"imported":[],"importedBy":[{"uid":"4e31-1120"}]},"4e31-1120":{"id":"node_modules/@pixi/filter-alpha/lib/AlphaFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1121"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1118"}],"importedBy":[{"uid":"4e31-1122"}]},"4e31-1122":{"id":"node_modules/@pixi/filter-alpha/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1123"},"imported":[{"uid":"4e31-1120"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1162"},{"uid":"4e31-1822"}]},"4e31-1124":{"id":"node_modules/@pixi/filter-blur/lib/generateBlurFragSource.mjs","moduleParts":{"dist/rapid.js":"4e31-1125"},"imported":[],"importedBy":[{"uid":"4e31-1128"}]},"4e31-1126":{"id":"node_modules/@pixi/filter-blur/lib/generateBlurVertSource.mjs","moduleParts":{"dist/rapid.js":"4e31-1127"},"imported":[],"importedBy":[{"uid":"4e31-1128"}]},"4e31-1128":{"id":"node_modules/@pixi/filter-blur/lib/BlurFilterPass.mjs","moduleParts":{"dist/rapid.js":"4e31-1129"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1124"},{"uid":"4e31-1126"}],"importedBy":[{"uid":"4e31-1132"},{"uid":"4e31-1130"}]},"4e31-1130":{"id":"node_modules/@pixi/filter-blur/lib/BlurFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1131"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1128"}],"importedBy":[{"uid":"4e31-1132"}]},"4e31-1132":{"id":"node_modules/@pixi/filter-blur/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1133"},"imported":[{"uid":"4e31-1130"},{"uid":"4e31-1128"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1162"},{"uid":"4e31-1822"}]},"4e31-1134":{"id":"node_modules/@pixi/filter-color-matrix/lib/colorMatrix.mjs","moduleParts":{"dist/rapid.js":"4e31-1135"},"imported":[],"importedBy":[{"uid":"4e31-1136"}]},"4e31-1136":{"id":"node_modules/@pixi/filter-color-matrix/lib/ColorMatrixFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1137"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1134"}],"importedBy":[{"uid":"4e31-1138"}]},"4e31-1138":{"id":"node_modules/@pixi/filter-color-matrix/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1139"},"imported":[{"uid":"4e31-1136"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1162"}]},"4e31-1140":{"id":"node_modules/@pixi/filter-displacement/lib/displacement.mjs","moduleParts":{"dist/rapid.js":"4e31-1141"},"imported":[],"importedBy":[{"uid":"4e31-1144"}]},"4e31-1142":{"id":"node_modules/@pixi/filter-displacement/lib/displacement2.mjs","moduleParts":{"dist/rapid.js":"4e31-1143"},"imported":[],"importedBy":[{"uid":"4e31-1144"}]},"4e31-1144":{"id":"node_modules/@pixi/filter-displacement/lib/DisplacementFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1145"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1140"},{"uid":"4e31-1142"}],"importedBy":[{"uid":"4e31-1146"}]},"4e31-1146":{"id":"node_modules/@pixi/filter-displacement/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1147"},"imported":[{"uid":"4e31-1144"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1162"}]},"4e31-1148":{"id":"node_modules/@pixi/filter-fxaa/lib/fxaa.mjs","moduleParts":{"dist/rapid.js":"4e31-1149"},"imported":[],"importedBy":[{"uid":"4e31-1152"}]},"4e31-1150":{"id":"node_modules/@pixi/filter-fxaa/lib/fxaa2.mjs","moduleParts":{"dist/rapid.js":"4e31-1151"},"imported":[],"importedBy":[{"uid":"4e31-1152"}]},"4e31-1152":{"id":"node_modules/@pixi/filter-fxaa/lib/FXAAFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1153"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1148"},{"uid":"4e31-1150"}],"importedBy":[{"uid":"4e31-1154"}]},"4e31-1154":{"id":"node_modules/@pixi/filter-fxaa/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1155"},"imported":[{"uid":"4e31-1152"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1162"}]},"4e31-1156":{"id":"node_modules/@pixi/filter-noise/lib/noise.mjs","moduleParts":{"dist/rapid.js":"4e31-1157"},"imported":[],"importedBy":[{"uid":"4e31-1158"}]},"4e31-1158":{"id":"node_modules/@pixi/filter-noise/lib/NoiseFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1159"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1156"}],"importedBy":[{"uid":"4e31-1160"}]},"4e31-1160":{"id":"node_modules/@pixi/filter-noise/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1161"},"imported":[{"uid":"4e31-1158"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1162"}]},"4e31-1162":{"id":"node_modules/pixi.js/lib/filters.mjs","moduleParts":{"dist/rapid.js":"4e31-1163"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1122"},{"uid":"4e31-1132"},{"uid":"4e31-1138"},{"uid":"4e31-1146"},{"uid":"4e31-1154"},{"uid":"4e31-1160"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1164":{"id":"node_modules/pixi.js/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1165"},"imported":[{"uid":"4e31-1112"},{"uid":"4e31-1114"},{"uid":"4e31-1116"},{"uid":"4e31-1162"},{"uid":"4e31-1188"},{"uid":"4e31-1192"},{"uid":"4e31-1244"},{"uid":"4e31-1266"},{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1178"},{"uid":"4e31-1292"},{"uid":"4e31-1122"},{"uid":"4e31-1132"},{"uid":"4e31-1138"},{"uid":"4e31-1146"},{"uid":"4e31-1154"},{"uid":"4e31-1160"},{"uid":"4e31-1316"},{"uid":"4e31-1332"},{"uid":"4e31-1342"},{"uid":"4e31-1350"},{"uid":"4e31-1376"},{"uid":"4e31-1110"},{"uid":"4e31-1380"},{"uid":"4e31-1384"},{"uid":"4e31-1400"},{"uid":"4e31-1364"},{"uid":"4e31-1428"},{"uid":"4e31-1442"}],"importedBy":[{"uid":"4e31-2122"},{"uid":"4e31-1444"},{"uid":"4e31-1450"},{"uid":"4e31-1978"},{"uid":"4e31-1994"},{"uid":"4e31-1936"},{"uid":"4e31-1884"},{"uid":"4e31-1918"},{"uid":"4e31-1468"},{"uid":"4e31-1932"},{"uid":"4e31-1934"},{"uid":"4e31-1908"},{"uid":"4e31-1916"},{"uid":"4e31-1924"},{"uid":"4e31-1926"},{"uid":"4e31-1930"},{"uid":"4e31-1894"},{"uid":"4e31-1898"},{"uid":"4e31-1902"},{"uid":"4e31-1892"},{"uid":"4e31-1890"}]},"4e31-1166":{"id":"node_modules/@pixi/events/lib/EventTicker.mjs","moduleParts":{"dist/rapid.js":"4e31-1167"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1176"},{"uid":"4e31-1180"}]},"4e31-1168":{"id":"node_modules/@pixi/events/lib/FederatedEvent.mjs","moduleParts":{"dist/rapid.js":"4e31-1169"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1178"},{"uid":"4e31-1182"},{"uid":"4e31-1170"}]},"4e31-1170":{"id":"node_modules/@pixi/events/lib/FederatedMouseEvent.mjs","moduleParts":{"dist/rapid.js":"4e31-1171"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1168"}],"importedBy":[{"uid":"4e31-1178"},{"uid":"4e31-1176"},{"uid":"4e31-1172"},{"uid":"4e31-1174"}]},"4e31-1172":{"id":"node_modules/@pixi/events/lib/FederatedPointerEvent.mjs","moduleParts":{"dist/rapid.js":"4e31-1173"},"imported":[{"uid":"4e31-1170"}],"importedBy":[{"uid":"4e31-1178"},{"uid":"4e31-1176"},{"uid":"4e31-1180"}]},"4e31-1174":{"id":"node_modules/@pixi/events/lib/FederatedWheelEvent.mjs","moduleParts":{"dist/rapid.js":"4e31-1175"},"imported":[{"uid":"4e31-1170"}],"importedBy":[{"uid":"4e31-1178"},{"uid":"4e31-1176"},{"uid":"4e31-1180"}]},"4e31-1176":{"id":"node_modules/@pixi/events/lib/EventBoundary.mjs","moduleParts":{"dist/rapid.js":"4e31-1177"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1166"},{"uid":"4e31-1170"},{"uid":"4e31-1172"},{"uid":"4e31-1174"}],"importedBy":[{"uid":"4e31-1178"},{"uid":"4e31-1180"}]},"4e31-1178":{"id":"node_modules/@pixi/events/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1179"},"imported":[{"uid":"4e31-1176"},{"uid":"4e31-1180"},{"uid":"4e31-1168"},{"uid":"4e31-2662"},{"uid":"4e31-1182"},{"uid":"4e31-1170"},{"uid":"4e31-1172"},{"uid":"4e31-1174"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1186"}]},"4e31-1180":{"id":"node_modules/@pixi/events/lib/EventSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1181"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1176"},{"uid":"4e31-1166"},{"uid":"4e31-1172"},{"uid":"4e31-1174"}],"importedBy":[{"uid":"4e31-1178"},{"uid":"4e31-1182"}]},"4e31-1182":{"id":"node_modules/@pixi/events/lib/FederatedEventTarget.mjs","moduleParts":{"dist/rapid.js":"4e31-1183"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1180"},{"uid":"4e31-1168"}],"importedBy":[{"uid":"4e31-1178"}]},"4e31-1184":{"id":"node_modules/@pixi/accessibility/lib/accessibleTarget.mjs","moduleParts":{"dist/rapid.js":"4e31-1185"},"imported":[],"importedBy":[{"uid":"4e31-1188"},{"uid":"4e31-1186"}]},"4e31-1186":{"id":"node_modules/@pixi/accessibility/lib/AccessibilityManager.mjs","moduleParts":{"dist/rapid.js":"4e31-1187"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1178"},{"uid":"4e31-1184"}],"importedBy":[{"uid":"4e31-1188"}]},"4e31-1188":{"id":"node_modules/@pixi/accessibility/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1189"},"imported":[{"uid":"4e31-1186"},{"uid":"4e31-1184"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1190":{"id":"node_modules/@pixi/app/lib/Application.mjs","moduleParts":{"dist/rapid.js":"4e31-1191"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"}],"importedBy":[{"uid":"4e31-1192"}]},"4e31-1192":{"id":"node_modules/@pixi/app/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1193"},"imported":[{"uid":"4e31-1190"},{"uid":"4e31-1194"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1194":{"id":"node_modules/@pixi/app/lib/ResizePlugin.mjs","moduleParts":{"dist/rapid.js":"4e31-1195"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1192"}]},"4e31-1196":{"id":"node_modules/@pixi/assets/lib/AssetExtension.mjs","moduleParts":{"dist/rapid.js":"4e31-1197"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1244"}]},"4e31-1198":{"id":"node_modules/@pixi/assets/lib/BackgroundLoader.mjs","moduleParts":{"dist/rapid.js":"4e31-1199"},"imported":[],"importedBy":[{"uid":"4e31-1242"}]},"4e31-1200":{"id":"node_modules/@pixi/assets/lib/utils/checkDataUrl.mjs","moduleParts":{"dist/rapid.js":"4e31-1201"},"imported":[],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1202"},{"uid":"4e31-1222"},{"uid":"4e31-1224"},{"uid":"4e31-1226"},{"uid":"4e31-1234"},{"uid":"4e31-1232"}]},"4e31-1202":{"id":"node_modules/@pixi/assets/lib/utils/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1203"},"imported":[{"uid":"4e31-1200"},{"uid":"4e31-1204"},{"uid":"4e31-1206"},{"uid":"4e31-1208"},{"uid":"4e31-1210"},{"uid":"4e31-1212"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1214"},{"uid":"4e31-1216"}]},"4e31-1204":{"id":"node_modules/@pixi/assets/lib/utils/checkExtension.mjs","moduleParts":{"dist/rapid.js":"4e31-1205"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1202"},{"uid":"4e31-1222"},{"uid":"4e31-1224"},{"uid":"4e31-1226"},{"uid":"4e31-1234"},{"uid":"4e31-1232"}]},"4e31-1206":{"id":"node_modules/@pixi/assets/lib/utils/convertToList.mjs","moduleParts":{"dist/rapid.js":"4e31-1207"},"imported":[],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1242"},{"uid":"4e31-1202"},{"uid":"4e31-1214"},{"uid":"4e31-1216"},{"uid":"4e31-1240"}]},"4e31-1208":{"id":"node_modules/@pixi/assets/lib/utils/copySearchParams.mjs","moduleParts":{"dist/rapid.js":"4e31-1209"},"imported":[],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1202"}]},"4e31-1210":{"id":"node_modules/@pixi/assets/lib/utils/createStringVariations.mjs","moduleParts":{"dist/rapid.js":"4e31-1211"},"imported":[],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1202"},{"uid":"4e31-1240"}]},"4e31-1212":{"id":"node_modules/@pixi/assets/lib/utils/isSingleItem.mjs","moduleParts":{"dist/rapid.js":"4e31-1213"},"imported":[],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1242"},{"uid":"4e31-1202"},{"uid":"4e31-1216"},{"uid":"4e31-1240"}]},"4e31-1214":{"id":"node_modules/@pixi/assets/lib/cache/Cache.mjs","moduleParts":{"dist/rapid.js":"4e31-1215"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1202"},{"uid":"4e31-1206"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1242"},{"uid":"4e31-1246"}]},"4e31-1216":{"id":"node_modules/@pixi/assets/lib/loader/Loader.mjs","moduleParts":{"dist/rapid.js":"4e31-1217"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1202"},{"uid":"4e31-1212"},{"uid":"4e31-1206"}],"importedBy":[{"uid":"4e31-1242"}]},"4e31-1218":{"id":"node_modules/@pixi/assets/lib/loader/parsers/LoaderParser.mjs","moduleParts":{"dist/rapid.js":"4e31-1219"},"imported":[],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1222"},{"uid":"4e31-1224"},{"uid":"4e31-1226"},{"uid":"4e31-1234"},{"uid":"4e31-1232"},{"uid":"4e31-1220"}]},"4e31-1220":{"id":"node_modules/@pixi/assets/lib/loader/parsers/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1221"},"imported":[{"uid":"4e31-1218"},{"uid":"4e31-1222"},{"uid":"4e31-1224"},{"uid":"4e31-1226"},{"uid":"4e31-1236"}],"importedBy":[{"uid":"4e31-1242"},{"uid":"4e31-2656"}]},"4e31-1222":{"id":"node_modules/@pixi/assets/lib/loader/parsers/loadJson.mjs","moduleParts":{"dist/rapid.js":"4e31-1223"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1200"},{"uid":"4e31-1204"},{"uid":"4e31-1218"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1220"}]},"4e31-1224":{"id":"node_modules/@pixi/assets/lib/loader/parsers/loadTxt.mjs","moduleParts":{"dist/rapid.js":"4e31-1225"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1200"},{"uid":"4e31-1204"},{"uid":"4e31-1218"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1220"}]},"4e31-1226":{"id":"node_modules/@pixi/assets/lib/loader/parsers/loadWebFont.mjs","moduleParts":{"dist/rapid.js":"4e31-1227"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1200"},{"uid":"4e31-1204"},{"uid":"4e31-1218"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1220"}]},"4e31-1228":{"id":"node_modules/@pixi/assets/lib/loader/parsers/WorkerManager.mjs","moduleParts":{"dist/rapid.js":"4e31-1229"},"imported":[],"importedBy":[{"uid":"4e31-1232"}]},"4e31-1230":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/utils/createTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-1231"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1234"},{"uid":"4e31-1232"},{"uid":"4e31-1238"}]},"4e31-1232":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/loadTextures.mjs","moduleParts":{"dist/rapid.js":"4e31-1233"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1200"},{"uid":"4e31-1204"},{"uid":"4e31-1218"},{"uid":"4e31-1228"},{"uid":"4e31-1230"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1242"},{"uid":"4e31-1234"},{"uid":"4e31-1260"},{"uid":"4e31-1236"}]},"4e31-1234":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/loadSVG.mjs","moduleParts":{"dist/rapid.js":"4e31-1235"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1200"},{"uid":"4e31-1204"},{"uid":"4e31-1218"},{"uid":"4e31-1232"},{"uid":"4e31-1230"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1236"}]},"4e31-1236":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1237"},"imported":[{"uid":"4e31-1234"},{"uid":"4e31-1232"},{"uid":"4e31-1238"}],"importedBy":[{"uid":"4e31-1220"}]},"4e31-1238":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/utils/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1239"},"imported":[{"uid":"4e31-1230"}],"importedBy":[{"uid":"4e31-1236"}]},"4e31-1240":{"id":"node_modules/@pixi/assets/lib/resolver/Resolver.mjs","moduleParts":{"dist/rapid.js":"4e31-1241"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1206"},{"uid":"4e31-1210"},{"uid":"4e31-1212"}],"importedBy":[{"uid":"4e31-1242"}]},"4e31-1242":{"id":"node_modules/@pixi/assets/lib/Assets.mjs","moduleParts":{"dist/rapid.js":"4e31-1243"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1198"},{"uid":"4e31-1214"},{"uid":"4e31-1216"},{"uid":"4e31-1220"},{"uid":"4e31-1240"},{"uid":"4e31-1206"},{"uid":"4e31-1212"},{"uid":"4e31-1232"}],"importedBy":[{"uid":"4e31-1244"}]},"4e31-1244":{"id":"node_modules/@pixi/assets/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1245"},"imported":[{"uid":"4e31-1196"},{"uid":"4e31-1242"},{"uid":"4e31-1246"},{"uid":"4e31-2655"},{"uid":"4e31-2656"},{"uid":"4e31-2657"},{"uid":"4e31-1202"},{"uid":"4e31-1214"},{"uid":"4e31-1248"},{"uid":"4e31-1252"},{"uid":"4e31-1256"},{"uid":"4e31-1258"},{"uid":"4e31-1218"},{"uid":"4e31-1222"},{"uid":"4e31-1224"},{"uid":"4e31-1226"},{"uid":"4e31-1234"},{"uid":"4e31-1232"},{"uid":"4e31-1230"},{"uid":"4e31-1260"},{"uid":"4e31-1200"},{"uid":"4e31-1204"},{"uid":"4e31-1206"},{"uid":"4e31-1208"},{"uid":"4e31-1210"},{"uid":"4e31-1212"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1284"},{"uid":"4e31-1286"},{"uid":"4e31-1402"},{"uid":"4e31-1436"}]},"4e31-1246":{"id":"node_modules/@pixi/assets/lib/cache/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1247"},"imported":[{"uid":"4e31-1214"},{"uid":"4e31-2675"},{"uid":"4e31-1250"}],"importedBy":[{"uid":"4e31-1244"}]},"4e31-1248":{"id":"node_modules/@pixi/assets/lib/cache/parsers/cacheTextureArray.mjs","moduleParts":{"dist/rapid.js":"4e31-1249"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1250"}]},"4e31-1250":{"id":"node_modules/@pixi/assets/lib/cache/parsers/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1251"},"imported":[{"uid":"4e31-1248"}],"importedBy":[{"uid":"4e31-1246"}]},"4e31-1252":{"id":"node_modules/@pixi/assets/lib/detections/parsers/detectAvif.mjs","moduleParts":{"dist/rapid.js":"4e31-1253"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1254"}]},"4e31-1254":{"id":"node_modules/@pixi/assets/lib/detections/parsers/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1255"},"imported":[{"uid":"4e31-1252"},{"uid":"4e31-1256"},{"uid":"4e31-1258"}],"importedBy":[{"uid":"4e31-2655"}]},"4e31-1256":{"id":"node_modules/@pixi/assets/lib/detections/parsers/detectWebp.mjs","moduleParts":{"dist/rapid.js":"4e31-1257"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1254"}]},"4e31-1258":{"id":"node_modules/@pixi/assets/lib/detections/parsers/detectDefaults.mjs","moduleParts":{"dist/rapid.js":"4e31-1259"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1254"}]},"4e31-1260":{"id":"node_modules/@pixi/assets/lib/resolver/parsers/resolveTextureUrl.mjs","moduleParts":{"dist/rapid.js":"4e31-1261"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-2656"},{"uid":"4e31-1232"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1262"}]},"4e31-1262":{"id":"node_modules/@pixi/assets/lib/resolver/parsers/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1263"},"imported":[{"uid":"4e31-1260"}],"importedBy":[{"uid":"4e31-2657"}]},"4e31-1264":{"id":"node_modules/@pixi/compressed-textures/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-1265"},"imported":[],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1278"},{"uid":"4e31-1282"},{"uid":"4e31-1276"}]},"4e31-1266":{"id":"node_modules/@pixi/compressed-textures/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1267"},"imported":[{"uid":"4e31-1264"},{"uid":"4e31-1270"},{"uid":"4e31-1280"},{"uid":"4e31-1274"},{"uid":"4e31-1268"},{"uid":"4e31-1284"},{"uid":"4e31-1286"},{"uid":"4e31-1288"},{"uid":"4e31-1278"},{"uid":"4e31-1282"},{"uid":"4e31-1272"},{"uid":"4e31-1276"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1268":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/detectCompressedTextures.mjs","moduleParts":{"dist/rapid.js":"4e31-1269"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1270"}]},"4e31-1270":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1271"},"imported":[{"uid":"4e31-2678"},{"uid":"4e31-1268"},{"uid":"4e31-1284"},{"uid":"4e31-1286"},{"uid":"4e31-1288"}],"importedBy":[{"uid":"4e31-1266"}]},"4e31-1272":{"id":"node_modules/@pixi/compressed-textures/lib/resources/BlobResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1273"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1274"},{"uid":"4e31-1276"}]},"4e31-1274":{"id":"node_modules/@pixi/compressed-textures/lib/resources/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1275"},"imported":[{"uid":"4e31-1272"},{"uid":"4e31-1276"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1278"},{"uid":"4e31-1282"}]},"4e31-1276":{"id":"node_modules/@pixi/compressed-textures/lib/resources/CompressedTextureResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1277"},"imported":[{"uid":"4e31-1264"},{"uid":"4e31-1272"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1274"},{"uid":"4e31-1278"},{"uid":"4e31-1282"}]},"4e31-1278":{"id":"node_modules/@pixi/compressed-textures/lib/parsers/parseDDS.mjs","moduleParts":{"dist/rapid.js":"4e31-1279"},"imported":[{"uid":"4e31-1264"},{"uid":"4e31-1274"},{"uid":"4e31-1276"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1280"},{"uid":"4e31-1284"}]},"4e31-1280":{"id":"node_modules/@pixi/compressed-textures/lib/parsers/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1281"},"imported":[{"uid":"4e31-1278"},{"uid":"4e31-1282"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1284"},{"uid":"4e31-1286"}]},"4e31-1282":{"id":"node_modules/@pixi/compressed-textures/lib/parsers/parseKTX.mjs","moduleParts":{"dist/rapid.js":"4e31-1283"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1264"},{"uid":"4e31-1274"},{"uid":"4e31-1276"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1280"},{"uid":"4e31-1286"}]},"4e31-1284":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/loadDDS.mjs","moduleParts":{"dist/rapid.js":"4e31-1285"},"imported":[{"uid":"4e31-1244"},{"uid":"4e31-1050"},{"uid":"4e31-1280"},{"uid":"4e31-1278"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1270"}]},"4e31-1286":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/loadKTX.mjs","moduleParts":{"dist/rapid.js":"4e31-1287"},"imported":[{"uid":"4e31-1244"},{"uid":"4e31-1050"},{"uid":"4e31-1280"},{"uid":"4e31-1282"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1270"}]},"4e31-1288":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/resolveCompressedTextureUrl.mjs","moduleParts":{"dist/rapid.js":"4e31-1289"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1266"},{"uid":"4e31-1270"}]},"4e31-1290":{"id":"node_modules/@pixi/extract/lib/Extract.mjs","moduleParts":{"dist/rapid.js":"4e31-1291"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1292"}]},"4e31-1292":{"id":"node_modules/@pixi/extract/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1293"},"imported":[{"uid":"4e31-1290"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1294":{"id":"node_modules/@pixi/graphics/lib/utils/buildCircle.mjs","moduleParts":{"dist/rapid.js":"4e31-1295"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"},{"uid":"4e31-1302"}]},"4e31-1296":{"id":"node_modules/@pixi/graphics/lib/utils/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1297"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1294"},{"uid":"4e31-1298"},{"uid":"4e31-1300"},{"uid":"4e31-1302"},{"uid":"4e31-1306"},{"uid":"4e31-1308"},{"uid":"4e31-1310"},{"uid":"4e31-1312"},{"uid":"4e31-1314"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1326"},{"uid":"4e31-1320"}]},"4e31-1298":{"id":"node_modules/@pixi/graphics/lib/utils/buildPoly.mjs","moduleParts":{"dist/rapid.js":"4e31-1299"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"},{"uid":"4e31-1320"}]},"4e31-1300":{"id":"node_modules/@pixi/graphics/lib/utils/buildRectangle.mjs","moduleParts":{"dist/rapid.js":"4e31-1301"},"imported":[],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"}]},"4e31-1302":{"id":"node_modules/@pixi/graphics/lib/utils/buildRoundedRectangle.mjs","moduleParts":{"dist/rapid.js":"4e31-1303"},"imported":[{"uid":"4e31-1294"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"}]},"4e31-1304":{"id":"node_modules/@pixi/graphics/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-1305"},"imported":[],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1326"},{"uid":"4e31-1324"},{"uid":"4e31-1312"},{"uid":"4e31-1306"},{"uid":"4e31-1310"},{"uid":"4e31-1314"}]},"4e31-1306":{"id":"node_modules/@pixi/graphics/lib/utils/ArcUtils.mjs","moduleParts":{"dist/rapid.js":"4e31-1307"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1304"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"},{"uid":"4e31-1326"}]},"4e31-1308":{"id":"node_modules/@pixi/graphics/lib/utils/BatchPart.mjs","moduleParts":{"dist/rapid.js":"4e31-1309"},"imported":[],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"},{"uid":"4e31-1320"}]},"4e31-1310":{"id":"node_modules/@pixi/graphics/lib/utils/BezierUtils.mjs","moduleParts":{"dist/rapid.js":"4e31-1311"},"imported":[{"uid":"4e31-1304"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"},{"uid":"4e31-1326"}]},"4e31-1312":{"id":"node_modules/@pixi/graphics/lib/utils/buildLine.mjs","moduleParts":{"dist/rapid.js":"4e31-1313"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1304"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"},{"uid":"4e31-1320"}]},"4e31-1314":{"id":"node_modules/@pixi/graphics/lib/utils/QuadraticUtils.mjs","moduleParts":{"dist/rapid.js":"4e31-1315"},"imported":[{"uid":"4e31-1304"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1296"},{"uid":"4e31-1326"}]},"4e31-1316":{"id":"node_modules/@pixi/graphics/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1317"},"imported":[{"uid":"4e31-1296"},{"uid":"4e31-1304"},{"uid":"4e31-1326"},{"uid":"4e31-1318"},{"uid":"4e31-1320"},{"uid":"4e31-1322"},{"uid":"4e31-1324"},{"uid":"4e31-1298"},{"uid":"4e31-1294"},{"uid":"4e31-1300"},{"uid":"4e31-1302"},{"uid":"4e31-1312"},{"uid":"4e31-1306"},{"uid":"4e31-1310"},{"uid":"4e31-1314"},{"uid":"4e31-1308"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1378"}]},"4e31-1318":{"id":"node_modules/@pixi/graphics/lib/GraphicsData.mjs","moduleParts":{"dist/rapid.js":"4e31-1319"},"imported":[],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1320"}]},"4e31-1320":{"id":"node_modules/@pixi/graphics/lib/GraphicsGeometry.mjs","moduleParts":{"dist/rapid.js":"4e31-1321"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1318"},{"uid":"4e31-1296"},{"uid":"4e31-1308"},{"uid":"4e31-1298"},{"uid":"4e31-1312"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1326"}]},"4e31-1322":{"id":"node_modules/@pixi/graphics/lib/styles/FillStyle.mjs","moduleParts":{"dist/rapid.js":"4e31-1323"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1326"},{"uid":"4e31-1324"}]},"4e31-1324":{"id":"node_modules/@pixi/graphics/lib/styles/LineStyle.mjs","moduleParts":{"dist/rapid.js":"4e31-1325"},"imported":[{"uid":"4e31-1304"},{"uid":"4e31-1322"}],"importedBy":[{"uid":"4e31-1316"},{"uid":"4e31-1326"}]},"4e31-1326":{"id":"node_modules/@pixi/graphics/lib/Graphics.mjs","moduleParts":{"dist/rapid.js":"4e31-1327"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1304"},{"uid":"4e31-1320"},{"uid":"4e31-1322"},{"uid":"4e31-1324"},{"uid":"4e31-1296"},{"uid":"4e31-1314"},{"uid":"4e31-1310"},{"uid":"4e31-1306"}],"importedBy":[{"uid":"4e31-1316"}]},"4e31-1328":{"id":"node_modules/@pixi/mesh/lib/MeshBatchUvs.mjs","moduleParts":{"dist/rapid.js":"4e31-1329"},"imported":[],"importedBy":[{"uid":"4e31-1332"},{"uid":"4e31-1330"}]},"4e31-1330":{"id":"node_modules/@pixi/mesh/lib/Mesh.mjs","moduleParts":{"dist/rapid.js":"4e31-1331"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1328"}],"importedBy":[{"uid":"4e31-1332"}]},"4e31-1332":{"id":"node_modules/@pixi/mesh/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1333"},"imported":[{"uid":"4e31-1330"},{"uid":"4e31-1328"},{"uid":"4e31-1334"},{"uid":"4e31-1340"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-2663"},{"uid":"4e31-1344"},{"uid":"4e31-2665"},{"uid":"4e31-2666"},{"uid":"4e31-1346"},{"uid":"4e31-1434"}]},"4e31-1334":{"id":"node_modules/@pixi/mesh/lib/MeshGeometry.mjs","moduleParts":{"dist/rapid.js":"4e31-1335"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1332"}]},"4e31-1336":{"id":"node_modules/@pixi/mesh/lib/shader/mesh.mjs","moduleParts":{"dist/rapid.js":"4e31-1337"},"imported":[],"importedBy":[{"uid":"4e31-1340"}]},"4e31-1338":{"id":"node_modules/@pixi/mesh/lib/shader/mesh2.mjs","moduleParts":{"dist/rapid.js":"4e31-1339"},"imported":[],"importedBy":[{"uid":"4e31-1340"}]},"4e31-1340":{"id":"node_modules/@pixi/mesh/lib/MeshMaterial.mjs","moduleParts":{"dist/rapid.js":"4e31-1341"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1336"},{"uid":"4e31-1338"}],"importedBy":[{"uid":"4e31-1332"}]},"4e31-1342":{"id":"node_modules/@pixi/mesh-extras/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1343"},"imported":[{"uid":"4e31-2663"},{"uid":"4e31-1344"},{"uid":"4e31-2664"},{"uid":"4e31-2665"},{"uid":"4e31-2666"},{"uid":"4e31-1346"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1344":{"id":"node_modules/@pixi/mesh-extras/lib/geometry/RopeGeometry.mjs","moduleParts":{"dist/rapid.js":"4e31-1345"},"imported":[{"uid":"4e31-1332"}],"importedBy":[{"uid":"4e31-1342"},{"uid":"4e31-1346"}]},"4e31-1346":{"id":"node_modules/@pixi/mesh-extras/lib/SimpleRope.mjs","moduleParts":{"dist/rapid.js":"4e31-1347"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1332"},{"uid":"4e31-1344"}],"importedBy":[{"uid":"4e31-1342"}]},"4e31-1348":{"id":"node_modules/@pixi/particle-container/lib/ParticleContainer.mjs","moduleParts":{"dist/rapid.js":"4e31-1349"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"}],"importedBy":[{"uid":"4e31-1350"}]},"4e31-1350":{"id":"node_modules/@pixi/particle-container/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1351"},"imported":[{"uid":"4e31-1348"},{"uid":"4e31-1358"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1352":{"id":"node_modules/@pixi/particle-container/lib/ParticleBuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1353"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1358"}]},"4e31-1354":{"id":"node_modules/@pixi/particle-container/lib/particles.mjs","moduleParts":{"dist/rapid.js":"4e31-1355"},"imported":[],"importedBy":[{"uid":"4e31-1358"}]},"4e31-1356":{"id":"node_modules/@pixi/particle-container/lib/particles2.mjs","moduleParts":{"dist/rapid.js":"4e31-1357"},"imported":[],"importedBy":[{"uid":"4e31-1358"}]},"4e31-1358":{"id":"node_modules/@pixi/particle-container/lib/ParticleRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1359"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1352"},{"uid":"4e31-1354"},{"uid":"4e31-1356"}],"importedBy":[{"uid":"4e31-1350"}]},"4e31-1360":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1361"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1374"}],"importedBy":[{"uid":"4e31-1376"}]},"4e31-1362":{"id":"node_modules/@pixi/text/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-1363"},"imported":[],"importedBy":[{"uid":"4e31-1364"},{"uid":"4e31-1370"},{"uid":"4e31-1368"}]},"4e31-1364":{"id":"node_modules/@pixi/text/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1365"},"imported":[{"uid":"4e31-1362"},{"uid":"4e31-1370"},{"uid":"4e31-1366"},{"uid":"4e31-1368"}],"importedBy":[{"uid":"4e31-1164"},{"uid":"4e31-1374"},{"uid":"4e31-1426"},{"uid":"4e31-1440"},{"uid":"4e31-1438"},{"uid":"4e31-1414"}]},"4e31-1366":{"id":"node_modules/@pixi/text/lib/TextMetrics.mjs","moduleParts":{"dist/rapid.js":"4e31-1367"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1364"},{"uid":"4e31-1370"}]},"4e31-1368":{"id":"node_modules/@pixi/text/lib/TextStyle.mjs","moduleParts":{"dist/rapid.js":"4e31-1369"},"imported":[{"uid":"4e31-1362"},{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1364"},{"uid":"4e31-1370"}]},"4e31-1370":{"id":"node_modules/@pixi/text/lib/Text.mjs","moduleParts":{"dist/rapid.js":"4e31-1371"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1110"},{"uid":"4e31-1362"},{"uid":"4e31-1366"},{"uid":"4e31-1368"}],"importedBy":[{"uid":"4e31-1364"}]},"4e31-1372":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/CountLimiter.mjs","moduleParts":{"dist/rapid.js":"4e31-1373"},"imported":[],"importedBy":[{"uid":"4e31-1376"},{"uid":"4e31-1374"}]},"4e31-1374":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/BasePrepare.mjs","moduleParts":{"dist/rapid.js":"4e31-1375"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1364"},{"uid":"4e31-1372"}],"importedBy":[{"uid":"4e31-1376"},{"uid":"4e31-1360"},{"uid":"4e31-1378"}]},"4e31-1376":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1377"},"imported":[{"uid":"4e31-1360"},{"uid":"4e31-1374"},{"uid":"4e31-1372"},{"uid":"4e31-1378"},{"uid":"4e31-2667"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1378":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/Prepare.mjs","moduleParts":{"dist/rapid.js":"4e31-1379"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1316"},{"uid":"4e31-1374"}],"importedBy":[{"uid":"4e31-1376"}]},"4e31-1380":{"id":"node_modules/@pixi/sprite-animated/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1381"},"imported":[{"uid":"4e31-2668"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1382":{"id":"node_modules/@pixi/sprite-tiling/lib/TilingSprite.mjs","moduleParts":{"dist/rapid.js":"4e31-1383"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1110"}],"importedBy":[{"uid":"4e31-1384"}]},"4e31-1384":{"id":"node_modules/@pixi/sprite-tiling/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1385"},"imported":[{"uid":"4e31-1382"},{"uid":"4e31-1396"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1386":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling.mjs","moduleParts":{"dist/rapid.js":"4e31-1387"},"imported":[],"importedBy":[{"uid":"4e31-1396"}]},"4e31-1388":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling2.mjs","moduleParts":{"dist/rapid.js":"4e31-1389"},"imported":[],"importedBy":[{"uid":"4e31-1396"}]},"4e31-1390":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling-fallback.mjs","moduleParts":{"dist/rapid.js":"4e31-1391"},"imported":[],"importedBy":[{"uid":"4e31-1396"}]},"4e31-1392":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling-fallback2.mjs","moduleParts":{"dist/rapid.js":"4e31-1393"},"imported":[],"importedBy":[{"uid":"4e31-1396"}]},"4e31-1394":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling-simple.mjs","moduleParts":{"dist/rapid.js":"4e31-1395"},"imported":[],"importedBy":[{"uid":"4e31-1396"}]},"4e31-1396":{"id":"node_modules/@pixi/sprite-tiling/lib/TilingSpriteRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1397"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1386"},{"uid":"4e31-1388"},{"uid":"4e31-1390"},{"uid":"4e31-1392"},{"uid":"4e31-1394"}],"importedBy":[{"uid":"4e31-1384"}]},"4e31-1398":{"id":"node_modules/@pixi/spritesheet/lib/Spritesheet.mjs","moduleParts":{"dist/rapid.js":"4e31-1399"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1400"},{"uid":"4e31-1402"}]},"4e31-1400":{"id":"node_modules/@pixi/spritesheet/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1401"},"imported":[{"uid":"4e31-1398"},{"uid":"4e31-1402"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1402":{"id":"node_modules/@pixi/spritesheet/lib/spritesheetAsset.mjs","moduleParts":{"dist/rapid.js":"4e31-1403"},"imported":[{"uid":"4e31-1244"},{"uid":"4e31-1050"},{"uid":"4e31-1398"}],"importedBy":[{"uid":"4e31-1400"}]},"4e31-1404":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapFontData.mjs","moduleParts":{"dist/rapid.js":"4e31-1405"},"imported":[],"importedBy":[{"uid":"4e31-1428"},{"uid":"4e31-1426"},{"uid":"4e31-1406"},{"uid":"4e31-1410"}]},"4e31-1406":{"id":"node_modules/@pixi/text-bitmap/lib/formats/TextFormat.mjs","moduleParts":{"dist/rapid.js":"4e31-1407"},"imported":[{"uid":"4e31-1404"}],"importedBy":[{"uid":"4e31-1428"},{"uid":"4e31-1408"},{"uid":"4e31-1436"}]},"4e31-1408":{"id":"node_modules/@pixi/text-bitmap/lib/formats/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1409"},"imported":[{"uid":"4e31-1406"},{"uid":"4e31-1410"},{"uid":"4e31-1412"}],"importedBy":[{"uid":"4e31-1428"},{"uid":"4e31-1426"},{"uid":"4e31-1436"}]},"4e31-1410":{"id":"node_modules/@pixi/text-bitmap/lib/formats/XMLFormat.mjs","moduleParts":{"dist/rapid.js":"4e31-1411"},"imported":[{"uid":"4e31-1404"}],"importedBy":[{"uid":"4e31-1428"},{"uid":"4e31-1408"},{"uid":"4e31-1412"}]},"4e31-1412":{"id":"node_modules/@pixi/text-bitmap/lib/formats/XMLStringFormat.mjs","moduleParts":{"dist/rapid.js":"4e31-1413"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1410"}],"importedBy":[{"uid":"4e31-1428"},{"uid":"4e31-1408"},{"uid":"4e31-1436"}]},"4e31-1414":{"id":"node_modules/@pixi/text-bitmap/lib/utils/generateFillStyle.mjs","moduleParts":{"dist/rapid.js":"4e31-1415"},"imported":[{"uid":"4e31-1364"}],"importedBy":[{"uid":"4e31-1418"},{"uid":"4e31-1416"}]},"4e31-1416":{"id":"node_modules/@pixi/text-bitmap/lib/utils/drawGlyph.mjs","moduleParts":{"dist/rapid.js":"4e31-1417"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1414"}],"importedBy":[{"uid":"4e31-1426"},{"uid":"4e31-1418"}]},"4e31-1418":{"id":"node_modules/@pixi/text-bitmap/lib/utils/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1419"},"imported":[{"uid":"4e31-1416"},{"uid":"4e31-1420"},{"uid":"4e31-1414"},{"uid":"4e31-1424"},{"uid":"4e31-1422"}],"importedBy":[{"uid":"4e31-1426"},{"uid":"4e31-1434"}]},"4e31-1420":{"id":"node_modules/@pixi/text-bitmap/lib/utils/extractCharCode.mjs","moduleParts":{"dist/rapid.js":"4e31-1421"},"imported":[],"importedBy":[{"uid":"4e31-1426"},{"uid":"4e31-1434"},{"uid":"4e31-1418"}]},"4e31-1422":{"id":"node_modules/@pixi/text-bitmap/lib/utils/splitTextToCharacters.mjs","moduleParts":{"dist/rapid.js":"4e31-1423"},"imported":[],"importedBy":[{"uid":"4e31-1434"},{"uid":"4e31-1418"},{"uid":"4e31-1424"}]},"4e31-1424":{"id":"node_modules/@pixi/text-bitmap/lib/utils/resolveCharacters.mjs","moduleParts":{"dist/rapid.js":"4e31-1425"},"imported":[{"uid":"4e31-1422"}],"importedBy":[{"uid":"4e31-1426"},{"uid":"4e31-1418"}]},"4e31-1426":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapFont.mjs","moduleParts":{"dist/rapid.js":"4e31-1427"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1364"},{"uid":"4e31-1404"},{"uid":"4e31-1408"},{"uid":"4e31-1418"},{"uid":"4e31-1424"},{"uid":"4e31-1416"},{"uid":"4e31-1420"}],"importedBy":[{"uid":"4e31-1428"},{"uid":"4e31-1434"},{"uid":"4e31-1436"}]},"4e31-1428":{"id":"node_modules/@pixi/text-bitmap/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1429"},"imported":[{"uid":"4e31-1426"},{"uid":"4e31-1404"},{"uid":"4e31-1434"},{"uid":"4e31-2669"},{"uid":"4e31-1408"},{"uid":"4e31-1436"},{"uid":"4e31-1406"},{"uid":"4e31-1410"},{"uid":"4e31-1412"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1430":{"id":"node_modules/@pixi/text-bitmap/lib/shader/msdf.mjs","moduleParts":{"dist/rapid.js":"4e31-1431"},"imported":[],"importedBy":[{"uid":"4e31-1434"}]},"4e31-1432":{"id":"node_modules/@pixi/text-bitmap/lib/shader/msdf2.mjs","moduleParts":{"dist/rapid.js":"4e31-1433"},"imported":[],"importedBy":[{"uid":"4e31-1434"}]},"4e31-1434":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapText.mjs","moduleParts":{"dist/rapid.js":"4e31-1435"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1106"},{"uid":"4e31-1332"},{"uid":"4e31-1426"},{"uid":"4e31-1430"},{"uid":"4e31-1432"},{"uid":"4e31-1418"},{"uid":"4e31-1422"},{"uid":"4e31-1420"}],"importedBy":[{"uid":"4e31-1428"}]},"4e31-1436":{"id":"node_modules/@pixi/text-bitmap/lib/loadBitmapFont.mjs","moduleParts":{"dist/rapid.js":"4e31-1437"},"imported":[{"uid":"4e31-1244"},{"uid":"4e31-1050"},{"uid":"4e31-1426"},{"uid":"4e31-1408"},{"uid":"4e31-1406"},{"uid":"4e31-1412"}],"importedBy":[{"uid":"4e31-1428"}]},"4e31-1438":{"id":"node_modules/@pixi/text-html/lib/HTMLTextStyle.mjs","moduleParts":{"dist/rapid.js":"4e31-1439"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1364"}],"importedBy":[{"uid":"4e31-1442"},{"uid":"4e31-1440"}]},"4e31-1440":{"id":"node_modules/@pixi/text-html/lib/HTMLText.mjs","moduleParts":{"dist/rapid.js":"4e31-1441"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1110"},{"uid":"4e31-1364"},{"uid":"4e31-1438"}],"importedBy":[{"uid":"4e31-1442"}]},"4e31-1442":{"id":"node_modules/@pixi/text-html/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1443"},"imported":[{"uid":"4e31-1440"},{"uid":"4e31-1438"}],"importedBy":[{"uid":"4e31-1164"}]},"4e31-1444":{"id":"modules/ui/improveOSM_header.js","moduleParts":{"dist/rapid.js":"4e31-1445"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-2172"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1446"}]},"4e31-1446":{"id":"modules/ui/improveOSM_editor.js","moduleParts":{"dist/rapid.js":"4e31-1447"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-830"},{"uid":"4e31-832"},{"uid":"4e31-1444"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1510"},{"uid":"4e31-2014"}]},"4e31-1448":{"id":"modules/ui/keepRight_details.js","moduleParts":{"dist/rapid.js":"4e31-1449"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-2198"},{"uid":"4e31-674"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1454"}]},"4e31-1450":{"id":"modules/ui/keepRight_header.js","moduleParts":{"dist/rapid.js":"4e31-1451"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1454"}]},"4e31-1452":{"id":"modules/ui/view_on_keepRight.js","moduleParts":{"dist/rapid.js":"4e31-1453"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-512"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1454"}]},"4e31-1454":{"id":"modules/ui/keepRight_editor.js","moduleParts":{"dist/rapid.js":"4e31-1455"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-1448"},{"uid":"4e31-1450"},{"uid":"4e31-1452"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1510"},{"uid":"4e31-2014"}]},"4e31-1456":{"id":"modules/ui/note_comments.js","moduleParts":{"dist/rapid.js":"4e31-1457"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1464"}]},"4e31-1458":{"id":"modules/ui/note_header.js","moduleParts":{"dist/rapid.js":"4e31-1459"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1464"}]},"4e31-1460":{"id":"modules/ui/note_report.js","moduleParts":{"dist/rapid.js":"4e31-1461"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-512"},{"uid":"4e31-2172"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1464"}]},"4e31-1462":{"id":"modules/ui/view_on_osm.js","moduleParts":{"dist/rapid.js":"4e31-1463"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-512"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2012"},{"uid":"4e31-1464"}]},"4e31-1464":{"id":"modules/ui/note_editor.js","moduleParts":{"dist/rapid.js":"4e31-1465"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-1456"},{"uid":"4e31-1458"},{"uid":"4e31-1460"},{"uid":"4e31-1462"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1510"},{"uid":"4e31-2014"}]},"4e31-1466":{"id":"modules/ui/osmose_details.js","moduleParts":{"dist/rapid.js":"4e31-1467"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-2198"},{"uid":"4e31-674"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-1472"}]},"4e31-1468":{"id":"modules/ui/osmose_header.js","moduleParts":{"dist/rapid.js":"4e31-1469"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-2172"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1472"}]},"4e31-1470":{"id":"modules/ui/view_on_osmose.js","moduleParts":{"dist/rapid.js":"4e31-1471"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-512"}],"importedBy":[{"uid":"4e31-1472"}]},"4e31-1472":{"id":"modules/ui/osmose_editor.js","moduleParts":{"dist/rapid.js":"4e31-1473"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-1466"},{"uid":"4e31-1468"},{"uid":"4e31-1470"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-1510"},{"uid":"4e31-2014"}]},"4e31-1474":{"id":"modules/modes/index.js","moduleParts":{"dist/rapid.js":"4e31-1475"},"imported":[{"uid":"4e31-762"},{"uid":"4e31-764"},{"uid":"4e31-766"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-780"},{"uid":"4e31-824"},{"uid":"4e31-1510"},{"uid":"4e31-1476"},{"uid":"4e31-674"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-1508"}]},"4e31-1476":{"id":"modules/modes/drag_note.js","moduleParts":{"dist/rapid.js":"4e31-1477"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-2172"},{"uid":"4e31-612"}],"importedBy":[{"uid":"4e31-1474"}]},"4e31-1478":{"id":"modules/ui/flash.js","moduleParts":{"dist/rapid.js":"4e31-1479"},"imported":[{"uid":"4e31-328"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"},{"uid":"4e31-1508"}]},"4e31-1480":{"id":"modules/ui/intro/helper.js","moduleParts":{"dist/rapid.js":"4e31-1481"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-406"},{"uid":"4e31-616"}],"importedBy":[{"uid":"4e31-1500"},{"uid":"4e31-2074"},{"uid":"4e31-1506"},{"uid":"4e31-2042"},{"uid":"4e31-1504"},{"uid":"4e31-2106"},{"uid":"4e31-1484"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1494"},{"uid":"4e31-1496"},{"uid":"4e31-1498"}]},"4e31-1482":{"id":"modules/ui/intro/UiCurtain.js","moduleParts":{"dist/rapid.js":"4e31-1483"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-384"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-804"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1484":{"id":"modules/ui/intro/welcome.js","moduleParts":{"dist/rapid.js":"4e31-1485"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-172"},{"uid":"4e31-1480"},{"uid":"4e31-498"},{"uid":"4e31-508"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1486":{"id":"modules/ui/intro/navigation.js","moduleParts":{"dist/rapid.js":"4e31-1487"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-508"},{"uid":"4e31-1480"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1488":{"id":"modules/ui/intro/point.js","moduleParts":{"dist/rapid.js":"4e31-1489"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-714"},{"uid":"4e31-674"},{"uid":"4e31-508"},{"uid":"4e31-1480"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1490":{"id":"modules/ui/intro/area.js","moduleParts":{"dist/rapid.js":"4e31-1491"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-172"},{"uid":"4e31-316"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-674"},{"uid":"4e31-508"},{"uid":"4e31-1480"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1492":{"id":"modules/ui/intro/line.js","moduleParts":{"dist/rapid.js":"4e31-1493"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-172"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-674"},{"uid":"4e31-508"},{"uid":"4e31-1480"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1494":{"id":"modules/ui/intro/building.js","moduleParts":{"dist/rapid.js":"4e31-1495"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-714"},{"uid":"4e31-674"},{"uid":"4e31-414"},{"uid":"4e31-1480"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1496":{"id":"modules/ui/intro/start_editing.js","moduleParts":{"dist/rapid.js":"4e31-1497"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-498"},{"uid":"4e31-1480"},{"uid":"4e31-586"},{"uid":"4e31-508"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1498":{"id":"modules/ui/intro/rapid.js","moduleParts":{"dist/rapid.js":"4e31-1499"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-674"},{"uid":"4e31-508"},{"uid":"4e31-1480"}],"importedBy":[{"uid":"4e31-1500"}]},"4e31-1500":{"id":"modules/ui/intro/intro.js","moduleParts":{"dist/rapid.js":"4e31-1501"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-498"},{"uid":"4e31-1480"},{"uid":"4e31-416"},{"uid":"4e31-418"},{"uid":"4e31-408"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-1482"},{"uid":"4e31-1484"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1494"},{"uid":"4e31-1496"},{"uid":"4e31-1498"}],"importedBy":[{"uid":"4e31-1502"},{"uid":"4e31-2074"}]},"4e31-1502":{"id":"modules/ui/intro/index.js","moduleParts":{"dist/rapid.js":"4e31-1503"},"imported":[{"uid":"4e31-1500"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-2108"},{"uid":"4e31-2236"},{"uid":"4e31-1504"}]},"4e31-1504":{"id":"modules/ui/rapid_splash.js","moduleParts":{"dist/rapid.js":"4e31-1505"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-1502"},{"uid":"4e31-1480"},{"uid":"4e31-586"},{"uid":"4e31-416"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"},{"uid":"4e31-1506"}]},"4e31-1506":{"id":"modules/ui/rapid_first_edit_dialog.js","moduleParts":{"dist/rapid.js":"4e31-1507"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-1480"},{"uid":"4e31-586"},{"uid":"4e31-1504"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1508"}]},"4e31-1508":{"id":"modules/ui/rapid_feature_inspector.js","moduleParts":{"dist/rapid.js":"4e31-1509"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-108"},{"uid":"4e31-1474"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-1478"},{"uid":"4e31-792"},{"uid":"4e31-1506"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1510"},{"uid":"4e31-2014"}]},"4e31-1510":{"id":"modules/modes/ModeSelect.js","moduleParts":{"dist/rapid.js":"4e31-1511"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-146"},{"uid":"4e31-406"},{"uid":"4e31-760"},{"uid":"4e31-2172"},{"uid":"4e31-512"},{"uid":"4e31-828"},{"uid":"4e31-1446"},{"uid":"4e31-1454"},{"uid":"4e31-1464"},{"uid":"4e31-1472"},{"uid":"4e31-1508"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-1474"},{"uid":"4e31-2110"}]},"4e31-1512":{"id":"modules/renderer/RendererImagery.js","moduleParts":{"dist/rapid.js":"4e31-1513"},"imported":[{"uid":"4e31-420"},{"uid":"4e31-406"},{"uid":"4e31-26"},{"uid":"4e31-416"},{"uid":"4e31-418"},{"uid":"4e31-1514"}],"importedBy":[{"uid":"4e31-1516"}]},"4e31-1514":{"id":"modules/renderer/RendererImagerySource.js","moduleParts":{"dist/rapid.js":"4e31-1515"},"imported":[{"uid":"4e31-146"},{"uid":"4e31-546"},{"uid":"4e31-110"},{"uid":"4e31-406"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1516"},{"uid":"4e31-1512"},{"uid":"4e31-2064"}]},"4e31-1516":{"id":"modules/renderer/index.js","moduleParts":{"dist/rapid.js":"4e31-1517"},"imported":[{"uid":"4e31-1512"},{"uid":"4e31-1514"},{"uid":"4e31-1940"},{"uid":"4e31-1942"},{"uid":"4e31-1944"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-2110"}]},"4e31-1518":{"id":"modules/pixi/PixiEvents.js","moduleParts":{"dist/rapid.js":"4e31-1519"},"imported":[{"uid":"4e31-420"},{"uid":"4e31-412"},{"uid":"4e31-416"}],"importedBy":[{"uid":"4e31-1936"}]},"4e31-1520":{"id":"node_modules/@rapideditor/pixi-texture-allocator/dist/pixi-texture-allocator.mjs","moduleParts":{"dist/rapid.js":"4e31-1521"},"imported":[{"uid":"4e31-456"},{"uid":"4e31-1050"},{"uid":"4e31-878"}],"importedBy":[{"uid":"4e31-1884"},{"uid":"4e31-1934"},{"uid":"4e31-1908"}]},"4e31-1522":{"id":"node_modules/@pixi/filter-adjustment/dist/filter-adjustment.mjs","moduleParts":{"dist/rapid.js":"4e31-1523"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1524":{"id":"node_modules/pixi-filters/dist/esm/pixi-filters.mjs","moduleParts":{"dist/rapid.js":"4e31-1525"},"imported":[{"uid":"4e31-1522"},{"uid":"4e31-1528"},{"uid":"4e31-1530"},{"uid":"4e31-1532"},{"uid":"4e31-1822"},{"uid":"4e31-1824"},{"uid":"4e31-1826"},{"uid":"4e31-1828"},{"uid":"4e31-1830"},{"uid":"4e31-1832"},{"uid":"4e31-1834"},{"uid":"4e31-1836"},{"uid":"4e31-1838"},{"uid":"4e31-1840"},{"uid":"4e31-1842"},{"uid":"4e31-1844"},{"uid":"4e31-1846"},{"uid":"4e31-1848"},{"uid":"4e31-1850"},{"uid":"4e31-1852"},{"uid":"4e31-1854"},{"uid":"4e31-1526"},{"uid":"4e31-1856"},{"uid":"4e31-1858"},{"uid":"4e31-1860"},{"uid":"4e31-1862"},{"uid":"4e31-1864"},{"uid":"4e31-1866"},{"uid":"4e31-1868"},{"uid":"4e31-1870"},{"uid":"4e31-1872"},{"uid":"4e31-1874"},{"uid":"4e31-1876"},{"uid":"4e31-1878"},{"uid":"4e31-1880"}],"importedBy":[{"uid":"4e31-1884"},{"uid":"4e31-1894"},{"uid":"4e31-1898"},{"uid":"4e31-1902"}]},"4e31-1526":{"id":"node_modules/@pixi/filter-kawase-blur/dist/filter-kawase-blur.mjs","moduleParts":{"dist/rapid.js":"4e31-1527"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"},{"uid":"4e31-1528"},{"uid":"4e31-1842"}]},"4e31-1528":{"id":"node_modules/@pixi/filter-advanced-bloom/dist/filter-advanced-bloom.mjs","moduleParts":{"dist/rapid.js":"4e31-1529"},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1526"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1530":{"id":"node_modules/@pixi/filter-ascii/dist/filter-ascii.mjs","moduleParts":{"dist/rapid.js":"4e31-1531"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1532":{"id":"node_modules/@pixi/filter-bevel/dist/filter-bevel.mjs","moduleParts":{"dist/rapid.js":"4e31-1533"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1534":{"id":"node_modules/pixi-filters/node_modules/@pixi/constants/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1535"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1596"},{"uid":"4e31-1606"},{"uid":"4e31-1672"},{"uid":"4e31-1686"},{"uid":"4e31-1678"},{"uid":"4e31-1710"},{"uid":"4e31-1712"},{"uid":"4e31-1690"},{"uid":"4e31-1716"},{"uid":"4e31-1714"},{"uid":"4e31-1796"},{"uid":"4e31-1600"},{"uid":"4e31-1598"},{"uid":"4e31-1604"},{"uid":"4e31-1718"},{"uid":"4e31-1728"},{"uid":"4e31-1730"},{"uid":"4e31-1804"},{"uid":"4e31-1692"},{"uid":"4e31-1704"},{"uid":"4e31-1652"},{"uid":"4e31-1654"},{"uid":"4e31-1638"},{"uid":"4e31-1582"},{"uid":"4e31-1762"},{"uid":"4e31-1594"},{"uid":"4e31-1768"},{"uid":"4e31-1766"},{"uid":"4e31-1772"},{"uid":"4e31-1694"},{"uid":"4e31-1808"},{"uid":"4e31-1592"},{"uid":"4e31-1814"},{"uid":"4e31-1816"},{"uid":"4e31-1696"},{"uid":"4e31-1558"},{"uid":"4e31-1688"},{"uid":"4e31-1648"},{"uid":"4e31-1640"},{"uid":"4e31-1760"},{"uid":"4e31-1770"}]},"4e31-1536":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/adapter.mjs","moduleParts":{"dist/rapid.js":"4e31-1537"},"imported":[],"importedBy":[{"uid":"4e31-1538"},{"uid":"4e31-1540"}]},"4e31-1538":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1539"},"imported":[{"uid":"4e31-1536"},{"uid":"4e31-2697"},{"uid":"4e31-2698"},{"uid":"4e31-1540"},{"uid":"4e31-1542"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1546"},{"uid":"4e31-1672"},{"uid":"4e31-1686"},{"uid":"4e31-1716"},{"uid":"4e31-1718"},{"uid":"4e31-1734"},{"uid":"4e31-1736"},{"uid":"4e31-1804"},{"uid":"4e31-1638"},{"uid":"4e31-1594"},{"uid":"4e31-1700"},{"uid":"4e31-1776"},{"uid":"4e31-1816"},{"uid":"4e31-1696"},{"uid":"4e31-1818"},{"uid":"4e31-1782"},{"uid":"4e31-1544"},{"uid":"4e31-2699"},{"uid":"4e31-1552"},{"uid":"4e31-2706"},{"uid":"4e31-1574"},{"uid":"4e31-1662"},{"uid":"4e31-1664"}]},"4e31-1540":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1541"},"imported":[{"uid":"4e31-1536"}],"importedBy":[{"uid":"4e31-1538"}]},"4e31-1542":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/utils/isMobile.mjs","moduleParts":{"dist/rapid.js":"4e31-1543"},"imported":[{"uid":"4e31-430"}],"importedBy":[{"uid":"4e31-1538"}]},"4e31-1544":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1545"},"imported":[{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1546"},{"uid":"4e31-1552"},{"uid":"4e31-1574"}]},"4e31-1546":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1547"},"imported":[{"uid":"4e31-1544"},{"uid":"4e31-1538"},{"uid":"4e31-4"},{"uid":"4e31-6"},{"uid":"4e31-1548"},{"uid":"4e31-2699"},{"uid":"4e31-2700"},{"uid":"4e31-1552"},{"uid":"4e31-2701"},{"uid":"4e31-1558"},{"uid":"4e31-2702"},{"uid":"4e31-2703"},{"uid":"4e31-1560"},{"uid":"4e31-2704"},{"uid":"4e31-1562"},{"uid":"4e31-1564"},{"uid":"4e31-2705"},{"uid":"4e31-1566"},{"uid":"4e31-1550"},{"uid":"4e31-1568"},{"uid":"4e31-1570"},{"uid":"4e31-2706"},{"uid":"4e31-2707"},{"uid":"4e31-2708"},{"uid":"4e31-2709"},{"uid":"4e31-1572"},{"uid":"4e31-1574"},{"uid":"4e31-2710"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1672"},{"uid":"4e31-1604"},{"uid":"4e31-1738"},{"uid":"4e31-1804"},{"uid":"4e31-1704"},{"uid":"4e31-1652"},{"uid":"4e31-1594"},{"uid":"4e31-1700"},{"uid":"4e31-1772"},{"uid":"4e31-1764"},{"uid":"4e31-1694"},{"uid":"4e31-1818"},{"uid":"4e31-1782"},{"uid":"4e31-1602"}]},"4e31-1548":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/url.mjs","moduleParts":{"dist/rapid.js":"4e31-1549"},"imported":[{"uid":"4e31-18"}],"importedBy":[{"uid":"4e31-1546"},{"uid":"4e31-1572"}]},"4e31-1550":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/logging/deprecation.mjs","moduleParts":{"dist/rapid.js":"4e31-1551"},"imported":[],"importedBy":[{"uid":"4e31-1546"},{"uid":"4e31-2700"},{"uid":"4e31-2701"},{"uid":"4e31-1558"}]},"4e31-1552":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/browser/isWebGLSupported.mjs","moduleParts":{"dist/rapid.js":"4e31-1553"},"imported":[{"uid":"4e31-1544"},{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1554":{"id":"node_modules/@pixi/color/lib/Color.mjs","moduleParts":{"dist/rapid.js":"4e31-1555"},"imported":[{"uid":"4e31-446"},{"uid":"4e31-448"}],"importedBy":[{"uid":"4e31-1556"}]},"4e31-1556":{"id":"node_modules/@pixi/color/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1557"},"imported":[{"uid":"4e31-1554"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1680"},{"uid":"4e31-1672"},{"uid":"4e31-1692"},{"uid":"4e31-1744"},{"uid":"4e31-2701"},{"uid":"4e31-1558"}]},"4e31-1558":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/color/premultiply.mjs","moduleParts":{"dist/rapid.js":"4e31-1559"},"imported":[{"uid":"4e31-1556"},{"uid":"4e31-1534"},{"uid":"4e31-1550"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1560":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/getBufferType.mjs","moduleParts":{"dist/rapid.js":"4e31-1561"},"imported":[],"importedBy":[{"uid":"4e31-1546"},{"uid":"4e31-2704"}]},"4e31-1562":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/pow2.mjs","moduleParts":{"dist/rapid.js":"4e31-1563"},"imported":[],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1564":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/removeItems.mjs","moduleParts":{"dist/rapid.js":"4e31-1565"},"imported":[],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1566":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/uid.mjs","moduleParts":{"dist/rapid.js":"4e31-1567"},"imported":[],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1568":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/BoundingBox.mjs","moduleParts":{"dist/rapid.js":"4e31-1569"},"imported":[],"importedBy":[{"uid":"4e31-1546"},{"uid":"4e31-2707"}]},"4e31-1570":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/caches.mjs","moduleParts":{"dist/rapid.js":"4e31-1571"},"imported":[],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1572":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/network/determineCrossOrigin.mjs","moduleParts":{"dist/rapid.js":"4e31-1573"},"imported":[{"uid":"4e31-1548"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1574":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/network/getResolutionOfUrl.mjs","moduleParts":{"dist/rapid.js":"4e31-1575"},"imported":[{"uid":"4e31-1544"},{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-1576":{"id":"node_modules/pixi-filters/node_modules/@pixi/extensions/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1577"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1794"},{"uid":"4e31-1680"},{"uid":"4e31-1672"},{"uid":"4e31-1684"},{"uid":"4e31-1686"},{"uid":"4e31-1712"},{"uid":"4e31-1716"},{"uid":"4e31-1796"},{"uid":"4e31-1800"},{"uid":"4e31-1718"},{"uid":"4e31-1730"},{"uid":"4e31-1734"},{"uid":"4e31-1736"},{"uid":"4e31-1738"},{"uid":"4e31-1740"},{"uid":"4e31-1802"},{"uid":"4e31-1804"},{"uid":"4e31-1742"},{"uid":"4e31-1744"},{"uid":"4e31-1756"},{"uid":"4e31-1758"},{"uid":"4e31-1762"},{"uid":"4e31-1766"},{"uid":"4e31-1772"},{"uid":"4e31-1774"},{"uid":"4e31-1776"},{"uid":"4e31-1792"}]},"4e31-1578":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/ViewableBuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1579"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"}]},"4e31-1580":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/checkMaxIfStatementsInShader.mjs","moduleParts":{"dist/rapid.js":"4e31-1581"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"},{"uid":"4e31-1628"}]},"4e31-1582":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/state/State.mjs","moduleParts":{"dist/rapid.js":"4e31-1583"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"},{"uid":"4e31-1678"},{"uid":"4e31-1762"}]},"4e31-1584":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/autoDetectResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1585"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1594"},{"uid":"4e31-1810"},{"uid":"4e31-1806"}]},"4e31-1586":{"id":"node_modules/pixi-filters/node_modules/@pixi/runner/lib/Runner.mjs","moduleParts":{"dist/rapid.js":"4e31-1587"},"imported":[],"importedBy":[{"uid":"4e31-1588"}]},"4e31-1588":{"id":"node_modules/pixi-filters/node_modules/@pixi/runner/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1589"},"imported":[{"uid":"4e31-1586"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1690"},{"uid":"4e31-1598"},{"uid":"4e31-1604"},{"uid":"4e31-1656"},{"uid":"4e31-2689"},{"uid":"4e31-1764"},{"uid":"4e31-1590"}]},"4e31-1590":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/Resource.mjs","moduleParts":{"dist/rapid.js":"4e31-1591"},"imported":[{"uid":"4e31-1588"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1594"},{"uid":"4e31-1810"},{"uid":"4e31-1694"},{"uid":"4e31-1806"},{"uid":"4e31-1592"}]},"4e31-1592":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/BufferResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1593"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1590"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1594"},{"uid":"4e31-1810"},{"uid":"4e31-1688"}]},"4e31-1594":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/BaseTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-1595"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1538"},{"uid":"4e31-1546"},{"uid":"4e31-1584"},{"uid":"4e31-1592"},{"uid":"4e31-1590"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1672"},{"uid":"4e31-1690"},{"uid":"4e31-1692"},{"uid":"4e31-1700"},{"uid":"4e31-1772"},{"uid":"4e31-1806"}]},"4e31-1596":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchDrawCall.mjs","moduleParts":{"dist/rapid.js":"4e31-1597"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"}]},"4e31-1598":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/Buffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1599"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1588"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1606"},{"uid":"4e31-1604"},{"uid":"4e31-1654"},{"uid":"4e31-1708"}]},"4e31-1600":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/Attribute.mjs","moduleParts":{"dist/rapid.js":"4e31-1601"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1604"}]},"4e31-1602":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/utils/interleaveTypedArrays.mjs","moduleParts":{"dist/rapid.js":"4e31-1603"},"imported":[{"uid":"4e31-1546"}],"importedBy":[{"uid":"4e31-1604"}]},"4e31-1604":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/Geometry.mjs","moduleParts":{"dist/rapid.js":"4e31-1605"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1588"},{"uid":"4e31-1546"},{"uid":"4e31-1600"},{"uid":"4e31-1598"},{"uid":"4e31-1602"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1606"},{"uid":"4e31-1706"},{"uid":"4e31-1708"}]},"4e31-1606":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchGeometry.mjs","moduleParts":{"dist/rapid.js":"4e31-1607"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1598"},{"uid":"4e31-1604"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"}]},"4e31-1608":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-1609"},"imported":[],"importedBy":[{"uid":"4e31-1614"},{"uid":"4e31-2691"},{"uid":"4e31-2692"},{"uid":"4e31-2693"},{"uid":"4e31-1612"},{"uid":"4e31-2694"},{"uid":"4e31-1616"}]},"4e31-1610":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/Point.mjs","moduleParts":{"dist/rapid.js":"4e31-1611"},"imported":[],"importedBy":[{"uid":"4e31-1614"},{"uid":"4e31-1612"},{"uid":"4e31-1616"}]},"4e31-1612":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Rectangle.mjs","moduleParts":{"dist/rapid.js":"4e31-1613"},"imported":[{"uid":"4e31-1608"},{"uid":"4e31-1610"}],"importedBy":[{"uid":"4e31-1614"},{"uid":"4e31-2691"},{"uid":"4e31-2692"}]},"4e31-1614":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1615"},"imported":[{"uid":"4e31-2691"},{"uid":"4e31-2692"},{"uid":"4e31-2693"},{"uid":"4e31-1612"},{"uid":"4e31-2694"},{"uid":"4e31-1618"},{"uid":"4e31-2695"},{"uid":"4e31-2696"},{"uid":"4e31-1616"},{"uid":"4e31-1620"},{"uid":"4e31-1610"},{"uid":"4e31-1622"},{"uid":"4e31-1608"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1658"},{"uid":"4e31-1710"},{"uid":"4e31-1712"},{"uid":"4e31-1726"},{"uid":"4e31-1716"},{"uid":"4e31-1734"},{"uid":"4e31-1740"},{"uid":"4e31-1804"},{"uid":"4e31-1742"},{"uid":"4e31-1744"},{"uid":"4e31-1700"},{"uid":"4e31-1720"},{"uid":"4e31-1698"},{"uid":"4e31-1776"}]},"4e31-1616":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/Matrix.mjs","moduleParts":{"dist/rapid.js":"4e31-1617"},"imported":[{"uid":"4e31-1608"},{"uid":"4e31-1610"}],"importedBy":[{"uid":"4e31-1614"},{"uid":"4e31-1618"},{"uid":"4e31-1622"}]},"4e31-1618":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/groupD8.mjs","moduleParts":{"dist/rapid.js":"4e31-1619"},"imported":[{"uid":"4e31-1616"}],"importedBy":[{"uid":"4e31-1614"}]},"4e31-1620":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/ObservablePoint.mjs","moduleParts":{"dist/rapid.js":"4e31-1621"},"imported":[],"importedBy":[{"uid":"4e31-1614"},{"uid":"4e31-1622"}]},"4e31-1622":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/Transform.mjs","moduleParts":{"dist/rapid.js":"4e31-1623"},"imported":[{"uid":"4e31-1616"},{"uid":"4e31-1620"}],"importedBy":[{"uid":"4e31-1614"}]},"4e31-1624":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/defaultProgram.mjs","moduleParts":{"dist/rapid.js":"4e31-1625"},"imported":[],"importedBy":[{"uid":"4e31-1652"}]},"4e31-1626":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/defaultProgram2.mjs","moduleParts":{"dist/rapid.js":"4e31-1627"},"imported":[],"importedBy":[{"uid":"4e31-1652"}]},"4e31-1628":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1629"},"imported":[{"uid":"4e31-1580"},{"uid":"4e31-1630"},{"uid":"4e31-1632"},{"uid":"4e31-1636"},{"uid":"4e31-1640"},{"uid":"4e31-1638"},{"uid":"4e31-1642"},{"uid":"4e31-1644"},{"uid":"4e31-1646"},{"uid":"4e31-1648"},{"uid":"4e31-1634"},{"uid":"4e31-1650"}],"importedBy":[{"uid":"4e31-1652"},{"uid":"4e31-1756"},{"uid":"4e31-1754"}]},"4e31-1630":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/compileShader.mjs","moduleParts":{"dist/rapid.js":"4e31-1631"},"imported":[],"importedBy":[{"uid":"4e31-1752"},{"uid":"4e31-1628"}]},"4e31-1632":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/defaultValue.mjs","moduleParts":{"dist/rapid.js":"4e31-1633"},"imported":[],"importedBy":[{"uid":"4e31-1752"},{"uid":"4e31-1628"},{"uid":"4e31-1750"}]},"4e31-1634":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/uniformParsers.mjs","moduleParts":{"dist/rapid.js":"4e31-1635"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1754"},{"uid":"4e31-1628"},{"uid":"4e31-1636"}]},"4e31-1636":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/generateUniformsSync.mjs","moduleParts":{"dist/rapid.js":"4e31-1637"},"imported":[{"uid":"4e31-1634"}],"importedBy":[{"uid":"4e31-1756"},{"uid":"4e31-1628"}]},"4e31-1638":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getTestContext.mjs","moduleParts":{"dist/rapid.js":"4e31-1639"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1628"},{"uid":"4e31-1640"}]},"4e31-1640":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getMaxFragmentPrecision.mjs","moduleParts":{"dist/rapid.js":"4e31-1641"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1638"}],"importedBy":[{"uid":"4e31-1652"},{"uid":"4e31-1628"}]},"4e31-1642":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/logProgramError.mjs","moduleParts":{"dist/rapid.js":"4e31-1643"},"imported":[],"importedBy":[{"uid":"4e31-1752"},{"uid":"4e31-1628"}]},"4e31-1644":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/mapSize.mjs","moduleParts":{"dist/rapid.js":"4e31-1645"},"imported":[],"importedBy":[{"uid":"4e31-1754"},{"uid":"4e31-1628"},{"uid":"4e31-1748"}]},"4e31-1646":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/mapType.mjs","moduleParts":{"dist/rapid.js":"4e31-1647"},"imported":[],"importedBy":[{"uid":"4e31-1628"},{"uid":"4e31-1748"},{"uid":"4e31-1750"}]},"4e31-1648":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/setPrecision.mjs","moduleParts":{"dist/rapid.js":"4e31-1649"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1652"},{"uid":"4e31-1628"}]},"4e31-1650":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/unsafeEvalSupported.mjs","moduleParts":{"dist/rapid.js":"4e31-1651"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1756"},{"uid":"4e31-1628"}]},"4e31-1652":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/Program.mjs","moduleParts":{"dist/rapid.js":"4e31-1653"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1546"},{"uid":"4e31-1624"},{"uid":"4e31-1626"},{"uid":"4e31-1628"},{"uid":"4e31-1648"},{"uid":"4e31-1640"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1658"},{"uid":"4e31-1678"},{"uid":"4e31-1656"}]},"4e31-1654":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/UniformGroup.mjs","moduleParts":{"dist/rapid.js":"4e31-1655"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1598"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1658"},{"uid":"4e31-1712"},{"uid":"4e31-1804"},{"uid":"4e31-1656"}]},"4e31-1656":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/Shader.mjs","moduleParts":{"dist/rapid.js":"4e31-1657"},"imported":[{"uid":"4e31-1588"},{"uid":"4e31-1652"},{"uid":"4e31-1654"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1658"},{"uid":"4e31-1678"}]},"4e31-1658":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchShaderGenerator.mjs","moduleParts":{"dist/rapid.js":"4e31-1659"},"imported":[{"uid":"4e31-1614"},{"uid":"4e31-1652"},{"uid":"4e31-1656"},{"uid":"4e31-1654"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"}]},"4e31-1660":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchTextureArray.mjs","moduleParts":{"dist/rapid.js":"4e31-1661"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"}]},"4e31-1662":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/canUploadSameBuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1663"},"imported":[{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1672"}]},"4e31-1664":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/maxRecommendedTextures.mjs","moduleParts":{"dist/rapid.js":"4e31-1665"},"imported":[{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1672"}]},"4e31-1666":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/ObjectRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1667"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1672"},{"uid":"4e31-1684"}]},"4e31-1668":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/texture.mjs","moduleParts":{"dist/rapid.js":"4e31-1669"},"imported":[],"importedBy":[{"uid":"4e31-1672"}]},"4e31-1670":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/texture2.mjs","moduleParts":{"dist/rapid.js":"4e31-1671"},"imported":[],"importedBy":[{"uid":"4e31-1672"}]},"4e31-1672":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1673"},"imported":[{"uid":"4e31-1556"},{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1538"},{"uid":"4e31-1546"},{"uid":"4e31-1578"},{"uid":"4e31-1580"},{"uid":"4e31-1582"},{"uid":"4e31-1594"},{"uid":"4e31-1596"},{"uid":"4e31-1606"},{"uid":"4e31-1658"},{"uid":"4e31-1660"},{"uid":"4e31-1662"},{"uid":"4e31-1664"},{"uid":"4e31-1666"},{"uid":"4e31-1668"},{"uid":"4e31-1670"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"}]},"4e31-1674":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/defaultFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1675"},"imported":[],"importedBy":[{"uid":"4e31-1678"}]},"4e31-1676":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/defaultFilter2.mjs","moduleParts":{"dist/rapid.js":"4e31-1677"},"imported":[],"importedBy":[{"uid":"4e31-1678"}]},"4e31-1678":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/Filter.mjs","moduleParts":{"dist/rapid.js":"4e31-1679"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1652"},{"uid":"4e31-1656"},{"uid":"4e31-1582"},{"uid":"4e31-1674"},{"uid":"4e31-1676"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1726"},{"uid":"4e31-1728"}]},"4e31-1680":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/background/BackgroundSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1681"},"imported":[{"uid":"4e31-1556"},{"uid":"4e31-1576"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1682"}]},"4e31-1682":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/systems.mjs","moduleParts":{"dist/rapid.js":"4e31-1683"},"imported":[{"uid":"4e31-1680"},{"uid":"4e31-1684"},{"uid":"4e31-1686"},{"uid":"4e31-1712"},{"uid":"4e31-1716"},{"uid":"4e31-1718"},{"uid":"4e31-1730"},{"uid":"4e31-1734"},{"uid":"4e31-1736"},{"uid":"4e31-1738"},{"uid":"4e31-1740"},{"uid":"4e31-1742"},{"uid":"4e31-1744"},{"uid":"4e31-1756"},{"uid":"4e31-1758"},{"uid":"4e31-1762"},{"uid":"4e31-1764"},{"uid":"4e31-1766"},{"uid":"4e31-1772"},{"uid":"4e31-1774"},{"uid":"4e31-1776"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"}]},"4e31-1684":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1685"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1666"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1686":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/context/ContextSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1687"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1682"}]},"4e31-1688":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/DepthResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1689"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1592"}],"importedBy":[{"uid":"4e31-1690"}]},"4e31-1690":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/Framebuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1691"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1588"},{"uid":"4e31-1594"},{"uid":"4e31-1688"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1716"},{"uid":"4e31-1692"}]},"4e31-1692":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/BaseRenderTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-1693"},"imported":[{"uid":"4e31-1556"},{"uid":"4e31-1534"},{"uid":"4e31-1690"},{"uid":"4e31-1594"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1702"},{"uid":"4e31-1704"}]},"4e31-1694":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/BaseImageResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1695"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1546"},{"uid":"4e31-1590"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"},{"uid":"4e31-1812"},{"uid":"4e31-1816"},{"uid":"4e31-1696"},{"uid":"4e31-1818"},{"uid":"4e31-1820"}]},"4e31-1696":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/ImageResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1697"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1538"},{"uid":"4e31-1694"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"},{"uid":"4e31-1700"}]},"4e31-1698":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureUvs.mjs","moduleParts":{"dist/rapid.js":"4e31-1699"},"imported":[{"uid":"4e31-1614"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1700"}]},"4e31-1700":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/Texture.mjs","moduleParts":{"dist/rapid.js":"4e31-1701"},"imported":[{"uid":"4e31-1614"},{"uid":"4e31-1538"},{"uid":"4e31-1546"},{"uid":"4e31-1594"},{"uid":"4e31-1696"},{"uid":"4e31-1698"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1702"}]},"4e31-1702":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/RenderTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-1703"},"imported":[{"uid":"4e31-1700"},{"uid":"4e31-1692"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1742"},{"uid":"4e31-1704"}]},"4e31-1704":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/RenderTexturePool.mjs","moduleParts":{"dist/rapid.js":"4e31-1705"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1546"},{"uid":"4e31-1692"},{"uid":"4e31-1702"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1712"}]},"4e31-1706":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/utils/Quad.mjs","moduleParts":{"dist/rapid.js":"4e31-1707"},"imported":[{"uid":"4e31-1604"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1712"}]},"4e31-1708":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/utils/QuadUv.mjs","moduleParts":{"dist/rapid.js":"4e31-1709"},"imported":[{"uid":"4e31-1598"},{"uid":"4e31-1604"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1712"}]},"4e31-1710":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/FilterState.mjs","moduleParts":{"dist/rapid.js":"4e31-1711"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1614"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1712"}]},"4e31-1712":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/FilterSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1713"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1614"},{"uid":"4e31-1704"},{"uid":"4e31-1654"},{"uid":"4e31-1706"},{"uid":"4e31-1708"},{"uid":"4e31-1710"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1714":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/GLFramebuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1715"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1716"}]},"4e31-1716":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/FramebufferSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1717"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1614"},{"uid":"4e31-1538"},{"uid":"4e31-1690"},{"uid":"4e31-1714"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1718":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/GeometrySystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1719"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1720":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureMatrix.mjs","moduleParts":{"dist/rapid.js":"4e31-1721"},"imported":[{"uid":"4e31-1614"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1726"}]},"4e31-1722":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter2.mjs","moduleParts":{"dist/rapid.js":"4e31-1723"},"imported":[],"importedBy":[{"uid":"4e31-1726"}]},"4e31-1724":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter3.mjs","moduleParts":{"dist/rapid.js":"4e31-1725"},"imported":[],"importedBy":[{"uid":"4e31-1726"}]},"4e31-1726":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/spriteMask/SpriteMaskFilter.mjs","moduleParts":{"dist/rapid.js":"4e31-1727"},"imported":[{"uid":"4e31-1614"},{"uid":"4e31-1720"},{"uid":"4e31-1678"},{"uid":"4e31-1722"},{"uid":"4e31-1724"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1730"}]},"4e31-1728":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/MaskData.mjs","moduleParts":{"dist/rapid.js":"4e31-1729"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1678"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1730"}]},"4e31-1730":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/MaskSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1731"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1726"},{"uid":"4e31-1728"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1732":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/AbstractMaskSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1733"},"imported":[],"importedBy":[{"uid":"4e31-1734"},{"uid":"4e31-1736"}]},"4e31-1734":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/ScissorSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1735"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1614"},{"uid":"4e31-1538"},{"uid":"4e31-1732"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1736":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/StencilSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1737"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1538"},{"uid":"4e31-1732"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1738":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/plugin/PluginSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1739"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1546"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1740":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/projection/ProjectionSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1741"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1614"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1742":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/GenerateTextureSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1743"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1614"},{"uid":"4e31-1702"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1744":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/RenderTextureSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1745"},"imported":[{"uid":"4e31-1556"},{"uid":"4e31-1576"},{"uid":"4e31-1614"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1746":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/GLProgram.mjs","moduleParts":{"dist/rapid.js":"4e31-1747"},"imported":[],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1752"}]},"4e31-1748":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getAttributeData.mjs","moduleParts":{"dist/rapid.js":"4e31-1749"},"imported":[{"uid":"4e31-1644"},{"uid":"4e31-1646"}],"importedBy":[{"uid":"4e31-1752"}]},"4e31-1750":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getUniformData.mjs","moduleParts":{"dist/rapid.js":"4e31-1751"},"imported":[{"uid":"4e31-1632"},{"uid":"4e31-1646"}],"importedBy":[{"uid":"4e31-1752"}]},"4e31-1752":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/generateProgram.mjs","moduleParts":{"dist/rapid.js":"4e31-1753"},"imported":[{"uid":"4e31-1746"},{"uid":"4e31-1630"},{"uid":"4e31-1632"},{"uid":"4e31-1748"},{"uid":"4e31-1750"},{"uid":"4e31-1642"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1756"}]},"4e31-1754":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/generateUniformBufferSync.mjs","moduleParts":{"dist/rapid.js":"4e31-1755"},"imported":[{"uid":"4e31-1628"},{"uid":"4e31-1634"},{"uid":"4e31-1644"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1756"}]},"4e31-1756":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/ShaderSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1757"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1628"},{"uid":"4e31-1752"},{"uid":"4e31-1754"},{"uid":"4e31-1650"},{"uid":"4e31-1636"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1758":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/startup/StartupSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1759"},"imported":[{"uid":"4e31-1576"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1682"}]},"4e31-1760":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/state/utils/mapWebGLBlendModesToPixi.mjs","moduleParts":{"dist/rapid.js":"4e31-1761"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1762"}]},"4e31-1762":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/state/StateSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1763"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1582"},{"uid":"4e31-1760"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1764":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/system/SystemManager.mjs","moduleParts":{"dist/rapid.js":"4e31-1765"},"imported":[{"uid":"4e31-1588"},{"uid":"4e31-1546"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1804"},{"uid":"4e31-1682"}]},"4e31-1766":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureGCSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1767"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1682"}]},"4e31-1768":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/GLTexture.mjs","moduleParts":{"dist/rapid.js":"4e31-1769"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1772"}]},"4e31-1770":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/utils/mapTypeAndFormatToInternalFormat.mjs","moduleParts":{"dist/rapid.js":"4e31-1771"},"imported":[{"uid":"4e31-1534"}],"importedBy":[{"uid":"4e31-1772"}]},"4e31-1772":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1773"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1546"},{"uid":"4e31-1594"},{"uid":"4e31-1768"},{"uid":"4e31-1770"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1774":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/transformFeedback/TransformFeedbackSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1775"},"imported":[{"uid":"4e31-1576"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1682"}]},"4e31-1776":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/view/ViewSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1777"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1614"},{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1778"},{"uid":"4e31-1682"}]},"4e31-1778":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1779"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1538"},{"uid":"4e31-1546"},{"uid":"4e31-1672"},{"uid":"4e31-1678"},{"uid":"4e31-1652"},{"uid":"4e31-1682"},{"uid":"4e31-1594"},{"uid":"4e31-1686"},{"uid":"4e31-1680"},{"uid":"4e31-1776"},{"uid":"4e31-1758"},{"uid":"4e31-1766"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-1780":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1781"},"imported":[{"uid":"4e31-1778"},{"uid":"4e31-1556"},{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1614"},{"uid":"4e31-1588"},{"uid":"4e31-1538"},{"uid":"4e31-1790"},{"uid":"4e31-1546"},{"uid":"4e31-1794"},{"uid":"4e31-1680"},{"uid":"4e31-1596"},{"uid":"4e31-1606"},{"uid":"4e31-1672"},{"uid":"4e31-1658"},{"uid":"4e31-1684"},{"uid":"4e31-1660"},{"uid":"4e31-1666"},{"uid":"4e31-1686"},{"uid":"4e31-1678"},{"uid":"4e31-1710"},{"uid":"4e31-1712"},{"uid":"4e31-2685"},{"uid":"4e31-1726"},{"uid":"4e31-2686"},{"uid":"4e31-1690"},{"uid":"4e31-1716"},{"uid":"4e31-1714"},{"uid":"4e31-1796"},{"uid":"4e31-1600"},{"uid":"4e31-1598"},{"uid":"4e31-1800"},{"uid":"4e31-1604"},{"uid":"4e31-1718"},{"uid":"4e31-1578"},{"uid":"4e31-2687"},{"uid":"4e31-1728"},{"uid":"4e31-1730"},{"uid":"4e31-1734"},{"uid":"4e31-1736"},{"uid":"4e31-1738"},{"uid":"4e31-1740"},{"uid":"4e31-1802"},{"uid":"4e31-1804"},{"uid":"4e31-1692"},{"uid":"4e31-1742"},{"uid":"4e31-1702"},{"uid":"4e31-1704"},{"uid":"4e31-1744"},{"uid":"4e31-1746"},{"uid":"4e31-1652"},{"uid":"4e31-1656"},{"uid":"4e31-1756"},{"uid":"4e31-1654"},{"uid":"4e31-1580"},{"uid":"4e31-1752"},{"uid":"4e31-1754"},{"uid":"4e31-1638"},{"uid":"4e31-1634"},{"uid":"4e31-1650"},{"uid":"4e31-1758"},{"uid":"4e31-1582"},{"uid":"4e31-1762"},{"uid":"4e31-2688"},{"uid":"4e31-1682"},{"uid":"4e31-1594"},{"uid":"4e31-1768"},{"uid":"4e31-1810"},{"uid":"4e31-1700"},{"uid":"4e31-1766"},{"uid":"4e31-1720"},{"uid":"4e31-1772"},{"uid":"4e31-1698"},{"uid":"4e31-2689"},{"uid":"4e31-1774"},{"uid":"4e31-1706"},{"uid":"4e31-1708"},{"uid":"4e31-1776"},{"uid":"4e31-1764"},{"uid":"4e31-1694"},{"uid":"4e31-1590"},{"uid":"4e31-1806"},{"uid":"4e31-1808"},{"uid":"4e31-1584"},{"uid":"4e31-1592"},{"uid":"4e31-1812"},{"uid":"4e31-1814"},{"uid":"4e31-1816"},{"uid":"4e31-1696"},{"uid":"4e31-1818"},{"uid":"4e31-1820"}],"importedBy":[{"uid":"4e31-1822"}]},"4e31-1782":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/settings.mjs","moduleParts":{"dist/rapid.js":"4e31-1783"},"imported":[{"uid":"4e31-1538"},{"uid":"4e31-1546"},{"uid":"4e31-1788"}],"importedBy":[{"uid":"4e31-1790"}]},"4e31-1784":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/const.mjs","moduleParts":{"dist/rapid.js":"4e31-1785"},"imported":[],"importedBy":[{"uid":"4e31-1790"},{"uid":"4e31-1788"},{"uid":"4e31-1792"}]},"4e31-1786":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/TickerListener.mjs","moduleParts":{"dist/rapid.js":"4e31-1787"},"imported":[],"importedBy":[{"uid":"4e31-1788"}]},"4e31-1788":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/Ticker.mjs","moduleParts":{"dist/rapid.js":"4e31-1789"},"imported":[{"uid":"4e31-1784"},{"uid":"4e31-1786"}],"importedBy":[{"uid":"4e31-1790"},{"uid":"4e31-1782"},{"uid":"4e31-1792"}]},"4e31-1790":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1791"},"imported":[{"uid":"4e31-1782"},{"uid":"4e31-1784"},{"uid":"4e31-1788"},{"uid":"4e31-1792"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1820"}]},"4e31-1792":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/TickerPlugin.mjs","moduleParts":{"dist/rapid.js":"4e31-1793"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1784"},{"uid":"4e31-1788"}],"importedBy":[{"uid":"4e31-1790"}]},"4e31-1794":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/autoDetectRenderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1795"},"imported":[{"uid":"4e31-1576"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-1796":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/MultisampleSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1797"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-1798":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/GLBuffer.mjs","moduleParts":{"dist/rapid.js":"4e31-1799"},"imported":[],"importedBy":[{"uid":"4e31-1800"}]},"4e31-1800":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/BufferSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1801"},"imported":[{"uid":"4e31-1576"},{"uid":"4e31-1798"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-1802":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/render/ObjectRendererSystem.mjs","moduleParts":{"dist/rapid.js":"4e31-1803"},"imported":[{"uid":"4e31-1576"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-1804":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/Renderer.mjs","moduleParts":{"dist/rapid.js":"4e31-1805"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1576"},{"uid":"4e31-1614"},{"uid":"4e31-1538"},{"uid":"4e31-1546"},{"uid":"4e31-1654"},{"uid":"4e31-1764"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-1806":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/AbstractMultiResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1807"},"imported":[{"uid":"4e31-1594"},{"uid":"4e31-1584"},{"uid":"4e31-1590"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"},{"uid":"4e31-1808"},{"uid":"4e31-1814"}]},"4e31-1808":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/ArrayResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1809"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1806"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"}]},"4e31-1810":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/index.mjs","moduleParts":{"dist/rapid.js":"4e31-1811"},"imported":[{"uid":"4e31-1808"},{"uid":"4e31-1584"},{"uid":"4e31-1592"},{"uid":"4e31-1812"},{"uid":"4e31-1814"},{"uid":"4e31-1816"},{"uid":"4e31-1696"},{"uid":"4e31-1818"},{"uid":"4e31-1820"},{"uid":"4e31-1694"},{"uid":"4e31-1590"},{"uid":"4e31-1806"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-1812":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/CanvasResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1813"},"imported":[{"uid":"4e31-1694"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"}]},"4e31-1814":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/CubeResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1815"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1806"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"}]},"4e31-1816":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/ImageBitmapResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1817"},"imported":[{"uid":"4e31-1534"},{"uid":"4e31-1538"},{"uid":"4e31-1694"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"}]},"4e31-1818":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/SVGResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1819"},"imported":[{"uid":"4e31-1538"},{"uid":"4e31-1546"},{"uid":"4e31-1694"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"}]},"4e31-1820":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/VideoResource.mjs","moduleParts":{"dist/rapid.js":"4e31-1821"},"imported":[{"uid":"4e31-1790"},{"uid":"4e31-1694"}],"importedBy":[{"uid":"4e31-1780"},{"uid":"4e31-1810"}]},"4e31-1822":{"id":"node_modules/pixi-filters/node_modules/@pixi/filter-bloom/dist/filter-bloom.mjs","moduleParts":{"dist/rapid.js":"4e31-1823"},"imported":[{"uid":"4e31-1780"},{"uid":"4e31-1122"},{"uid":"4e31-1132"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1824":{"id":"node_modules/@pixi/filter-bulge-pinch/dist/filter-bulge-pinch.mjs","moduleParts":{"dist/rapid.js":"4e31-1825"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1826":{"id":"node_modules/@pixi/filter-color-gradient/dist/filter-color-gradient.mjs","moduleParts":{"dist/rapid.js":"4e31-1827"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1828":{"id":"node_modules/@pixi/filter-color-map/dist/filter-color-map.mjs","moduleParts":{"dist/rapid.js":"4e31-1829"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1830":{"id":"node_modules/@pixi/filter-color-overlay/dist/filter-color-overlay.mjs","moduleParts":{"dist/rapid.js":"4e31-1831"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1832":{"id":"node_modules/@pixi/filter-color-replace/dist/filter-color-replace.mjs","moduleParts":{"dist/rapid.js":"4e31-1833"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1834":{"id":"node_modules/@pixi/filter-convolution/dist/filter-convolution.mjs","moduleParts":{"dist/rapid.js":"4e31-1835"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1836":{"id":"node_modules/@pixi/filter-cross-hatch/dist/filter-cross-hatch.mjs","moduleParts":{"dist/rapid.js":"4e31-1837"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1838":{"id":"node_modules/@pixi/filter-crt/dist/filter-crt.mjs","moduleParts":{"dist/rapid.js":"4e31-1839"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1840":{"id":"node_modules/@pixi/filter-dot/dist/filter-dot.mjs","moduleParts":{"dist/rapid.js":"4e31-1841"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1842":{"id":"node_modules/@pixi/filter-drop-shadow/dist/filter-drop-shadow.mjs","moduleParts":{"dist/rapid.js":"4e31-1843"},"imported":[{"uid":"4e31-1526"},{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1844":{"id":"node_modules/@pixi/filter-emboss/dist/filter-emboss.mjs","moduleParts":{"dist/rapid.js":"4e31-1845"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1846":{"id":"node_modules/@pixi/filter-glitch/dist/filter-glitch.mjs","moduleParts":{"dist/rapid.js":"4e31-1847"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1848":{"id":"node_modules/@pixi/filter-glow/dist/filter-glow.mjs","moduleParts":{"dist/rapid.js":"4e31-1849"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1850":{"id":"node_modules/@pixi/filter-godray/dist/filter-godray.mjs","moduleParts":{"dist/rapid.js":"4e31-1851"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1852":{"id":"node_modules/@pixi/filter-grayscale/dist/filter-grayscale.mjs","moduleParts":{"dist/rapid.js":"4e31-1853"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1854":{"id":"node_modules/@pixi/filter-hsl-adjustment/dist/filter-hsl-adjustment.mjs","moduleParts":{"dist/rapid.js":"4e31-1855"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1856":{"id":"node_modules/@pixi/filter-motion-blur/dist/filter-motion-blur.mjs","moduleParts":{"dist/rapid.js":"4e31-1857"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1858":{"id":"node_modules/@pixi/filter-multi-color-replace/dist/filter-multi-color-replace.mjs","moduleParts":{"dist/rapid.js":"4e31-1859"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1860":{"id":"node_modules/@pixi/filter-old-film/dist/filter-old-film.mjs","moduleParts":{"dist/rapid.js":"4e31-1861"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1862":{"id":"node_modules/@pixi/filter-outline/dist/filter-outline.mjs","moduleParts":{"dist/rapid.js":"4e31-1863"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1864":{"id":"node_modules/@pixi/filter-pixelate/dist/filter-pixelate.mjs","moduleParts":{"dist/rapid.js":"4e31-1865"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1866":{"id":"node_modules/@pixi/filter-radial-blur/dist/filter-radial-blur.mjs","moduleParts":{"dist/rapid.js":"4e31-1867"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1868":{"id":"node_modules/@pixi/filter-reflection/dist/filter-reflection.mjs","moduleParts":{"dist/rapid.js":"4e31-1869"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1870":{"id":"node_modules/@pixi/filter-rgb-split/dist/filter-rgb-split.mjs","moduleParts":{"dist/rapid.js":"4e31-1871"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1872":{"id":"node_modules/@pixi/filter-shockwave/dist/filter-shockwave.mjs","moduleParts":{"dist/rapid.js":"4e31-1873"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1874":{"id":"node_modules/@pixi/filter-simple-lightmap/dist/filter-simple-lightmap.mjs","moduleParts":{"dist/rapid.js":"4e31-1875"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1876":{"id":"node_modules/@pixi/filter-tilt-shift/dist/filter-tilt-shift.mjs","moduleParts":{"dist/rapid.js":"4e31-1877"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1878":{"id":"node_modules/@pixi/filter-twist/dist/filter-twist.mjs","moduleParts":{"dist/rapid.js":"4e31-1879"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1880":{"id":"node_modules/@pixi/filter-zoom-blur/dist/filter-zoom-blur.mjs","moduleParts":{"dist/rapid.js":"4e31-1881"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1524"}]},"4e31-1882":{"id":"modules/pixi/AbstractLayer.js","moduleParts":{"dist/rapid.js":"4e31-1883"},"imported":[],"importedBy":[{"uid":"4e31-1884"},{"uid":"4e31-1896"},{"uid":"4e31-1900"},{"uid":"4e31-1904"},{"uid":"4e31-1906"},{"uid":"4e31-1908"},{"uid":"4e31-1910"},{"uid":"4e31-1912"},{"uid":"4e31-1914"},{"uid":"4e31-1916"},{"uid":"4e31-1920"},{"uid":"4e31-1922"},{"uid":"4e31-1924"},{"uid":"4e31-1926"},{"uid":"4e31-1928"},{"uid":"4e31-1930"}]},"4e31-1884":{"id":"modules/pixi/PixiLayerBackgroundTiles.js","moduleParts":{"dist/rapid.js":"4e31-1885"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-316"},{"uid":"4e31-1520"},{"uid":"4e31-1524"},{"uid":"4e31-406"},{"uid":"4e31-1882"}],"importedBy":[{"uid":"4e31-1978"},{"uid":"4e31-1932"}]},"4e31-1886":{"id":"node_modules/@rapideditor/pixi-dashed-line/dist/pixi-dashed-line.mjs","moduleParts":{"dist/rapid.js":"4e31-1887"},"imported":[{"uid":"4e31-1050"}],"importedBy":[{"uid":"4e31-1926"},{"uid":"4e31-1894"},{"uid":"4e31-1898"},{"uid":"4e31-1902"}]},"4e31-1888":{"id":"modules/pixi/PixiGeometry.js","moduleParts":{"dist/rapid.js":"4e31-1889"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-162"},{"uid":"4e31-58"}],"importedBy":[{"uid":"4e31-1890"}]},"4e31-1890":{"id":"modules/pixi/AbstractFeature.js","moduleParts":{"dist/rapid.js":"4e31-1891"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-1888"}],"importedBy":[{"uid":"4e31-1894"},{"uid":"4e31-1898"},{"uid":"4e31-1902"}]},"4e31-1892":{"id":"modules/pixi/helpers.js","moduleParts":{"dist/rapid.js":"4e31-1893"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-406"}],"importedBy":[{"uid":"4e31-1908"},{"uid":"4e31-1894"},{"uid":"4e31-1898"},{"uid":"4e31-1902"}]},"4e31-1894":{"id":"modules/pixi/PixiFeaturePolygon.js","moduleParts":{"dist/rapid.js":"4e31-1895"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-1886"},{"uid":"4e31-1524"},{"uid":"4e31-406"},{"uid":"4e31-1890"},{"uid":"4e31-1892"},{"uid":"4e31-416"}],"importedBy":[{"uid":"4e31-1896"},{"uid":"4e31-1916"},{"uid":"4e31-1924"},{"uid":"4e31-1930"}]},"4e31-1896":{"id":"modules/pixi/PixiLayerEditBlocks.js","moduleParts":{"dist/rapid.js":"4e31-1897"},"imported":[{"uid":"4e31-1882"},{"uid":"4e31-1894"},{"uid":"4e31-496"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1898":{"id":"modules/pixi/PixiFeaturePoint.js","moduleParts":{"dist/rapid.js":"4e31-1899"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-1886"},{"uid":"4e31-1524"},{"uid":"4e31-1890"},{"uid":"4e31-1892"}],"importedBy":[{"uid":"4e31-1900"},{"uid":"4e31-1904"},{"uid":"4e31-1906"},{"uid":"4e31-1910"},{"uid":"4e31-1912"},{"uid":"4e31-1914"},{"uid":"4e31-1916"},{"uid":"4e31-1920"},{"uid":"4e31-1922"},{"uid":"4e31-1924"},{"uid":"4e31-1928"},{"uid":"4e31-1930"}]},"4e31-1900":{"id":"modules/pixi/PixiLayerImproveOsm.js","moduleParts":{"dist/rapid.js":"4e31-1901"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1902":{"id":"modules/pixi/PixiFeatureLine.js","moduleParts":{"dist/rapid.js":"4e31-1903"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-1886"},{"uid":"4e31-1524"},{"uid":"4e31-1890"},{"uid":"4e31-1892"}],"importedBy":[{"uid":"4e31-1904"},{"uid":"4e31-1912"},{"uid":"4e31-1916"},{"uid":"4e31-1924"},{"uid":"4e31-1928"},{"uid":"4e31-1930"}]},"4e31-1904":{"id":"modules/pixi/PixiLayerKartaPhotos.js","moduleParts":{"dist/rapid.js":"4e31-1905"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1902"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1906":{"id":"modules/pixi/PixiLayerKeepRight.js","moduleParts":{"dist/rapid.js":"4e31-1907"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1908":{"id":"modules/pixi/PixiLayerLabels.js","moduleParts":{"dist/rapid.js":"4e31-1909"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-1520"},{"uid":"4e31-54"},{"uid":"4e31-406"},{"uid":"4e31-1882"},{"uid":"4e31-498"},{"uid":"4e31-1892"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1910":{"id":"modules/pixi/PixiLayerMapillaryFeatures.js","moduleParts":{"dist/rapid.js":"4e31-1911"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1912":{"id":"modules/pixi/PixiLayerMapillaryPhotos.js","moduleParts":{"dist/rapid.js":"4e31-1913"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1902"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1914":{"id":"modules/pixi/PixiLayerMapillarySigns.js","moduleParts":{"dist/rapid.js":"4e31-1915"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1916":{"id":"modules/pixi/PixiLayerOsm.js","moduleParts":{"dist/rapid.js":"4e31-1917"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-60"},{"uid":"4e31-406"},{"uid":"4e31-2172"},{"uid":"4e31-2198"},{"uid":"4e31-1882"},{"uid":"4e31-1902"},{"uid":"4e31-1898"},{"uid":"4e31-1894"},{"uid":"4e31-414"},{"uid":"4e31-1918"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1918":{"id":"modules/pixi/styles.js","moduleParts":{"dist/rapid.js":"4e31-1919"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-114"}],"importedBy":[{"uid":"4e31-1994"},{"uid":"4e31-1916"}]},"4e31-1920":{"id":"modules/pixi/PixiLayerOsmNotes.js","moduleParts":{"dist/rapid.js":"4e31-1921"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1922":{"id":"modules/pixi/PixiLayerOsmose.js","moduleParts":{"dist/rapid.js":"4e31-1923"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1924":{"id":"modules/pixi/PixiLayerRapid.js","moduleParts":{"dist/rapid.js":"4e31-1925"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-60"},{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1902"},{"uid":"4e31-1898"},{"uid":"4e31-1894"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1926":{"id":"modules/pixi/PixiLayerMapUI.js","moduleParts":{"dist/rapid.js":"4e31-1927"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-406"},{"uid":"4e31-1882"},{"uid":"4e31-1886"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1928":{"id":"modules/pixi/PixiLayerStreetsidePhotos.js","moduleParts":{"dist/rapid.js":"4e31-1929"},"imported":[{"uid":"4e31-2172"},{"uid":"4e31-1882"},{"uid":"4e31-1902"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1930":{"id":"modules/pixi/PixiLayerCustomData.js","moduleParts":{"dist/rapid.js":"4e31-1931"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-546"},{"uid":"4e31-146"},{"uid":"4e31-62"},{"uid":"4e31-578"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-2172"},{"uid":"4e31-1894"},{"uid":"4e31-1882"},{"uid":"4e31-1902"},{"uid":"4e31-1898"}],"importedBy":[{"uid":"4e31-1932"}]},"4e31-1932":{"id":"modules/pixi/PixiScene.js","moduleParts":{"dist/rapid.js":"4e31-1933"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-420"},{"uid":"4e31-1884"},{"uid":"4e31-1896"},{"uid":"4e31-1900"},{"uid":"4e31-1904"},{"uid":"4e31-1906"},{"uid":"4e31-1908"},{"uid":"4e31-1910"},{"uid":"4e31-1912"},{"uid":"4e31-1914"},{"uid":"4e31-1916"},{"uid":"4e31-1920"},{"uid":"4e31-1922"},{"uid":"4e31-1924"},{"uid":"4e31-1926"},{"uid":"4e31-1928"},{"uid":"4e31-1930"}],"importedBy":[{"uid":"4e31-1936"}]},"4e31-1934":{"id":"modules/pixi/PixiTextures.js","moduleParts":{"dist/rapid.js":"4e31-1935"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-1520"}],"importedBy":[{"uid":"4e31-1936"}]},"4e31-1936":{"id":"modules/pixi/PixiRenderer.js","moduleParts":{"dist/rapid.js":"4e31-1937"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-420"},{"uid":"4e31-406"},{"uid":"4e31-1518"},{"uid":"4e31-1932"},{"uid":"4e31-1934"},{"uid":"4e31-2200"}],"importedBy":[{"uid":"4e31-1940"}]},"4e31-1938":{"id":"modules/util/dimensions.js","moduleParts":{"dist/rapid.js":"4e31-1939"},"imported":[],"importedBy":[{"uid":"4e31-1940"},{"uid":"4e31-2184"},{"uid":"4e31-2108"},{"uid":"4e31-1980"}]},"4e31-1940":{"id":"modules/renderer/RendererMap.js","moduleParts":{"dist/rapid.js":"4e31-1941"},"imported":[{"uid":"4e31-420"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-1936"},{"uid":"4e31-416"},{"uid":"4e31-2200"},{"uid":"4e31-1938"}],"importedBy":[{"uid":"4e31-1516"}]},"4e31-1942":{"id":"modules/renderer/RendererPhotos.js","moduleParts":{"dist/rapid.js":"4e31-1943"},"imported":[{"uid":"4e31-420"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-1516"}]},"4e31-1944":{"id":"modules/renderer/features.js","moduleParts":{"dist/rapid.js":"4e31-1945"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-416"},{"uid":"4e31-512"},{"uid":"4e31-508"}],"importedBy":[{"uid":"4e31-1516"}]},"4e31-1946":{"id":"modules/svg/defs.js","moduleParts":{"dist/rapid.js":"4e31-1947"},"imported":[{"uid":"4e31-546"},{"uid":"4e31-266"}],"importedBy":[{"uid":"4e31-2222"},{"uid":"4e31-2108"}]},"4e31-1948":{"id":"modules/ui/account.js","moduleParts":{"dist/rapid.js":"4e31-1949"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1950":{"id":"modules/ui/attribution.js","moduleParts":{"dist/rapid.js":"4e31-1951"},"imported":[{"uid":"4e31-740"},{"uid":"4e31-266"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1952":{"id":"modules/ui/contributors.js","moduleParts":{"dist/rapid.js":"4e31-1953"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1954":{"id":"modules/ui/edit_menu.js","moduleParts":{"dist/rapid.js":"4e31-1955"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-172"},{"uid":"4e31-406"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-508"},{"uid":"4e31-2200"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1956":{"id":"modules/ui/feature_info.js","moduleParts":{"dist/rapid.js":"4e31-1957"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1958":{"id":"modules/ui/full_screen.js","moduleParts":{"dist/rapid.js":"4e31-1959"},"imported":[{"uid":"4e31-616"},{"uid":"4e31-412"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1960":{"id":"modules/ui/geolocate.js","moduleParts":{"dist/rapid.js":"4e31-1961"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-536"},{"uid":"4e31-588"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1962":{"id":"modules/ui/panels/AbstractUiPanel.js","moduleParts":{"dist/rapid.js":"4e31-1963"},"imported":[],"importedBy":[{"uid":"4e31-1964"},{"uid":"4e31-1966"},{"uid":"4e31-1970"},{"uid":"4e31-1972"}]},"4e31-1964":{"id":"modules/ui/panels/UiPanelBackground.js","moduleParts":{"dist/rapid.js":"4e31-1965"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-1962"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2226"},{"uid":"4e31-1974"}]},"4e31-1966":{"id":"modules/ui/panels/UiPanelHistory.js","moduleParts":{"dist/rapid.js":"4e31-1967"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-1962"},{"uid":"4e31-536"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2226"},{"uid":"4e31-1974"}]},"4e31-1968":{"id":"modules/util/units.js","moduleParts":{"dist/rapid.js":"4e31-1969"},"imported":[{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-1970"},{"uid":"4e31-1972"},{"uid":"4e31-1988"},{"uid":"4e31-1984"}]},"4e31-1970":{"id":"modules/ui/panels/UiPanelLocation.js","moduleParts":{"dist/rapid.js":"4e31-1971"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-266"},{"uid":"4e31-1962"},{"uid":"4e31-1968"},{"uid":"4e31-498"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-2226"},{"uid":"4e31-1974"}]},"4e31-1972":{"id":"modules/ui/panels/UiPanelMeasurement.js","moduleParts":{"dist/rapid.js":"4e31-1973"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-146"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-1962"},{"uid":"4e31-498"},{"uid":"4e31-512"},{"uid":"4e31-1968"}],"importedBy":[{"uid":"4e31-2226"},{"uid":"4e31-1974"}]},"4e31-1974":{"id":"modules/ui/info.js","moduleParts":{"dist/rapid.js":"4e31-1975"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-1964"},{"uid":"4e31-1966"},{"uid":"4e31-1970"},{"uid":"4e31-1972"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1976":{"id":"modules/ui/issues_info.js","moduleParts":{"dist/rapid.js":"4e31-1977"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-416"},{"uid":"4e31-536"},{"uid":"4e31-498"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1978":{"id":"modules/ui/map_in_map.js","moduleParts":{"dist/rapid.js":"4e31-1979"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-266"},{"uid":"4e31-404"},{"uid":"4e31-406"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-1884"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2064"},{"uid":"4e31-2108"}]},"4e31-1980":{"id":"modules/ui/photoviewer.js","moduleParts":{"dist/rapid.js":"4e31-1981"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-172"},{"uid":"4e31-536"},{"uid":"4e31-1938"},{"uid":"4e31-414"},{"uid":"4e31-2172"}],"importedBy":[{"uid":"4e31-2108"}]},"4e31-1982":{"id":"modules/ui/restore.js","moduleParts":{"dist/rapid.js":"4e31-1983"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-586"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1984":{"id":"modules/ui/scale.js","moduleParts":{"dist/rapid.js":"4e31-1985"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-1968"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-1986":{"id":"modules/ui/shortcuts.js","moduleParts":{"dist/rapid.js":"4e31-1987"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-418"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-586"},{"uid":"4e31-412"}],"importedBy":[{"uid":"4e31-2108"}]},"4e31-1988":{"id":"modules/ui/feature_list.js","moduleParts":{"dist/rapid.js":"4e31-1989"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-64"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-1968"},{"uid":"4e31-532"},{"uid":"4e31-674"},{"uid":"4e31-408"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2014"}]},"4e31-1990":{"id":"modules/ui/entity_editor.js","moduleParts":{"dist/rapid.js":"4e31-1991"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-52"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-626"},{"uid":"4e31-536"},{"uid":"4e31-414"},{"uid":"4e31-1992"},{"uid":"4e31-1996"},{"uid":"4e31-1998"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-2008"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2012"}]},"4e31-1992":{"id":"modules/ui/sections/entity_issues.js","moduleParts":{"dist/rapid.js":"4e31-1993"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-416"},{"uid":"4e31-536"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-1990"}]},"4e31-1994":{"id":"modules/ui/preset_icon.js","moduleParts":{"dist/rapid.js":"4e31-1995"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-416"},{"uid":"4e31-1918"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-1996"},{"uid":"4e31-2010"}]},"4e31-1996":{"id":"modules/ui/sections/feature_type.js","moduleParts":{"dist/rapid.js":"4e31-1997"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-414"},{"uid":"4e31-1994"},{"uid":"4e31-808"},{"uid":"4e31-796"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-1990"}]},"4e31-1998":{"id":"modules/ui/sections/preset_fields.js","moduleParts":{"dist/rapid.js":"4e31-1999"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-798"},{"uid":"4e31-800"},{"uid":"4e31-808"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-1990"}]},"4e31-2000":{"id":"modules/actions/move_member.js","moduleParts":{"dist/rapid.js":"4e31-2001"},"imported":[],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-2002"}]},"4e31-2002":{"id":"modules/ui/sections/raw_member_editor.js","moduleParts":{"dist/rapid.js":"4e31-2003"},"imported":[{"uid":"4e31-284"},{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-706"},{"uid":"4e31-708"},{"uid":"4e31-2000"},{"uid":"4e31-674"},{"uid":"4e31-512"},{"uid":"4e31-536"},{"uid":"4e31-2172"},{"uid":"4e31-794"},{"uid":"4e31-808"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-1990"}]},"4e31-2004":{"id":"modules/actions/delete_members.js","moduleParts":{"dist/rapid.js":"4e31-2005"},"imported":[{"uid":"4e31-708"}],"importedBy":[{"uid":"4e31-2006"}]},"4e31-2006":{"id":"modules/ui/sections/raw_membership_editor.js","moduleParts":{"dist/rapid.js":"4e31-2007"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-106"},{"uid":"4e31-2210"},{"uid":"4e31-706"},{"uid":"4e31-2004"},{"uid":"4e31-674"},{"uid":"4e31-512"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-794"},{"uid":"4e31-808"},{"uid":"4e31-792"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-1990"}]},"4e31-2008":{"id":"modules/ui/sections/selection_list.js","moduleParts":{"dist/rapid.js":"4e31-2009"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-2198"},{"uid":"4e31-674"},{"uid":"4e31-512"},{"uid":"4e31-536"},{"uid":"4e31-808"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-1990"}]},"4e31-2010":{"id":"modules/ui/preset_list.js","moduleParts":{"dist/rapid.js":"4e31-2011"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-576"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-714"},{"uid":"4e31-620"},{"uid":"4e31-536"},{"uid":"4e31-792"},{"uid":"4e31-1994"},{"uid":"4e31-796"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2012"}]},"4e31-2012":{"id":"modules/ui/inspector.js","moduleParts":{"dist/rapid.js":"4e31-2013"},"imported":[{"uid":"4e31-316"},{"uid":"4e31-266"},{"uid":"4e31-1990"},{"uid":"4e31-2010"},{"uid":"4e31-1462"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2014"}]},"4e31-2014":{"id":"modules/ui/sidebar.js","moduleParts":{"dist/rapid.js":"4e31-2015"},"imported":[{"uid":"4e31-316"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-740"},{"uid":"4e31-414"},{"uid":"4e31-512"},{"uid":"4e31-2172"},{"uid":"4e31-828"},{"uid":"4e31-1988"},{"uid":"4e31-2012"},{"uid":"4e31-1446"},{"uid":"4e31-1454"},{"uid":"4e31-1472"},{"uid":"4e31-1464"},{"uid":"4e31-498"},{"uid":"4e31-1508"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2016":{"id":"modules/ui/source_switch.js","moduleParts":{"dist/rapid.js":"4e31-2017"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2018":{"id":"modules/ui/spinner.js","moduleParts":{"dist/rapid.js":"4e31-2019"},"imported":[],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2020":{"id":"modules/ui/status.js","moduleParts":{"dist/rapid.js":"4e31-2021"},"imported":[{"uid":"4e31-740"},{"uid":"4e31-498"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2022":{"id":"modules/ui/tools/download_osc.js","moduleParts":{"dist/rapid.js":"4e31-2023"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-782"},{"uid":"4e31-512"},{"uid":"4e31-108"},{"uid":"4e31-536"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2024"}]},"4e31-2024":{"id":"modules/ui/tools/index.js","moduleParts":{"dist/rapid.js":"4e31-2025"},"imported":[{"uid":"4e31-2022"},{"uid":"4e31-2026"},{"uid":"4e31-2028"},{"uid":"4e31-2030"},{"uid":"4e31-2032"},{"uid":"4e31-2034"},{"uid":"4e31-2046"}],"importedBy":[{"uid":"4e31-2048"}]},"4e31-2026":{"id":"modules/ui/tools/modes.js","moduleParts":{"dist/rapid.js":"4e31-2027"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-266"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2024"}]},"4e31-2028":{"id":"modules/ui/tools/notes.js","moduleParts":{"dist/rapid.js":"4e31-2029"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2024"}]},"4e31-2030":{"id":"modules/ui/tools/save.js","moduleParts":{"dist/rapid.js":"4e31-2031"},"imported":[{"uid":"4e31-316"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2024"}]},"4e31-2032":{"id":"modules/ui/tools/sidebar_toggle.js","moduleParts":{"dist/rapid.js":"4e31-2033"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2024"}]},"4e31-2034":{"id":"modules/ui/tools/undo_redo.js","moduleParts":{"dist/rapid.js":"4e31-2035"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2024"}]},"4e31-2036":{"id":"node_modules/marked/lib/marked.esm.js","moduleParts":{"dist/rapid.js":"4e31-2037"},"imported":[{"uid":"4e31-2553"}],"importedBy":[{"uid":"4e31-2122"},{"uid":"4e31-2074"},{"uid":"4e31-2062"},{"uid":"4e31-2042"},{"uid":"4e31-2106"},{"uid":"4e31-2040"}]},"4e31-2038":{"id":"modules/ui/rapid_colorpicker.js","moduleParts":{"dist/rapid.js":"4e31-2039"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2042"}]},"4e31-2040":{"id":"modules/ui/rapid_view_manage_datasets.js","moduleParts":{"dist/rapid.js":"4e31-2041"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-2036"},{"uid":"4e31-498"},{"uid":"4e31-416"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-794"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2042"}]},"4e31-2042":{"id":"modules/ui/rapid_feature_toggle_dialog.js","moduleParts":{"dist/rapid.js":"4e31-2043"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-2036"},{"uid":"4e31-498"},{"uid":"4e31-416"},{"uid":"4e31-1480"},{"uid":"4e31-536"},{"uid":"4e31-586"},{"uid":"4e31-2038"},{"uid":"4e31-2040"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2046"}]},"4e31-2044":{"id":"modules/ui/rapid_poweruser_features_dialog.js","moduleParts":{"dist/rapid.js":"4e31-2045"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-416"},{"uid":"4e31-586"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2046"}]},"4e31-2046":{"id":"modules/ui/tools/rapid_features.js","moduleParts":{"dist/rapid.js":"4e31-2047"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-172"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-616"},{"uid":"4e31-2042"},{"uid":"4e31-2044"}],"importedBy":[{"uid":"4e31-2024"}]},"4e31-2048":{"id":"modules/ui/top_toolbar.js","moduleParts":{"dist/rapid.js":"4e31-2049"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-2024"}],"importedBy":[{"uid":"4e31-2108"}]},"4e31-2050":{"id":"modules/ui/version.js","moduleParts":{"dist/rapid.js":"4e31-2051"},"imported":[{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2052":{"id":"modules/util/keybinding.js","moduleParts":{"dist/rapid.js":"4e31-2053"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-414"},{"uid":"4e31-2174"},{"uid":"4e31-2054"}]},"4e31-2054":{"id":"modules/ui/zoom.js","moduleParts":{"dist/rapid.js":"4e31-2055"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-792"},{"uid":"4e31-2052"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2056":{"id":"modules/ui/zoom_to_selection.js","moduleParts":{"dist/rapid.js":"4e31-2057"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-2108"}]},"4e31-2058":{"id":"modules/ui/pane.js","moduleParts":{"dist/rapid.js":"4e31-2059"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-536"},{"uid":"4e31-498"},{"uid":"4e31-792"}],"importedBy":[{"uid":"4e31-2072"},{"uid":"4e31-2074"},{"uid":"4e31-2084"},{"uid":"4e31-2096"},{"uid":"4e31-2102"}]},"4e31-2060":{"id":"modules/ui/sections/background_display_options.js","moduleParts":{"dist/rapid.js":"4e31-2061"},"imported":[{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2072"}]},"4e31-2062":{"id":"modules/ui/settings/custom_background.js","moduleParts":{"dist/rapid.js":"4e31-2063"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-2036"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-786"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2232"},{"uid":"4e31-2064"}]},"4e31-2064":{"id":"modules/ui/sections/background_list.js","moduleParts":{"dist/rapid.js":"4e31-2065"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-122"},{"uid":"4e31-266"},{"uid":"4e31-384"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-1514"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-2062"},{"uid":"4e31-1978"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2072"}]},"4e31-2066":{"id":"modules/ui/sections/background_offset.js","moduleParts":{"dist/rapid.js":"4e31-2067"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-498"},{"uid":"4e31-536"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2072"}]},"4e31-2068":{"id":"modules/ui/sections/grid_display_options.js","moduleParts":{"dist/rapid.js":"4e31-2069"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2072"}]},"4e31-2070":{"id":"modules/ui/sections/overlay_list.js","moduleParts":{"dist/rapid.js":"4e31-2071"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-122"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2072"}]},"4e31-2072":{"id":"modules/ui/panes/background.js","moduleParts":{"dist/rapid.js":"4e31-2073"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-2058"},{"uid":"4e31-2060"},{"uid":"4e31-2064"},{"uid":"4e31-2066"},{"uid":"4e31-2068"},{"uid":"4e31-2070"}],"importedBy":[{"uid":"4e31-2228"},{"uid":"4e31-2108"}]},"4e31-2074":{"id":"modules/ui/panes/help.js","moduleParts":{"dist/rapid.js":"4e31-2075"},"imported":[{"uid":"4e31-2036"},{"uid":"4e31-536"},{"uid":"4e31-1500"},{"uid":"4e31-2058"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-1480"}],"importedBy":[{"uid":"4e31-2228"},{"uid":"4e31-2108"}]},"4e31-2076":{"id":"modules/ui/sections/validation_issues.js","moduleParts":{"dist/rapid.js":"4e31-2077"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-612"},{"uid":"4e31-536"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2084"}]},"4e31-2078":{"id":"modules/ui/sections/validation_options.js","moduleParts":{"dist/rapid.js":"4e31-2079"},"imported":[{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2084"}]},"4e31-2080":{"id":"modules/ui/sections/validation_rules.js","moduleParts":{"dist/rapid.js":"4e31-2081"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-792"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2084"}]},"4e31-2082":{"id":"modules/ui/sections/validation_status.js","moduleParts":{"dist/rapid.js":"4e31-2083"},"imported":[{"uid":"4e31-576"},{"uid":"4e31-536"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2084"}]},"4e31-2084":{"id":"modules/ui/panes/issues.js","moduleParts":{"dist/rapid.js":"4e31-2085"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-2058"},{"uid":"4e31-2076"},{"uid":"4e31-2078"},{"uid":"4e31-2080"},{"uid":"4e31-2082"}],"importedBy":[{"uid":"4e31-2228"},{"uid":"4e31-2108"}]},"4e31-2086":{"id":"modules/ui/settings/custom_data.js","moduleParts":{"dist/rapid.js":"4e31-2087"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-786"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2232"},{"uid":"4e31-2088"}]},"4e31-2088":{"id":"modules/ui/sections/data_layers.js","moduleParts":{"dist/rapid.js":"4e31-2089"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-536"},{"uid":"4e31-616"},{"uid":"4e31-808"},{"uid":"4e31-2086"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2096"}]},"4e31-2090":{"id":"modules/ui/sections/map_features.js","moduleParts":{"dist/rapid.js":"4e31-2091"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2096"}]},"4e31-2092":{"id":"modules/ui/sections/map_style_options.js","moduleParts":{"dist/rapid.js":"4e31-2093"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2096"}]},"4e31-2094":{"id":"modules/ui/sections/photo_overlays.js","moduleParts":{"dist/rapid.js":"4e31-2095"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-808"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2096"}]},"4e31-2096":{"id":"modules/ui/panes/map_data.js","moduleParts":{"dist/rapid.js":"4e31-2097"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-2058"},{"uid":"4e31-2088"},{"uid":"4e31-2090"},{"uid":"4e31-2092"},{"uid":"4e31-2094"}],"importedBy":[{"uid":"4e31-2228"},{"uid":"4e31-2108"}]},"4e31-2098":{"id":"modules/ui/sections/privacy.js","moduleParts":{"dist/rapid.js":"4e31-2099"},"imported":[{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-792"},{"uid":"4e31-536"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2102"}]},"4e31-2100":{"id":"modules/ui/sections/map_interaction_options.js","moduleParts":{"dist/rapid.js":"4e31-2101"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-416"},{"uid":"4e31-792"},{"uid":"4e31-808"}],"importedBy":[{"uid":"4e31-2230"},{"uid":"4e31-2102"}]},"4e31-2102":{"id":"modules/ui/panes/preferences.js","moduleParts":{"dist/rapid.js":"4e31-2103"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-2058"},{"uid":"4e31-2098"},{"uid":"4e31-2100"}],"importedBy":[{"uid":"4e31-2228"},{"uid":"4e31-2108"}]},"4e31-2104":{"id":"modules/ui/rapid_service_license.js","moduleParts":{"dist/rapid.js":"4e31-2105"},"imported":[{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2106":{"id":"modules/ui/rapid_whatsnew.js","moduleParts":{"dist/rapid.js":"4e31-2107"},"imported":[{"uid":"4e31-498"},{"uid":"4e31-1480"},{"uid":"4e31-586"},{"uid":"4e31-416"},{"uid":"4e31-2036"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2108"}]},"4e31-2108":{"id":"modules/ui/init.js","moduleParts":{"dist/rapid.js":"4e31-2109"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-416"},{"uid":"4e31-498"},{"uid":"4e31-2198"},{"uid":"4e31-1946"},{"uid":"4e31-536"},{"uid":"4e31-412"},{"uid":"4e31-1938"},{"uid":"4e31-1948"},{"uid":"4e31-1950"},{"uid":"4e31-1952"},{"uid":"4e31-1954"},{"uid":"4e31-1956"},{"uid":"4e31-1478"},{"uid":"4e31-1958"},{"uid":"4e31-1960"},{"uid":"4e31-1974"},{"uid":"4e31-1502"},{"uid":"4e31-1976"},{"uid":"4e31-588"},{"uid":"4e31-1978"},{"uid":"4e31-1980"},{"uid":"4e31-1982"},{"uid":"4e31-1984"},{"uid":"4e31-1986"},{"uid":"4e31-2014"},{"uid":"4e31-2016"},{"uid":"4e31-2018"},{"uid":"4e31-2020"},{"uid":"4e31-792"},{"uid":"4e31-2048"},{"uid":"4e31-2050"},{"uid":"4e31-2054"},{"uid":"4e31-2056"},{"uid":"4e31-616"},{"uid":"4e31-2072"},{"uid":"4e31-2074"},{"uid":"4e31-2084"},{"uid":"4e31-2096"},{"uid":"4e31-2102"},{"uid":"4e31-2104"},{"uid":"4e31-2106"},{"uid":"4e31-1504"}],"importedBy":[{"uid":"4e31-2234"},{"uid":"4e31-2110"}]},"4e31-2110":{"id":"modules/core/context.js","moduleParts":{"dist/rapid.js":"4e31-2111"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-576"},{"uid":"4e31-498"},{"uid":"4e31-580"},{"uid":"4e31-418"},{"uid":"4e31-416"},{"uid":"4e31-590"},{"uid":"4e31-728"},{"uid":"4e31-738"},{"uid":"4e31-742"},{"uid":"4e31-744"},{"uid":"4e31-746"},{"uid":"4e31-748"},{"uid":"4e31-750"},{"uid":"4e31-752"},{"uid":"4e31-754"},{"uid":"4e31-756"},{"uid":"4e31-758"},{"uid":"4e31-762"},{"uid":"4e31-764"},{"uid":"4e31-766"},{"uid":"4e31-770"},{"uid":"4e31-772"},{"uid":"4e31-774"},{"uid":"4e31-776"},{"uid":"4e31-780"},{"uid":"4e31-824"},{"uid":"4e31-1510"},{"uid":"4e31-674"},{"uid":"4e31-2198"},{"uid":"4e31-1516"},{"uid":"4e31-2172"},{"uid":"4e31-2108"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2112"}]},"4e31-2112":{"id":"modules/core/index.js","moduleParts":{"dist/rapid.js":"4e31-2113"},"imported":[{"uid":"4e31-2110"},{"uid":"4e31-418"},{"uid":"4e31-590"},{"uid":"4e31-580"},{"uid":"4e31-498"},{"uid":"4e31-416"},{"uid":"4e31-738"},{"uid":"4e31-728"},{"uid":"4e31-582"},{"uid":"4e31-532"},{"uid":"4e31-496"},{"uid":"4e31-584"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2128"},{"uid":"4e31-2142"},{"uid":"4e31-718"}]},"4e31-2114":{"id":"modules/services/esri_data.js","moduleParts":{"dist/rapid.js":"4e31-2115"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-496"},{"uid":"4e31-2112"},{"uid":"4e31-512"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2116":{"id":"modules/services/fb_ai_features.js","moduleParts":{"dist/rapid.js":"4e31-2117"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-406"},{"uid":"4e31-496"},{"uid":"4e31-2112"},{"uid":"4e31-512"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2118":{"id":"modules/services/keepRight.js","moduleParts":{"dist/rapid.js":"4e31-2119"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-54"},{"uid":"4e31-418"},{"uid":"4e31-512"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2120":{"id":"modules/services/improveOSM.js","moduleParts":{"dist/rapid.js":"4e31-2121"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-54"},{"uid":"4e31-418"},{"uid":"4e31-512"},{"uid":"4e31-2172"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2122":{"id":"modules/services/osmose.js","moduleParts":{"dist/rapid.js":"4e31-2123"},"imported":[{"uid":"4e31-1164"},{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-2036"},{"uid":"4e31-54"},{"uid":"4e31-418"},{"uid":"4e31-498"},{"uid":"4e31-512"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2124":{"id":"modules/services/mapillary.js","moduleParts":{"dist/rapid.js":"4e31-2125"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-74"},{"uid":"4e31-78"},{"uid":"4e31-54"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2126":{"id":"modules/services/maprules.js","moduleParts":{"dist/rapid.js":"4e31-2127"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-114"},{"uid":"4e31-680"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2128":{"id":"modules/services/nominatim.js","moduleParts":{"dist/rapid.js":"4e31-2129"},"imported":[{"uid":"4e31-546"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-54"},{"uid":"4e31-2112"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2130":{"id":"node_modules/name-suggestion-index/lib/matcher.js","moduleParts":{"dist/rapid.js":"4e31-2131"},"imported":[{"uid":"4e31-26"},{"uid":"4e31-2132"},{"uid":"4e31-2134"},{"uid":"4e31-2136"},{"uid":"4e31-2138"}],"importedBy":[{"uid":"4e31-2140"}]},"4e31-2132":{"id":"node_modules/name-suggestion-index/lib/simplify.js","moduleParts":{"dist/rapid.js":"4e31-2133"},"imported":[{"uid":"4e31-2"}],"importedBy":[{"uid":"4e31-2140"},{"uid":"4e31-2130"},{"uid":"4e31-2554"}]},"4e31-2134":{"id":"node_modules/name-suggestion-index/config/matchGroups.json","moduleParts":{"dist/rapid.js":"4e31-2135"},"imported":[],"importedBy":[{"uid":"4e31-2130"}]},"4e31-2136":{"id":"node_modules/name-suggestion-index/config/genericWords.json","moduleParts":{"dist/rapid.js":"4e31-2137"},"imported":[],"importedBy":[{"uid":"4e31-2130"}]},"4e31-2138":{"id":"node_modules/name-suggestion-index/config/trees.json","moduleParts":{"dist/rapid.js":"4e31-2139"},"imported":[],"importedBy":[{"uid":"4e31-2130"}]},"4e31-2140":{"id":"node_modules/name-suggestion-index/index.mjs","moduleParts":{"dist/rapid.js":"4e31-2141"},"imported":[{"uid":"4e31-2130"},{"uid":"4e31-2132"},{"uid":"4e31-2554"}],"importedBy":[{"uid":"4e31-2142"}]},"4e31-2142":{"id":"modules/services/nsi.js","moduleParts":{"dist/rapid.js":"4e31-2143"},"imported":[{"uid":"4e31-2140"},{"uid":"4e31-2112"},{"uid":"4e31-2198"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2144":{"id":"modules/services/kartaview.js","moduleParts":{"dist/rapid.js":"4e31-2145"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-404"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-54"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2146":{"id":"node_modules/osm-auth/src/osm-auth.mjs","moduleParts":{"dist/rapid.js":"4e31-2147"},"imported":[{"uid":"4e31-102"}],"importedBy":[{"uid":"4e31-2148"}]},"4e31-2148":{"id":"modules/services/osm.js","moduleParts":{"dist/rapid.js":"4e31-2149"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-740"},{"uid":"4e31-2146"},{"uid":"4e31-54"},{"uid":"4e31-782"},{"uid":"4e31-496"},{"uid":"4e31-512"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2150":{"id":"modules/services/osm_wikibase.js","moduleParts":{"dist/rapid.js":"4e31-2151"},"imported":[{"uid":"4e31-546"},{"uid":"4e31-110"},{"uid":"4e31-576"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2152":{"id":"modules/services/streetside.js","moduleParts":{"dist/rapid.js":"4e31-2153"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-546"},{"uid":"4e31-266"},{"uid":"4e31-328"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-54"},{"uid":"4e31-498"},{"uid":"4e31-2154"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2154":{"id":"modules/util/jsonp_request.js","moduleParts":{"dist/rapid.js":"4e31-2155"},"imported":[{"uid":"4e31-266"}],"importedBy":[{"uid":"4e31-2152"}]},"4e31-2156":{"id":"modules/services/taginfo.js","moduleParts":{"dist/rapid.js":"4e31-2157"},"imported":[{"uid":"4e31-546"},{"uid":"4e31-110"},{"uid":"4e31-576"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2158":{"id":"modules/services/vector_tile.js","moduleParts":{"dist/rapid.js":"4e31-2159"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-52"},{"uid":"4e31-2166"},{"uid":"4e31-62"},{"uid":"4e31-46"},{"uid":"4e31-78"},{"uid":"4e31-74"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2160":{"id":"node_modules/@turf/helpers/dist/es/index.js","moduleParts":{"dist/rapid.js":"4e31-2161"},"imported":[],"importedBy":[{"uid":"4e31-2166"},{"uid":"4e31-2162"}]},"4e31-2162":{"id":"node_modules/@turf/invariant/dist/es/index.js","moduleParts":{"dist/rapid.js":"4e31-2163"},"imported":[{"uid":"4e31-2160"}],"importedBy":[{"uid":"4e31-2166"}]},"4e31-2164":{"id":"node_modules/@turf/bbox-clip/dist/es/lib/lineclip.js","moduleParts":{"dist/rapid.js":"4e31-2165"},"imported":[],"importedBy":[{"uid":"4e31-2166"}]},"4e31-2166":{"id":"node_modules/@turf/bbox-clip/dist/es/index.js","moduleParts":{"dist/rapid.js":"4e31-2167"},"imported":[{"uid":"4e31-2160"},{"uid":"4e31-2162"},{"uid":"4e31-2164"}],"importedBy":[{"uid":"4e31-2158"}]},"4e31-2168":{"id":"modules/services/wikidata.js","moduleParts":{"dist/rapid.js":"4e31-2169"},"imported":[{"uid":"4e31-546"},{"uid":"4e31-110"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2170":{"id":"modules/services/wikipedia.js","moduleParts":{"dist/rapid.js":"4e31-2171"},"imported":[{"uid":"4e31-546"},{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-2172"}]},"4e31-2172":{"id":"modules/services/index.js","moduleParts":{"dist/rapid.js":"4e31-2173"},"imported":[{"uid":"4e31-2114"},{"uid":"4e31-2116"},{"uid":"4e31-2118"},{"uid":"4e31-2120"},{"uid":"4e31-2122"},{"uid":"4e31-2124"},{"uid":"4e31-2126"},{"uid":"4e31-2128"},{"uid":"4e31-2142"},{"uid":"4e31-2144"},{"uid":"4e31-2148"},{"uid":"4e31-2150"},{"uid":"4e31-2152"},{"uid":"4e31-2156"},{"uid":"4e31-2158"},{"uid":"4e31-2168"},{"uid":"4e31-2170"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-758"},{"uid":"4e31-2110"},{"uid":"4e31-580"},{"uid":"4e31-762"},{"uid":"4e31-824"},{"uid":"4e31-1510"},{"uid":"4e31-1476"},{"uid":"4e31-1942"},{"uid":"4e31-2120"},{"uid":"4e31-2174"},{"uid":"4e31-2186"},{"uid":"4e31-2194"},{"uid":"4e31-2196"},{"uid":"4e31-1500"},{"uid":"4e31-1970"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-788"},{"uid":"4e31-1988"},{"uid":"4e31-830"},{"uid":"4e31-1446"},{"uid":"4e31-1444"},{"uid":"4e31-1454"},{"uid":"4e31-1450"},{"uid":"4e31-1456"},{"uid":"4e31-1464"},{"uid":"4e31-1460"},{"uid":"4e31-2014"},{"uid":"4e31-796"},{"uid":"4e31-1452"},{"uid":"4e31-1508"},{"uid":"4e31-2040"},{"uid":"4e31-682"},{"uid":"4e31-688"},{"uid":"4e31-696"},{"uid":"4e31-700"},{"uid":"4e31-718"},{"uid":"4e31-724"},{"uid":"4e31-726"},{"uid":"4e31-1472"},{"uid":"4e31-1980"},{"uid":"4e31-1466"},{"uid":"4e31-1468"},{"uid":"4e31-1470"},{"uid":"4e31-1900"},{"uid":"4e31-1904"},{"uid":"4e31-1906"},{"uid":"4e31-1910"},{"uid":"4e31-1912"},{"uid":"4e31-1914"},{"uid":"4e31-1916"},{"uid":"4e31-1920"},{"uid":"4e31-1922"},{"uid":"4e31-1924"},{"uid":"4e31-1928"},{"uid":"4e31-1930"}]},"4e31-2174":{"id":"modules/ui/fields/combo.js","moduleParts":{"dist/rapid.js":"4e31-2175"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-284"},{"uid":"4e31-110"},{"uid":"4e31-492"},{"uid":"4e31-418"},{"uid":"4e31-408"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-794"},{"uid":"4e31-2052"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2176":{"id":"modules/ui/fields/input.js","moduleParts":{"dist/rapid.js":"4e31-2177"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-492"},{"uid":"4e31-2198"},{"uid":"4e31-418"},{"uid":"4e31-498"},{"uid":"4e31-414"},{"uid":"4e31-536"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2178":{"id":"modules/ui/fields/access.js","moduleParts":{"dist/rapid.js":"4e31-2179"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-794"},{"uid":"4e31-414"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2180":{"id":"modules/ui/fields/address.js","moduleParts":{"dist/rapid.js":"4e31-2181"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-492"},{"uid":"4e31-2198"},{"uid":"4e31-418"},{"uid":"4e31-596"},{"uid":"4e31-794"},{"uid":"4e31-414"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2182":{"id":"modules/ui/fields/cycleway.js","moduleParts":{"dist/rapid.js":"4e31-2183"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-794"},{"uid":"4e31-414"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2184":{"id":"modules/ui/fields/lanes.js","moduleParts":{"dist/rapid.js":"4e31-2185"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-508"},{"uid":"4e31-1938"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2186":{"id":"modules/ui/fields/localized.js","moduleParts":{"dist/rapid.js":"4e31-2187"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-492"},{"uid":"4e31-2198"},{"uid":"4e31-418"},{"uid":"4e31-498"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-792"},{"uid":"4e31-794"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2188":{"id":"modules/ui/fields/roadspeed.js","moduleParts":{"dist/rapid.js":"4e31-2189"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-492"},{"uid":"4e31-794"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2190":{"id":"modules/ui/fields/radio.js","moduleParts":{"dist/rapid.js":"4e31-2191"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"},{"uid":"4e31-798"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2192":{"id":"modules/ui/fields/textarea.js","moduleParts":{"dist/rapid.js":"4e31-2193"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-498"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2194":{"id":"modules/ui/fields/wikidata.js","moduleParts":{"dist/rapid.js":"4e31-2195"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-626"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-414"},{"uid":"4e31-794"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2196":{"id":"modules/ui/fields/wikipedia.js","moduleParts":{"dist/rapid.js":"4e31-2197"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-266"},{"uid":"4e31-418"},{"uid":"4e31-498"},{"uid":"4e31-626"},{"uid":"4e31-2172"},{"uid":"4e31-536"},{"uid":"4e31-794"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-540"}]},"4e31-2198":{"id":"modules/presets/index.js","moduleParts":{"dist/rapid.js":"4e31-2199"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-110"},{"uid":"4e31-416"},{"uid":"4e31-418"},{"uid":"4e31-496"},{"uid":"4e31-114"},{"uid":"4e31-502"},{"uid":"4e31-500"},{"uid":"4e31-504"},{"uid":"4e31-506"},{"uid":"4e31-414"},{"uid":"4e31-540"}],"importedBy":[{"uid":"4e31-104"},{"uid":"4e31-2110"},{"uid":"4e31-770"},{"uid":"4e31-614"},{"uid":"4e31-628"},{"uid":"4e31-632"},{"uid":"4e31-644"},{"uid":"4e31-2142"},{"uid":"4e31-2176"},{"uid":"4e31-2180"},{"uid":"4e31-2186"},{"uid":"4e31-2190"},{"uid":"4e31-810"},{"uid":"4e31-1996"},{"uid":"4e31-1998"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-2008"},{"uid":"4e31-2108"},{"uid":"4e31-802"},{"uid":"4e31-1990"},{"uid":"4e31-1988"},{"uid":"4e31-832"},{"uid":"4e31-1448"},{"uid":"4e31-2010"},{"uid":"4e31-2200"},{"uid":"4e31-702"},{"uid":"4e31-718"},{"uid":"4e31-724"},{"uid":"4e31-1486"},{"uid":"4e31-1488"},{"uid":"4e31-1490"},{"uid":"4e31-1492"},{"uid":"4e31-1494"},{"uid":"4e31-1466"},{"uid":"4e31-1916"},{"uid":"4e31-2026"}]},"4e31-2200":{"id":"modules/util/util.js","moduleParts":{"dist/rapid.js":"4e31-2201"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-2198"},{"uid":"4e31-498"}],"importedBy":[{"uid":"4e31-414"},{"uid":"4e31-624"},{"uid":"4e31-646"},{"uid":"4e31-656"},{"uid":"4e31-660"},{"uid":"4e31-664"},{"uid":"4e31-1940"},{"uid":"4e31-1954"},{"uid":"4e31-790"},{"uid":"4e31-792"},{"uid":"4e31-1936"}]},"4e31-2202":{"id":"modules/util/get_set_value.js","moduleParts":{"dist/rapid.js":"4e31-2203"},"imported":[],"importedBy":[{"uid":"4e31-414"}]},"4e31-2204":{"id":"modules/util/trigger_event.js","moduleParts":{"dist/rapid.js":"4e31-2205"},"imported":[],"importedBy":[{"uid":"4e31-414"}]},"4e31-2206":{"id":"modules/osm/way.js","moduleParts":{"dist/rapid.js":"4e31-2207"},"imported":[{"uid":"4e31-146"},{"uid":"4e31-406"},{"uid":"4e31-110"},{"uid":"4e31-408"},{"uid":"4e31-410"},{"uid":"4e31-114"},{"uid":"4e31-414"}],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-2210"},{"uid":"4e31-530"},{"uid":"4e31-758"},{"uid":"4e31-2208"}]},"4e31-2208":{"id":"modules/osm/multipolygon.js","moduleParts":{"dist/rapid.js":"4e31-2209"},"imported":[{"uid":"4e31-112"},{"uid":"4e31-114"},{"uid":"4e31-2206"}],"importedBy":[{"uid":"4e31-512"},{"uid":"4e31-2210"},{"uid":"4e31-634"},{"uid":"4e31-530"},{"uid":"4e31-518"},{"uid":"4e31-702"},{"uid":"4e31-712"},{"uid":"4e31-718"}]},"4e31-2210":{"id":"modules/actions/add_member.js","moduleParts":{"dist/rapid.js":"4e31-2211"},"imported":[{"uid":"4e31-110"},{"uid":"4e31-2208"},{"uid":"4e31-2206"}],"importedBy":[{"uid":"4e31-108"},{"uid":"4e31-530"},{"uid":"4e31-2006"}]},"4e31-2212":{"id":"modules/actions/restrict_turn.js","moduleParts":{"dist/rapid.js":"4e31-2213"},"imported":[{"uid":"4e31-518"}],"importedBy":[{"uid":"4e31-108"}]},"4e31-2214":{"id":"modules/actions/scale.js","moduleParts":{"dist/rapid.js":"4e31-2215"},"imported":[{"uid":"4e31-110"}],"importedBy":[{"uid":"4e31-108"}]},"4e31-2216":{"id":"modules/actions/unrestrict_turn.js","moduleParts":{"dist/rapid.js":"4e31-2217"},"imported":[{"uid":"4e31-528"}],"importedBy":[{"uid":"4e31-108"}]},"4e31-2218":{"id":"modules/actions/rapid_accept_feature.js","moduleParts":{"dist/rapid.js":"4e31-2219"},"imported":[{"uid":"4e31-406"},{"uid":"4e31-512"}],"importedBy":[{"uid":"4e31-108"}]},"4e31-2220":{"id":"modules/behaviors/index.js","moduleParts":{"dist/rapid.js":"4e31-2221"},"imported":[{"uid":"4e31-744"},{"uid":"4e31-746"},{"uid":"4e31-748"},{"uid":"4e31-606"},{"uid":"4e31-750"},{"uid":"4e31-752"},{"uid":"4e31-756"},{"uid":"4e31-758"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2222":{"id":"modules/svg/index.js","moduleParts":{"dist/rapid.js":"4e31-2223"},"imported":[{"uid":"4e31-1946"},{"uid":"4e31-536"},{"uid":"4e31-2224"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2224":{"id":"modules/svg/tag_classes.js","moduleParts":{"dist/rapid.js":"4e31-2225"},"imported":[{"uid":"4e31-266"},{"uid":"4e31-114"}],"importedBy":[{"uid":"4e31-2222"}]},"4e31-2226":{"id":"modules/ui/panels/index.js","moduleParts":{"dist/rapid.js":"4e31-2227"},"imported":[{"uid":"4e31-1964"},{"uid":"4e31-1966"},{"uid":"4e31-1970"},{"uid":"4e31-1972"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2228":{"id":"modules/ui/panes/index.js","moduleParts":{"dist/rapid.js":"4e31-2229"},"imported":[{"uid":"4e31-2072"},{"uid":"4e31-2074"},{"uid":"4e31-2084"},{"uid":"4e31-2096"},{"uid":"4e31-2102"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2230":{"id":"modules/ui/sections/index.js","moduleParts":{"dist/rapid.js":"4e31-2231"},"imported":[{"uid":"4e31-2060"},{"uid":"4e31-2064"},{"uid":"4e31-2066"},{"uid":"4e31-810"},{"uid":"4e31-2088"},{"uid":"4e31-1992"},{"uid":"4e31-1996"},{"uid":"4e31-2090"},{"uid":"4e31-2100"},{"uid":"4e31-2092"},{"uid":"4e31-2070"},{"uid":"4e31-2094"},{"uid":"4e31-1998"},{"uid":"4e31-2098"},{"uid":"4e31-2002"},{"uid":"4e31-2006"},{"uid":"4e31-814"},{"uid":"4e31-2008"},{"uid":"4e31-2076"},{"uid":"4e31-2078"},{"uid":"4e31-2080"},{"uid":"4e31-2082"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2232":{"id":"modules/ui/settings/index.js","moduleParts":{"dist/rapid.js":"4e31-2233"},"imported":[{"uid":"4e31-2062"},{"uid":"4e31-2086"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2234":{"id":"modules/ui/index.js","moduleParts":{"dist/rapid.js":"4e31-2235"},"imported":[{"uid":"4e31-2108"},{"uid":"4e31-1948"},{"uid":"4e31-1950"},{"uid":"4e31-802"},{"uid":"4e31-616"},{"uid":"4e31-794"},{"uid":"4e31-788"},{"uid":"4e31-812"},{"uid":"4e31-786"},{"uid":"4e31-784"},{"uid":"4e31-1952"},{"uid":"4e31-828"},{"uid":"4e31-826"},{"uid":"4e31-806"},{"uid":"4e31-1954"},{"uid":"4e31-1990"},{"uid":"4e31-1956"},{"uid":"4e31-1988"},{"uid":"4e31-798"},{"uid":"4e31-1478"},{"uid":"4e31-800"},{"uid":"4e31-1958"},{"uid":"4e31-1960"},{"uid":"4e31-830"},{"uid":"4e31-832"},{"uid":"4e31-1446"},{"uid":"4e31-1444"},{"uid":"4e31-1974"},{"uid":"4e31-2012"},{"uid":"4e31-1976"},{"uid":"4e31-1448"},{"uid":"4e31-1454"},{"uid":"4e31-1450"},{"uid":"4e31-588"},{"uid":"4e31-1978"},{"uid":"4e31-586"},{"uid":"4e31-1456"},{"uid":"4e31-1464"},{"uid":"4e31-1458"},{"uid":"4e31-1460"},{"uid":"4e31-790"},{"uid":"4e31-1994"},{"uid":"4e31-2010"},{"uid":"4e31-1982"},{"uid":"4e31-1984"},{"uid":"4e31-2014"},{"uid":"4e31-2016"},{"uid":"4e31-2018"},{"uid":"4e31-2236"},{"uid":"4e31-2020"},{"uid":"4e31-822"},{"uid":"4e31-796"},{"uid":"4e31-804"},{"uid":"4e31-792"},{"uid":"4e31-2050"},{"uid":"4e31-1462"},{"uid":"4e31-1452"},{"uid":"4e31-2054"},{"uid":"4e31-2038"},{"uid":"4e31-1508"},{"uid":"4e31-1506"},{"uid":"4e31-2042"},{"uid":"4e31-2044"},{"uid":"4e31-2104"},{"uid":"4e31-1504"},{"uid":"4e31-2106"},{"uid":"4e31-2040"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2236":{"id":"modules/ui/splash.js","moduleParts":{"dist/rapid.js":"4e31-2237"},"imported":[{"uid":"4e31-416"},{"uid":"4e31-418"},{"uid":"4e31-498"},{"uid":"4e31-1502"},{"uid":"4e31-586"}],"importedBy":[{"uid":"4e31-2234"}]},"4e31-2238":{"id":"node_modules/d3/src/index.js","moduleParts":{"dist/rapid.js":"4e31-2239"},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2247"},{"uid":"4e31-2242"},{"uid":"4e31-2248"},{"uid":"4e31-290"},{"uid":"4e31-2249"},{"uid":"4e31-2250"},{"uid":"4e31-172"},{"uid":"4e31-284"},{"uid":"4e31-2251"},{"uid":"4e31-384"},{"uid":"4e31-546"},{"uid":"4e31-2252"},{"uid":"4e31-2253"},{"uid":"4e31-146"},{"uid":"4e31-2254"},{"uid":"4e31-316"},{"uid":"4e31-2255"},{"uid":"4e31-162"},{"uid":"4e31-2256"},{"uid":"4e31-2257"},{"uid":"4e31-2258"},{"uid":"4e31-2259"},{"uid":"4e31-266"},{"uid":"4e31-2260"},{"uid":"4e31-2261"},{"uid":"4e31-2262"},{"uid":"4e31-328"},{"uid":"4e31-392"},{"uid":"4e31-404"}],"importedBy":[{"uid":"4e31-104"}]},"4e31-2240":{"id":"node_modules/d3-brush/src/brush.js","moduleParts":{"dist/rapid.js":"4e31-2241"},"imported":[{"uid":"4e31-172"},{"uid":"4e31-284"},{"uid":"4e31-316"},{"uid":"4e31-266"},{"uid":"4e31-392"},{"uid":"4e31-2559"},{"uid":"4e31-2560"},{"uid":"4e31-2561"}],"importedBy":[{"uid":"4e31-2242"}]},"4e31-2242":{"id":"node_modules/d3-brush/src/index.js","moduleParts":{"dist/rapid.js":"4e31-2243"},"imported":[{"uid":"4e31-2240"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2244":{"id":"modules/main.js","moduleParts":{"dist/rapid.js":"4e31-2245"},"imported":[{"uid":"4e31-104"}],"importedBy":[],"isEntry":true},"4e31-2246":{"id":"modules/ui/fields/restrictions.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-540"}]},"4e31-2247":{"id":"node_modules/d3-axis/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2311"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2248":{"id":"node_modules/d3-chord/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2312"},{"uid":"4e31-2313"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2249":{"id":"node_modules/d3-contour/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2316"},{"uid":"4e31-2317"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2250":{"id":"node_modules/d3-delaunay/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2318"},{"uid":"4e31-2319"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2251":{"id":"node_modules/d3-dsv/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2320"},{"uid":"4e31-2321"},{"uid":"4e31-2322"},{"uid":"4e31-2323"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2334"}]},"4e31-2252":{"id":"node_modules/d3-force/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2336"},{"uid":"4e31-2337"},{"uid":"4e31-2338"},{"uid":"4e31-2339"},{"uid":"4e31-2340"},{"uid":"4e31-2341"},{"uid":"4e31-2342"},{"uid":"4e31-2343"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2253":{"id":"node_modules/d3-format/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2344"},{"uid":"4e31-2345"},{"uid":"4e31-2346"},{"uid":"4e31-2347"},{"uid":"4e31-2348"},{"uid":"4e31-2349"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2426"},{"uid":"4e31-2439"}]},"4e31-2254":{"id":"node_modules/d3-hierarchy/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2377"},{"uid":"4e31-2378"},{"uid":"4e31-2379"},{"uid":"4e31-2380"},{"uid":"4e31-2381"},{"uid":"4e31-2382"},{"uid":"4e31-2383"},{"uid":"4e31-2384"},{"uid":"4e31-2385"},{"uid":"4e31-2386"},{"uid":"4e31-2387"},{"uid":"4e31-2388"},{"uid":"4e31-2389"},{"uid":"4e31-2390"},{"uid":"4e31-2391"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2255":{"id":"node_modules/d3-path/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2401"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2313"},{"uid":"4e31-2645"}]},"4e31-2256":{"id":"node_modules/d3-quadtree/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2404"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2337"},{"uid":"4e31-2339"}]},"4e31-2257":{"id":"node_modules/d3-random/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2405"},{"uid":"4e31-2406"},{"uid":"4e31-2407"},{"uid":"4e31-2408"},{"uid":"4e31-2409"},{"uid":"4e31-2410"},{"uid":"4e31-2411"},{"uid":"4e31-2412"},{"uid":"4e31-2413"},{"uid":"4e31-2414"},{"uid":"4e31-2415"},{"uid":"4e31-2416"},{"uid":"4e31-2417"},{"uid":"4e31-2418"},{"uid":"4e31-2419"},{"uid":"4e31-2420"},{"uid":"4e31-2421"},{"uid":"4e31-2422"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2258":{"id":"node_modules/d3-scale/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2423"},{"uid":"4e31-2424"},{"uid":"4e31-2425"},{"uid":"4e31-2426"},{"uid":"4e31-2427"},{"uid":"4e31-2428"},{"uid":"4e31-2429"},{"uid":"4e31-2430"},{"uid":"4e31-2431"},{"uid":"4e31-2432"},{"uid":"4e31-2433"},{"uid":"4e31-2434"},{"uid":"4e31-2435"},{"uid":"4e31-2436"},{"uid":"4e31-2437"},{"uid":"4e31-2438"},{"uid":"4e31-2439"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2259":{"id":"node_modules/d3-scale-chromatic/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2440"},{"uid":"4e31-2441"},{"uid":"4e31-2442"},{"uid":"4e31-2443"},{"uid":"4e31-2444"},{"uid":"4e31-2445"},{"uid":"4e31-2446"},{"uid":"4e31-2447"},{"uid":"4e31-2448"},{"uid":"4e31-2449"},{"uid":"4e31-2450"},{"uid":"4e31-2451"},{"uid":"4e31-2452"},{"uid":"4e31-2453"},{"uid":"4e31-2454"},{"uid":"4e31-2455"},{"uid":"4e31-2456"},{"uid":"4e31-2457"},{"uid":"4e31-2458"},{"uid":"4e31-2459"},{"uid":"4e31-2460"},{"uid":"4e31-2461"},{"uid":"4e31-2462"},{"uid":"4e31-2463"},{"uid":"4e31-2464"},{"uid":"4e31-2465"},{"uid":"4e31-2466"},{"uid":"4e31-2467"},{"uid":"4e31-2468"},{"uid":"4e31-2469"},{"uid":"4e31-2470"},{"uid":"4e31-2471"},{"uid":"4e31-2472"},{"uid":"4e31-2473"},{"uid":"4e31-2474"},{"uid":"4e31-2475"},{"uid":"4e31-2476"},{"uid":"4e31-2477"},{"uid":"4e31-2478"},{"uid":"4e31-2479"},{"uid":"4e31-2480"},{"uid":"4e31-2481"},{"uid":"4e31-2482"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2260":{"id":"node_modules/d3-shape/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2486"},{"uid":"4e31-2487"},{"uid":"4e31-2488"},{"uid":"4e31-2489"},{"uid":"4e31-2490"},{"uid":"4e31-2491"},{"uid":"4e31-2492"},{"uid":"4e31-2493"},{"uid":"4e31-2494"},{"uid":"4e31-2495"},{"uid":"4e31-2496"},{"uid":"4e31-2497"},{"uid":"4e31-2498"},{"uid":"4e31-2499"},{"uid":"4e31-2500"},{"uid":"4e31-2501"},{"uid":"4e31-2502"},{"uid":"4e31-2503"},{"uid":"4e31-2504"},{"uid":"4e31-2505"},{"uid":"4e31-2506"},{"uid":"4e31-2507"},{"uid":"4e31-2508"},{"uid":"4e31-2509"},{"uid":"4e31-2510"},{"uid":"4e31-2511"},{"uid":"4e31-2512"},{"uid":"4e31-2513"},{"uid":"4e31-2514"},{"uid":"4e31-2515"},{"uid":"4e31-2516"},{"uid":"4e31-2517"},{"uid":"4e31-2518"},{"uid":"4e31-2519"},{"uid":"4e31-2520"},{"uid":"4e31-2521"},{"uid":"4e31-2522"},{"uid":"4e31-2523"},{"uid":"4e31-2524"},{"uid":"4e31-2525"},{"uid":"4e31-2526"},{"uid":"4e31-2527"},{"uid":"4e31-2528"},{"uid":"4e31-2529"},{"uid":"4e31-2530"},{"uid":"4e31-2531"},{"uid":"4e31-2532"},{"uid":"4e31-2533"},{"uid":"4e31-2534"},{"uid":"4e31-2535"}],"importedBy":[{"uid":"4e31-2238"}]},"4e31-2261":{"id":"node_modules/d3-time/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2536"},{"uid":"4e31-2537"},{"uid":"4e31-2538"},{"uid":"4e31-2539"},{"uid":"4e31-2540"},{"uid":"4e31-2541"},{"uid":"4e31-2542"},{"uid":"4e31-2543"},{"uid":"4e31-2544"},{"uid":"4e31-2545"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2434"},{"uid":"4e31-2435"},{"uid":"4e31-2547"}]},"4e31-2262":{"id":"node_modules/d3-time-format/src/index.js","moduleParts":{},"imported":[{"uid":"4e31-2546"},{"uid":"4e31-2547"},{"uid":"4e31-2548"},{"uid":"4e31-2549"}],"importedBy":[{"uid":"4e31-2238"},{"uid":"4e31-2434"},{"uid":"4e31-2435"}]},"4e31-2263":{"id":"node_modules/d3-array/src/bisect.js","moduleParts":{},"imported":[{"uid":"4e31-116"},{"uid":"4e31-2264"},{"uid":"4e31-120"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2273"}]},"4e31-2264":{"id":"node_modules/d3-array/src/bisector.js","moduleParts":{},"imported":[{"uid":"4e31-116"},{"uid":"4e31-118"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2263"}]},"4e31-2265":{"id":"node_modules/d3-array/src/blur.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2266":{"id":"node_modules/d3-array/src/count.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2274"},{"uid":"4e31-2275"},{"uid":"4e31-2276"}]},"4e31-2267":{"id":"node_modules/d3-array/src/cross.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2268":{"id":"node_modules/d3-array/src/cumsum.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2269":{"id":"node_modules/d3-array/src/deviation.js","moduleParts":{},"imported":[{"uid":"4e31-2296"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2275"}]},"4e31-2270":{"id":"node_modules/d3-array/src/extent.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2273"}]},"4e31-2271":{"id":"node_modules/d3-array/src/group.js","moduleParts":{},"imported":[{"uid":"4e31-2310"},{"uid":"4e31-2555"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2272"}]},"4e31-2272":{"id":"node_modules/d3-array/src/groupSort.js","moduleParts":{},"imported":[{"uid":"4e31-116"},{"uid":"4e31-2271"},{"uid":"4e31-126"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2273":{"id":"node_modules/d3-array/src/bin.js","moduleParts":{},"imported":[{"uid":"4e31-2556"},{"uid":"4e31-2263"},{"uid":"4e31-2557"},{"uid":"4e31-2270"},{"uid":"4e31-2555"},{"uid":"4e31-2282"},{"uid":"4e31-2294"},{"uid":"4e31-2276"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2274":{"id":"node_modules/d3-array/src/threshold/freedmanDiaconis.js","moduleParts":{},"imported":[{"uid":"4e31-2266"},{"uid":"4e31-134"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2275":{"id":"node_modules/d3-array/src/threshold/scott.js","moduleParts":{},"imported":[{"uid":"4e31-2266"},{"uid":"4e31-2269"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2276":{"id":"node_modules/d3-array/src/threshold/sturges.js","moduleParts":{},"imported":[{"uid":"4e31-2266"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2273"}]},"4e31-2277":{"id":"node_modules/d3-array/src/maxIndex.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-134"},{"uid":"4e31-2290"}]},"4e31-2278":{"id":"node_modules/d3-array/src/mean.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2279":{"id":"node_modules/d3-array/src/merge.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2280":{"id":"node_modules/d3-array/src/minIndex.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-134"},{"uid":"4e31-2288"}]},"4e31-2281":{"id":"node_modules/d3-array/src/mode.js","moduleParts":{},"imported":[{"uid":"4e31-2310"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2282":{"id":"node_modules/d3-array/src/nice.js","moduleParts":{},"imported":[{"uid":"4e31-2294"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2273"}]},"4e31-2283":{"id":"node_modules/d3-array/src/pairs.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2284":{"id":"node_modules/d3-array/src/permute.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-126"}]},"4e31-2285":{"id":"node_modules/d3-array/src/range.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2286":{"id":"node_modules/d3-array/src/rank.js","moduleParts":{},"imported":[{"uid":"4e31-116"},{"uid":"4e31-126"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2287":{"id":"node_modules/d3-array/src/least.js","moduleParts":{},"imported":[{"uid":"4e31-116"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2288":{"id":"node_modules/d3-array/src/leastIndex.js","moduleParts":{},"imported":[{"uid":"4e31-116"},{"uid":"4e31-2280"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2291"}]},"4e31-2289":{"id":"node_modules/d3-array/src/greatest.js","moduleParts":{},"imported":[{"uid":"4e31-116"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-134"}]},"4e31-2290":{"id":"node_modules/d3-array/src/greatestIndex.js","moduleParts":{},"imported":[{"uid":"4e31-116"},{"uid":"4e31-2277"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2291":{"id":"node_modules/d3-array/src/scan.js","moduleParts":{},"imported":[{"uid":"4e31-2288"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2292":{"id":"node_modules/d3-array/src/shuffle.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2293":{"id":"node_modules/d3-array/src/sum.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2294":{"id":"node_modules/d3-array/src/ticks.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2273"},{"uid":"4e31-2282"}]},"4e31-2295":{"id":"node_modules/d3-array/src/transpose.js","moduleParts":{},"imported":[{"uid":"4e31-130"}],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2297"}]},"4e31-2296":{"id":"node_modules/d3-array/src/variance.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2269"}]},"4e31-2297":{"id":"node_modules/d3-array/src/zip.js","moduleParts":{},"imported":[{"uid":"4e31-2295"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2298":{"id":"node_modules/d3-array/src/every.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2299":{"id":"node_modules/d3-array/src/some.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2300":{"id":"node_modules/d3-array/src/filter.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2301":{"id":"node_modules/d3-array/src/map.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2302":{"id":"node_modules/d3-array/src/reduce.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2303":{"id":"node_modules/d3-array/src/reverse.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"}]},"4e31-2304":{"id":"node_modules/d3-array/src/difference.js","moduleParts":{},"imported":[{"uid":"4e31-2310"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2305":{"id":"node_modules/d3-array/src/disjoint.js","moduleParts":{},"imported":[{"uid":"4e31-2310"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2306":{"id":"node_modules/d3-array/src/intersection.js","moduleParts":{},"imported":[{"uid":"4e31-2310"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2307":{"id":"node_modules/d3-array/src/subset.js","moduleParts":{},"imported":[{"uid":"4e31-2308"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2308":{"id":"node_modules/d3-array/src/superset.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2307"}]},"4e31-2309":{"id":"node_modules/d3-array/src/union.js","moduleParts":{},"imported":[{"uid":"4e31-2310"}],"importedBy":[{"uid":"4e31-122"}]},"4e31-2310":{"id":"node_modules/internmap/src/index.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-122"},{"uid":"4e31-2271"},{"uid":"4e31-2281"},{"uid":"4e31-2304"},{"uid":"4e31-2305"},{"uid":"4e31-2306"},{"uid":"4e31-2309"}]},"4e31-2311":{"id":"node_modules/d3-axis/src/axis.js","moduleParts":{},"imported":[{"uid":"4e31-2558"}],"importedBy":[{"uid":"4e31-2247"}]},"4e31-2312":{"id":"node_modules/d3-chord/src/chord.js","moduleParts":{},"imported":[{"uid":"4e31-2562"}],"importedBy":[{"uid":"4e31-2248"}]},"4e31-2313":{"id":"node_modules/d3-chord/src/ribbon.js","moduleParts":{},"imported":[{"uid":"4e31-2255"},{"uid":"4e31-2563"},{"uid":"4e31-2564"},{"uid":"4e31-2562"}],"importedBy":[{"uid":"4e31-2248"}]},"4e31-2314":{"id":"node_modules/d3-color/src/lab.js","moduleParts":{},"imported":[{"uid":"4e31-286"},{"uid":"4e31-288"},{"uid":"4e31-2565"}],"importedBy":[{"uid":"4e31-290"}]},"4e31-2315":{"id":"node_modules/d3-color/src/cubehelix.js","moduleParts":{},"imported":[{"uid":"4e31-286"},{"uid":"4e31-288"},{"uid":"4e31-2565"}],"importedBy":[{"uid":"4e31-290"}]},"4e31-2316":{"id":"node_modules/d3-contour/src/contours.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2566"},{"uid":"4e31-2567"},{"uid":"4e31-2568"},{"uid":"4e31-2569"},{"uid":"4e31-2570"},{"uid":"4e31-2571"}],"importedBy":[{"uid":"4e31-2249"},{"uid":"4e31-2317"}]},"4e31-2317":{"id":"node_modules/d3-contour/src/density.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2566"},{"uid":"4e31-2569"},{"uid":"4e31-2316"}],"importedBy":[{"uid":"4e31-2249"}]},"4e31-2318":{"id":"node_modules/d3-delaunay/src/delaunay.js","moduleParts":{},"imported":[{"uid":"4e31-2572"},{"uid":"4e31-2573"},{"uid":"4e31-2574"},{"uid":"4e31-2319"}],"importedBy":[{"uid":"4e31-2250"}]},"4e31-2319":{"id":"node_modules/d3-delaunay/src/voronoi.js","moduleParts":{},"imported":[{"uid":"4e31-2573"},{"uid":"4e31-2574"}],"importedBy":[{"uid":"4e31-2250"},{"uid":"4e31-2318"}]},"4e31-2320":{"id":"node_modules/d3-dsv/src/dsv.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2251"},{"uid":"4e31-2321"},{"uid":"4e31-2322"}]},"4e31-2321":{"id":"node_modules/d3-dsv/src/csv.js","moduleParts":{},"imported":[{"uid":"4e31-2320"}],"importedBy":[{"uid":"4e31-2251"}]},"4e31-2322":{"id":"node_modules/d3-dsv/src/tsv.js","moduleParts":{},"imported":[{"uid":"4e31-2320"}],"importedBy":[{"uid":"4e31-2251"}]},"4e31-2323":{"id":"node_modules/d3-dsv/src/autoType.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2251"}]},"4e31-2324":{"id":"node_modules/d3-ease/src/quad.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-2325":{"id":"node_modules/d3-ease/src/poly.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-2326":{"id":"node_modules/d3-ease/src/sin.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-2327":{"id":"node_modules/d3-ease/src/exp.js","moduleParts":{},"imported":[{"uid":"4e31-2575"}],"importedBy":[{"uid":"4e31-384"}]},"4e31-2328":{"id":"node_modules/d3-ease/src/circle.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-2329":{"id":"node_modules/d3-ease/src/bounce.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-2330":{"id":"node_modules/d3-ease/src/back.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-384"}]},"4e31-2331":{"id":"node_modules/d3-ease/src/elastic.js","moduleParts":{},"imported":[{"uid":"4e31-2575"}],"importedBy":[{"uid":"4e31-384"}]},"4e31-2332":{"id":"node_modules/d3-fetch/src/blob.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-546"}]},"4e31-2333":{"id":"node_modules/d3-fetch/src/buffer.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-546"}]},"4e31-2334":{"id":"node_modules/d3-fetch/src/dsv.js","moduleParts":{},"imported":[{"uid":"4e31-2251"},{"uid":"4e31-542"}],"importedBy":[{"uid":"4e31-546"}]},"4e31-2335":{"id":"node_modules/d3-fetch/src/image.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-546"}]},"4e31-2336":{"id":"node_modules/d3-force/src/center.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2252"}]},"4e31-2337":{"id":"node_modules/d3-force/src/collide.js","moduleParts":{},"imported":[{"uid":"4e31-2256"},{"uid":"4e31-2576"},{"uid":"4e31-2577"}],"importedBy":[{"uid":"4e31-2252"}]},"4e31-2338":{"id":"node_modules/d3-force/src/link.js","moduleParts":{},"imported":[{"uid":"4e31-2576"},{"uid":"4e31-2577"}],"importedBy":[{"uid":"4e31-2252"}]},"4e31-2339":{"id":"node_modules/d3-force/src/manyBody.js","moduleParts":{},"imported":[{"uid":"4e31-2256"},{"uid":"4e31-2576"},{"uid":"4e31-2577"},{"uid":"4e31-2341"}],"importedBy":[{"uid":"4e31-2252"}]},"4e31-2340":{"id":"node_modules/d3-force/src/radial.js","moduleParts":{},"imported":[{"uid":"4e31-2576"}],"importedBy":[{"uid":"4e31-2252"}]},"4e31-2341":{"id":"node_modules/d3-force/src/simulation.js","moduleParts":{},"imported":[{"uid":"4e31-172"},{"uid":"4e31-328"},{"uid":"4e31-2578"}],"importedBy":[{"uid":"4e31-2252"},{"uid":"4e31-2339"}]},"4e31-2342":{"id":"node_modules/d3-force/src/x.js","moduleParts":{},"imported":[{"uid":"4e31-2576"}],"importedBy":[{"uid":"4e31-2252"}]},"4e31-2343":{"id":"node_modules/d3-force/src/y.js","moduleParts":{},"imported":[{"uid":"4e31-2576"}],"importedBy":[{"uid":"4e31-2252"}]},"4e31-2344":{"id":"node_modules/d3-format/src/defaultLocale.js","moduleParts":{},"imported":[{"uid":"4e31-2345"}],"importedBy":[{"uid":"4e31-2253"}]},"4e31-2345":{"id":"node_modules/d3-format/src/locale.js","moduleParts":{},"imported":[{"uid":"4e31-2579"},{"uid":"4e31-2580"},{"uid":"4e31-2581"},{"uid":"4e31-2346"},{"uid":"4e31-2582"},{"uid":"4e31-2583"},{"uid":"4e31-2584"},{"uid":"4e31-2585"}],"importedBy":[{"uid":"4e31-2253"},{"uid":"4e31-2344"}]},"4e31-2346":{"id":"node_modules/d3-format/src/formatSpecifier.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2253"},{"uid":"4e31-2345"}]},"4e31-2347":{"id":"node_modules/d3-format/src/precisionFixed.js","moduleParts":{},"imported":[{"uid":"4e31-2579"}],"importedBy":[{"uid":"4e31-2253"}]},"4e31-2348":{"id":"node_modules/d3-format/src/precisionPrefix.js","moduleParts":{},"imported":[{"uid":"4e31-2579"}],"importedBy":[{"uid":"4e31-2253"}]},"4e31-2349":{"id":"node_modules/d3-format/src/precisionRound.js","moduleParts":{},"imported":[{"uid":"4e31-2579"}],"importedBy":[{"uid":"4e31-2253"}]},"4e31-2350":{"id":"node_modules/d3-geo/src/circle.js","moduleParts":{},"imported":[{"uid":"4e31-148"},{"uid":"4e31-2586"},{"uid":"4e31-138"},{"uid":"4e31-2376"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2352"}]},"4e31-2351":{"id":"node_modules/d3-geo/src/clip/antimeridian.js","moduleParts":{},"imported":[{"uid":"4e31-2587"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2371"}]},"4e31-2352":{"id":"node_modules/d3-geo/src/clip/circle.js","moduleParts":{},"imported":[{"uid":"4e31-148"},{"uid":"4e31-2350"},{"uid":"4e31-138"},{"uid":"4e31-2588"},{"uid":"4e31-2587"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2371"}]},"4e31-2353":{"id":"node_modules/d3-geo/src/clip/extent.js","moduleParts":{},"imported":[{"uid":"4e31-2354"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2354":{"id":"node_modules/d3-geo/src/clip/rectangle.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2589"},{"uid":"4e31-2590"},{"uid":"4e31-2591"},{"uid":"4e31-122"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2353"},{"uid":"4e31-2370"},{"uid":"4e31-2371"}]},"4e31-2355":{"id":"node_modules/d3-geo/src/contains.js","moduleParts":{},"imported":[{"uid":"4e31-2592"},{"uid":"4e31-2356"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2356":{"id":"node_modules/d3-geo/src/distance.js","moduleParts":{},"imported":[{"uid":"4e31-154"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2355"}]},"4e31-2357":{"id":"node_modules/d3-geo/src/graticule.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2358":{"id":"node_modules/d3-geo/src/interpolate.js","moduleParts":{},"imported":[{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2359":{"id":"node_modules/d3-geo/src/path/index.js","moduleParts":{},"imported":[{"uid":"4e31-2593"},{"uid":"4e31-142"},{"uid":"4e31-2594"},{"uid":"4e31-2595"},{"uid":"4e31-2596"},{"uid":"4e31-2597"},{"uid":"4e31-2598"},{"uid":"4e31-2599"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2360":{"id":"node_modules/d3-geo/src/projection/albers.js","moduleParts":{},"imported":[{"uid":"4e31-2365"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2361"}]},"4e31-2361":{"id":"node_modules/d3-geo/src/projection/albersUsa.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2360"},{"uid":"4e31-2365"},{"uid":"4e31-2600"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2362":{"id":"node_modules/d3-geo/src/projection/azimuthalEqualArea.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2601"},{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2363":{"id":"node_modules/d3-geo/src/projection/azimuthalEquidistant.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2601"},{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2364":{"id":"node_modules/d3-geo/src/projection/conicConformal.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2602"},{"uid":"4e31-158"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2365":{"id":"node_modules/d3-geo/src/projection/conicEqualArea.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2602"},{"uid":"4e31-2603"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2360"},{"uid":"4e31-2361"}]},"4e31-2366":{"id":"node_modules/d3-geo/src/projection/conicEquidistant.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2602"},{"uid":"4e31-2368"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2367":{"id":"node_modules/d3-geo/src/projection/equalEarth.js","moduleParts":{},"imported":[{"uid":"4e31-2371"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2368":{"id":"node_modules/d3-geo/src/projection/equirectangular.js","moduleParts":{},"imported":[{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2366"}]},"4e31-2369":{"id":"node_modules/d3-geo/src/projection/gnomonic.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2601"},{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2370":{"id":"node_modules/d3-geo/src/projection/identity.js","moduleParts":{},"imported":[{"uid":"4e31-2354"},{"uid":"4e31-2593"},{"uid":"4e31-156"},{"uid":"4e31-2600"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2371":{"id":"node_modules/d3-geo/src/projection/index.js","moduleParts":{},"imported":[{"uid":"4e31-2351"},{"uid":"4e31-2352"},{"uid":"4e31-2354"},{"uid":"4e31-2604"},{"uid":"4e31-2593"},{"uid":"4e31-138"},{"uid":"4e31-2376"},{"uid":"4e31-156"},{"uid":"4e31-2600"},{"uid":"4e31-2605"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2362"},{"uid":"4e31-2363"},{"uid":"4e31-2367"},{"uid":"4e31-2368"},{"uid":"4e31-2369"},{"uid":"4e31-158"},{"uid":"4e31-2372"},{"uid":"4e31-2373"},{"uid":"4e31-2374"},{"uid":"4e31-2602"}]},"4e31-2372":{"id":"node_modules/d3-geo/src/projection/naturalEarth1.js","moduleParts":{},"imported":[{"uid":"4e31-2371"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2373":{"id":"node_modules/d3-geo/src/projection/orthographic.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2601"},{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2374":{"id":"node_modules/d3-geo/src/projection/stereographic.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2601"},{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2375":{"id":"node_modules/d3-geo/src/projection/transverseMercator.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-158"}],"importedBy":[{"uid":"4e31-146"}]},"4e31-2376":{"id":"node_modules/d3-geo/src/rotation.js","moduleParts":{},"imported":[{"uid":"4e31-2604"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-146"},{"uid":"4e31-2350"},{"uid":"4e31-2371"},{"uid":"4e31-158"}]},"4e31-2377":{"id":"node_modules/d3-hierarchy/src/cluster.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2378":{"id":"node_modules/d3-hierarchy/src/hierarchy/index.js","moduleParts":{},"imported":[{"uid":"4e31-2606"},{"uid":"4e31-2607"},{"uid":"4e31-2608"},{"uid":"4e31-2609"},{"uid":"4e31-2610"},{"uid":"4e31-2611"},{"uid":"4e31-2612"},{"uid":"4e31-2613"},{"uid":"4e31-2614"},{"uid":"4e31-2615"},{"uid":"4e31-2616"},{"uid":"4e31-2617"},{"uid":"4e31-2618"}],"importedBy":[{"uid":"4e31-2254"},{"uid":"4e31-2383"},{"uid":"4e31-2384"}]},"4e31-2379":{"id":"node_modules/d3-hierarchy/src/pack/index.js","moduleParts":{},"imported":[{"uid":"4e31-2619"},{"uid":"4e31-2620"},{"uid":"4e31-2621"},{"uid":"4e31-2380"}],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2380":{"id":"node_modules/d3-hierarchy/src/pack/siblings.js","moduleParts":{},"imported":[{"uid":"4e31-2622"},{"uid":"4e31-2621"},{"uid":"4e31-2381"}],"importedBy":[{"uid":"4e31-2254"},{"uid":"4e31-2379"}]},"4e31-2381":{"id":"node_modules/d3-hierarchy/src/pack/enclose.js","moduleParts":{},"imported":[{"uid":"4e31-2622"},{"uid":"4e31-2621"}],"importedBy":[{"uid":"4e31-2254"},{"uid":"4e31-2380"}]},"4e31-2382":{"id":"node_modules/d3-hierarchy/src/partition.js","moduleParts":{},"imported":[{"uid":"4e31-2623"},{"uid":"4e31-2387"}],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2383":{"id":"node_modules/d3-hierarchy/src/stratify.js","moduleParts":{},"imported":[{"uid":"4e31-2619"},{"uid":"4e31-2378"}],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2384":{"id":"node_modules/d3-hierarchy/src/tree.js","moduleParts":{},"imported":[{"uid":"4e31-2378"}],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2385":{"id":"node_modules/d3-hierarchy/src/treemap/index.js","moduleParts":{},"imported":[{"uid":"4e31-2623"},{"uid":"4e31-2390"},{"uid":"4e31-2619"},{"uid":"4e31-2620"}],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2386":{"id":"node_modules/d3-hierarchy/src/treemap/binary.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2387":{"id":"node_modules/d3-hierarchy/src/treemap/dice.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2254"},{"uid":"4e31-2382"},{"uid":"4e31-2389"},{"uid":"4e31-2390"},{"uid":"4e31-2391"}]},"4e31-2388":{"id":"node_modules/d3-hierarchy/src/treemap/slice.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2254"},{"uid":"4e31-2389"},{"uid":"4e31-2390"},{"uid":"4e31-2391"}]},"4e31-2389":{"id":"node_modules/d3-hierarchy/src/treemap/sliceDice.js","moduleParts":{},"imported":[{"uid":"4e31-2387"},{"uid":"4e31-2388"}],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2390":{"id":"node_modules/d3-hierarchy/src/treemap/squarify.js","moduleParts":{},"imported":[{"uid":"4e31-2387"},{"uid":"4e31-2388"}],"importedBy":[{"uid":"4e31-2254"},{"uid":"4e31-2385"},{"uid":"4e31-2391"}]},"4e31-2391":{"id":"node_modules/d3-hierarchy/src/treemap/resquarify.js","moduleParts":{},"imported":[{"uid":"4e31-2387"},{"uid":"4e31-2388"},{"uid":"4e31-2390"}],"importedBy":[{"uid":"4e31-2254"}]},"4e31-2392":{"id":"node_modules/d3-interpolate/src/discrete.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-316"}]},"4e31-2393":{"id":"node_modules/d3-interpolate/src/hue.js","moduleParts":{},"imported":[{"uid":"4e31-298"}],"importedBy":[{"uid":"4e31-316"}]},"4e31-2394":{"id":"node_modules/d3-interpolate/src/round.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-316"}]},"4e31-2395":{"id":"node_modules/d3-interpolate/src/hsl.js","moduleParts":{},"imported":[{"uid":"4e31-290"},{"uid":"4e31-298"}],"importedBy":[{"uid":"4e31-316"}]},"4e31-2396":{"id":"node_modules/d3-interpolate/src/lab.js","moduleParts":{},"imported":[{"uid":"4e31-290"},{"uid":"4e31-298"}],"importedBy":[{"uid":"4e31-316"}]},"4e31-2397":{"id":"node_modules/d3-interpolate/src/hcl.js","moduleParts":{},"imported":[{"uid":"4e31-290"},{"uid":"4e31-298"}],"importedBy":[{"uid":"4e31-316"}]},"4e31-2398":{"id":"node_modules/d3-interpolate/src/cubehelix.js","moduleParts":{},"imported":[{"uid":"4e31-290"},{"uid":"4e31-298"}],"importedBy":[{"uid":"4e31-316"}]},"4e31-2399":{"id":"node_modules/d3-interpolate/src/piecewise.js","moduleParts":{},"imported":[{"uid":"4e31-314"}],"importedBy":[{"uid":"4e31-316"}]},"4e31-2400":{"id":"node_modules/d3-interpolate/src/quantize.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-316"}]},"4e31-2401":{"id":"node_modules/d3-path/src/path.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2255"}]},"4e31-2402":{"id":"node_modules/d3-polygon/src/contains.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-162"}]},"4e31-2403":{"id":"node_modules/d3-polygon/src/length.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-162"}]},"4e31-2404":{"id":"node_modules/d3-quadtree/src/quadtree.js","moduleParts":{},"imported":[{"uid":"4e31-2624"},{"uid":"4e31-2625"},{"uid":"4e31-2626"},{"uid":"4e31-2627"},{"uid":"4e31-2628"},{"uid":"4e31-2629"},{"uid":"4e31-2630"},{"uid":"4e31-2631"},{"uid":"4e31-2632"},{"uid":"4e31-2633"},{"uid":"4e31-2634"},{"uid":"4e31-2635"}],"importedBy":[{"uid":"4e31-2256"}]},"4e31-2405":{"id":"node_modules/d3-random/src/uniform.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2406":{"id":"node_modules/d3-random/src/int.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2407":{"id":"node_modules/d3-random/src/normal.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"},{"uid":"4e31-2408"},{"uid":"4e31-2416"}]},"4e31-2408":{"id":"node_modules/d3-random/src/logNormal.js","moduleParts":{},"imported":[{"uid":"4e31-2636"},{"uid":"4e31-2407"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2409":{"id":"node_modules/d3-random/src/bates.js","moduleParts":{},"imported":[{"uid":"4e31-2636"},{"uid":"4e31-2410"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2410":{"id":"node_modules/d3-random/src/irwinHall.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"},{"uid":"4e31-2409"}]},"4e31-2411":{"id":"node_modules/d3-random/src/exponential.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2412":{"id":"node_modules/d3-random/src/pareto.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2413":{"id":"node_modules/d3-random/src/bernoulli.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2414":{"id":"node_modules/d3-random/src/geometric.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"},{"uid":"4e31-2415"}]},"4e31-2415":{"id":"node_modules/d3-random/src/binomial.js","moduleParts":{},"imported":[{"uid":"4e31-2636"},{"uid":"4e31-2417"},{"uid":"4e31-2414"}],"importedBy":[{"uid":"4e31-2257"},{"uid":"4e31-2421"}]},"4e31-2416":{"id":"node_modules/d3-random/src/gamma.js","moduleParts":{},"imported":[{"uid":"4e31-2636"},{"uid":"4e31-2407"}],"importedBy":[{"uid":"4e31-2257"},{"uid":"4e31-2417"},{"uid":"4e31-2421"}]},"4e31-2417":{"id":"node_modules/d3-random/src/beta.js","moduleParts":{},"imported":[{"uid":"4e31-2636"},{"uid":"4e31-2416"}],"importedBy":[{"uid":"4e31-2257"},{"uid":"4e31-2415"}]},"4e31-2418":{"id":"node_modules/d3-random/src/weibull.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2419":{"id":"node_modules/d3-random/src/cauchy.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2420":{"id":"node_modules/d3-random/src/logistic.js","moduleParts":{},"imported":[{"uid":"4e31-2636"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2421":{"id":"node_modules/d3-random/src/poisson.js","moduleParts":{},"imported":[{"uid":"4e31-2636"},{"uid":"4e31-2415"},{"uid":"4e31-2416"}],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2422":{"id":"node_modules/d3-random/src/lcg.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2257"}]},"4e31-2423":{"id":"node_modules/d3-scale/src/band.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2637"},{"uid":"4e31-2428"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2424":{"id":"node_modules/d3-scale/src/identity.js","moduleParts":{},"imported":[{"uid":"4e31-2425"},{"uid":"4e31-2638"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2425":{"id":"node_modules/d3-scale/src/linear.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2639"},{"uid":"4e31-2637"},{"uid":"4e31-2439"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2424"},{"uid":"4e31-2427"},{"uid":"4e31-2429"},{"uid":"4e31-2430"},{"uid":"4e31-2432"},{"uid":"4e31-2436"},{"uid":"4e31-2438"}]},"4e31-2426":{"id":"node_modules/d3-scale/src/log.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2253"},{"uid":"4e31-2640"},{"uid":"4e31-2639"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2436"},{"uid":"4e31-2438"}]},"4e31-2427":{"id":"node_modules/d3-scale/src/symlog.js","moduleParts":{},"imported":[{"uid":"4e31-2425"},{"uid":"4e31-2639"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2436"},{"uid":"4e31-2438"}]},"4e31-2428":{"id":"node_modules/d3-scale/src/ordinal.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2423"}]},"4e31-2429":{"id":"node_modules/d3-scale/src/pow.js","moduleParts":{},"imported":[{"uid":"4e31-2425"},{"uid":"4e31-2639"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2436"},{"uid":"4e31-2438"}]},"4e31-2430":{"id":"node_modules/d3-scale/src/radial.js","moduleParts":{},"imported":[{"uid":"4e31-2639"},{"uid":"4e31-2637"},{"uid":"4e31-2425"},{"uid":"4e31-2638"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2431":{"id":"node_modules/d3-scale/src/quantile.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2432":{"id":"node_modules/d3-scale/src/quantize.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2425"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2433":{"id":"node_modules/d3-scale/src/threshold.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2434":{"id":"node_modules/d3-scale/src/time.js","moduleParts":{},"imported":[{"uid":"4e31-2261"},{"uid":"4e31-2262"},{"uid":"4e31-2639"},{"uid":"4e31-2637"},{"uid":"4e31-2640"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2435"}]},"4e31-2435":{"id":"node_modules/d3-scale/src/utcTime.js","moduleParts":{},"imported":[{"uid":"4e31-2261"},{"uid":"4e31-2262"},{"uid":"4e31-2434"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2436":{"id":"node_modules/d3-scale/src/sequential.js","moduleParts":{},"imported":[{"uid":"4e31-316"},{"uid":"4e31-2639"},{"uid":"4e31-2637"},{"uid":"4e31-2425"},{"uid":"4e31-2426"},{"uid":"4e31-2427"},{"uid":"4e31-2429"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2438"}]},"4e31-2437":{"id":"node_modules/d3-scale/src/sequentialQuantile.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2639"},{"uid":"4e31-2637"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2438":{"id":"node_modules/d3-scale/src/diverging.js","moduleParts":{},"imported":[{"uid":"4e31-316"},{"uid":"4e31-2639"},{"uid":"4e31-2637"},{"uid":"4e31-2425"},{"uid":"4e31-2426"},{"uid":"4e31-2436"},{"uid":"4e31-2427"},{"uid":"4e31-2429"}],"importedBy":[{"uid":"4e31-2258"}]},"4e31-2439":{"id":"node_modules/d3-scale/src/tickFormat.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2253"}],"importedBy":[{"uid":"4e31-2258"},{"uid":"4e31-2425"}]},"4e31-2440":{"id":"node_modules/d3-scale-chromatic/src/categorical/category10.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2441":{"id":"node_modules/d3-scale-chromatic/src/categorical/Accent.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2442":{"id":"node_modules/d3-scale-chromatic/src/categorical/Dark2.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2443":{"id":"node_modules/d3-scale-chromatic/src/categorical/Paired.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2444":{"id":"node_modules/d3-scale-chromatic/src/categorical/Pastel1.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2445":{"id":"node_modules/d3-scale-chromatic/src/categorical/Pastel2.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2446":{"id":"node_modules/d3-scale-chromatic/src/categorical/Set1.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2447":{"id":"node_modules/d3-scale-chromatic/src/categorical/Set2.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2448":{"id":"node_modules/d3-scale-chromatic/src/categorical/Set3.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2449":{"id":"node_modules/d3-scale-chromatic/src/categorical/Tableau10.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2450":{"id":"node_modules/d3-scale-chromatic/src/diverging/BrBG.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2451":{"id":"node_modules/d3-scale-chromatic/src/diverging/PRGn.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2452":{"id":"node_modules/d3-scale-chromatic/src/diverging/PiYG.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2453":{"id":"node_modules/d3-scale-chromatic/src/diverging/PuOr.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2454":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdBu.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2455":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdGy.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2456":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdYlBu.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2457":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdYlGn.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2458":{"id":"node_modules/d3-scale-chromatic/src/diverging/Spectral.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2459":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/BuGn.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2460":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/BuPu.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2461":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/GnBu.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2462":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/OrRd.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2463":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/PuBuGn.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2464":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/PuBu.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2465":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/PuRd.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2466":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/RdPu.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2467":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlGnBu.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2468":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlGn.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2469":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlOrBr.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2470":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlOrRd.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2471":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Blues.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2472":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Greens.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2473":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Greys.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2474":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Purples.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2475":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Reds.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2476":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Oranges.js","moduleParts":{},"imported":[{"uid":"4e31-2641"},{"uid":"4e31-2642"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2477":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/cividis.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2478":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/cubehelix.js","moduleParts":{},"imported":[{"uid":"4e31-290"},{"uid":"4e31-316"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2479":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/rainbow.js","moduleParts":{},"imported":[{"uid":"4e31-290"},{"uid":"4e31-316"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2480":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/sinebow.js","moduleParts":{},"imported":[{"uid":"4e31-290"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2481":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/turbo.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2482":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/viridis.js","moduleParts":{},"imported":[{"uid":"4e31-2641"}],"importedBy":[{"uid":"4e31-2259"}]},"4e31-2483":{"id":"node_modules/d3-selection/src/create.js","moduleParts":{},"imported":[{"uid":"4e31-178"},{"uid":"4e31-264"}],"importedBy":[{"uid":"4e31-266"}]},"4e31-2484":{"id":"node_modules/d3-selection/src/local.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-266"}]},"4e31-2485":{"id":"node_modules/d3-selection/src/pointers.js","moduleParts":{},"imported":[{"uid":"4e31-270"},{"uid":"4e31-268"}],"importedBy":[{"uid":"4e31-266"}]},"4e31-2486":{"id":"node_modules/d3-shape/src/arc.js","moduleParts":{},"imported":[{"uid":"4e31-2643"},{"uid":"4e31-2644"},{"uid":"4e31-2645"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2487":{"id":"node_modules/d3-shape/src/area.js","moduleParts":{},"imported":[{"uid":"4e31-2646"},{"uid":"4e31-2643"},{"uid":"4e31-2520"},{"uid":"4e31-2488"},{"uid":"4e31-2645"},{"uid":"4e31-2647"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2490"}]},"4e31-2488":{"id":"node_modules/d3-shape/src/line.js","moduleParts":{},"imported":[{"uid":"4e31-2646"},{"uid":"4e31-2643"},{"uid":"4e31-2520"},{"uid":"4e31-2645"},{"uid":"4e31-2647"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2487"},{"uid":"4e31-2491"}]},"4e31-2489":{"id":"node_modules/d3-shape/src/pie.js","moduleParts":{},"imported":[{"uid":"4e31-2646"},{"uid":"4e31-2643"},{"uid":"4e31-2648"},{"uid":"4e31-2649"},{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2490":{"id":"node_modules/d3-shape/src/areaRadial.js","moduleParts":{},"imported":[{"uid":"4e31-2650"},{"uid":"4e31-2487"},{"uid":"4e31-2491"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2491":{"id":"node_modules/d3-shape/src/lineRadial.js","moduleParts":{},"imported":[{"uid":"4e31-2650"},{"uid":"4e31-2488"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2490"}]},"4e31-2492":{"id":"node_modules/d3-shape/src/pointRadial.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2511"}]},"4e31-2493":{"id":"node_modules/d3-shape/src/link.js","moduleParts":{},"imported":[{"uid":"4e31-2646"},{"uid":"4e31-2643"},{"uid":"4e31-2511"},{"uid":"4e31-2645"},{"uid":"4e31-2647"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2494":{"id":"node_modules/d3-shape/src/symbol.js","moduleParts":{},"imported":[{"uid":"4e31-2643"},{"uid":"4e31-2645"},{"uid":"4e31-2495"},{"uid":"4e31-2496"},{"uid":"4e31-2497"},{"uid":"4e31-2498"},{"uid":"4e31-2499"},{"uid":"4e31-2500"},{"uid":"4e31-2501"},{"uid":"4e31-2502"},{"uid":"4e31-2503"},{"uid":"4e31-2504"},{"uid":"4e31-2505"},{"uid":"4e31-2506"},{"uid":"4e31-2507"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2495":{"id":"node_modules/d3-shape/src/symbol/asterisk.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2496":{"id":"node_modules/d3-shape/src/symbol/circle.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2497":{"id":"node_modules/d3-shape/src/symbol/cross.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2498":{"id":"node_modules/d3-shape/src/symbol/diamond.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2499":{"id":"node_modules/d3-shape/src/symbol/diamond2.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2500":{"id":"node_modules/d3-shape/src/symbol/plus.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2501":{"id":"node_modules/d3-shape/src/symbol/square.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2502":{"id":"node_modules/d3-shape/src/symbol/square2.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2503":{"id":"node_modules/d3-shape/src/symbol/star.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2504":{"id":"node_modules/d3-shape/src/symbol/triangle.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2505":{"id":"node_modules/d3-shape/src/symbol/triangle2.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2506":{"id":"node_modules/d3-shape/src/symbol/wye.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2507":{"id":"node_modules/d3-shape/src/symbol/times.js","moduleParts":{},"imported":[{"uid":"4e31-2644"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2494"}]},"4e31-2508":{"id":"node_modules/d3-shape/src/curve/basisClosed.js","moduleParts":{},"imported":[{"uid":"4e31-2651"},{"uid":"4e31-2510"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2509":{"id":"node_modules/d3-shape/src/curve/basisOpen.js","moduleParts":{},"imported":[{"uid":"4e31-2510"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2510":{"id":"node_modules/d3-shape/src/curve/basis.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2508"},{"uid":"4e31-2509"},{"uid":"4e31-2512"}]},"4e31-2511":{"id":"node_modules/d3-shape/src/curve/bump.js","moduleParts":{},"imported":[{"uid":"4e31-2492"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2493"}]},"4e31-2512":{"id":"node_modules/d3-shape/src/curve/bundle.js","moduleParts":{},"imported":[{"uid":"4e31-2510"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2513":{"id":"node_modules/d3-shape/src/curve/cardinalClosed.js","moduleParts":{},"imported":[{"uid":"4e31-2651"},{"uid":"4e31-2515"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2516"}]},"4e31-2514":{"id":"node_modules/d3-shape/src/curve/cardinalOpen.js","moduleParts":{},"imported":[{"uid":"4e31-2515"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2517"}]},"4e31-2515":{"id":"node_modules/d3-shape/src/curve/cardinal.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2513"},{"uid":"4e31-2514"},{"uid":"4e31-2518"}]},"4e31-2516":{"id":"node_modules/d3-shape/src/curve/catmullRomClosed.js","moduleParts":{},"imported":[{"uid":"4e31-2513"},{"uid":"4e31-2651"},{"uid":"4e31-2518"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2517":{"id":"node_modules/d3-shape/src/curve/catmullRomOpen.js","moduleParts":{},"imported":[{"uid":"4e31-2514"},{"uid":"4e31-2518"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2518":{"id":"node_modules/d3-shape/src/curve/catmullRom.js","moduleParts":{},"imported":[{"uid":"4e31-2644"},{"uid":"4e31-2515"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2516"},{"uid":"4e31-2517"}]},"4e31-2519":{"id":"node_modules/d3-shape/src/curve/linearClosed.js","moduleParts":{},"imported":[{"uid":"4e31-2651"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2520":{"id":"node_modules/d3-shape/src/curve/linear.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2487"},{"uid":"4e31-2488"},{"uid":"4e31-2650"}]},"4e31-2521":{"id":"node_modules/d3-shape/src/curve/monotone.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2522":{"id":"node_modules/d3-shape/src/curve/natural.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2523":{"id":"node_modules/d3-shape/src/curve/step.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2524":{"id":"node_modules/d3-shape/src/stack.js","moduleParts":{},"imported":[{"uid":"4e31-2646"},{"uid":"4e31-2643"},{"uid":"4e31-2527"},{"uid":"4e31-2534"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2525":{"id":"node_modules/d3-shape/src/offset/expand.js","moduleParts":{},"imported":[{"uid":"4e31-2527"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2526":{"id":"node_modules/d3-shape/src/offset/diverging.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2527":{"id":"node_modules/d3-shape/src/offset/none.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2524"},{"uid":"4e31-2525"},{"uid":"4e31-2528"},{"uid":"4e31-2529"}]},"4e31-2528":{"id":"node_modules/d3-shape/src/offset/silhouette.js","moduleParts":{},"imported":[{"uid":"4e31-2527"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2529":{"id":"node_modules/d3-shape/src/offset/wiggle.js","moduleParts":{},"imported":[{"uid":"4e31-2527"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2530":{"id":"node_modules/d3-shape/src/order/appearance.js","moduleParts":{},"imported":[{"uid":"4e31-2534"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2533"}]},"4e31-2531":{"id":"node_modules/d3-shape/src/order/ascending.js","moduleParts":{},"imported":[{"uid":"4e31-2534"}],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2532"},{"uid":"4e31-2533"}]},"4e31-2532":{"id":"node_modules/d3-shape/src/order/descending.js","moduleParts":{},"imported":[{"uid":"4e31-2531"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2533":{"id":"node_modules/d3-shape/src/order/insideOut.js","moduleParts":{},"imported":[{"uid":"4e31-2530"},{"uid":"4e31-2531"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2534":{"id":"node_modules/d3-shape/src/order/none.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2260"},{"uid":"4e31-2524"},{"uid":"4e31-2530"},{"uid":"4e31-2531"},{"uid":"4e31-2535"}]},"4e31-2535":{"id":"node_modules/d3-shape/src/order/reverse.js","moduleParts":{},"imported":[{"uid":"4e31-2534"}],"importedBy":[{"uid":"4e31-2260"}]},"4e31-2536":{"id":"node_modules/d3-time/src/interval.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2537"},{"uid":"4e31-2538"},{"uid":"4e31-2539"},{"uid":"4e31-2540"},{"uid":"4e31-2541"},{"uid":"4e31-2542"},{"uid":"4e31-2543"},{"uid":"4e31-2544"}]},"4e31-2537":{"id":"node_modules/d3-time/src/millisecond.js","moduleParts":{},"imported":[{"uid":"4e31-2536"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2538":{"id":"node_modules/d3-time/src/second.js","moduleParts":{},"imported":[{"uid":"4e31-2536"},{"uid":"4e31-2652"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2539":{"id":"node_modules/d3-time/src/minute.js","moduleParts":{},"imported":[{"uid":"4e31-2536"},{"uid":"4e31-2652"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2540":{"id":"node_modules/d3-time/src/hour.js","moduleParts":{},"imported":[{"uid":"4e31-2536"},{"uid":"4e31-2652"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2541":{"id":"node_modules/d3-time/src/day.js","moduleParts":{},"imported":[{"uid":"4e31-2536"},{"uid":"4e31-2652"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2542":{"id":"node_modules/d3-time/src/week.js","moduleParts":{},"imported":[{"uid":"4e31-2536"},{"uid":"4e31-2652"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2543":{"id":"node_modules/d3-time/src/month.js","moduleParts":{},"imported":[{"uid":"4e31-2536"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2544":{"id":"node_modules/d3-time/src/year.js","moduleParts":{},"imported":[{"uid":"4e31-2536"}],"importedBy":[{"uid":"4e31-2261"},{"uid":"4e31-2545"}]},"4e31-2545":{"id":"node_modules/d3-time/src/ticks.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-2652"},{"uid":"4e31-2537"},{"uid":"4e31-2538"},{"uid":"4e31-2539"},{"uid":"4e31-2540"},{"uid":"4e31-2541"},{"uid":"4e31-2542"},{"uid":"4e31-2543"},{"uid":"4e31-2544"}],"importedBy":[{"uid":"4e31-2261"}]},"4e31-2546":{"id":"node_modules/d3-time-format/src/defaultLocale.js","moduleParts":{},"imported":[{"uid":"4e31-2547"}],"importedBy":[{"uid":"4e31-2262"},{"uid":"4e31-2548"},{"uid":"4e31-2549"}]},"4e31-2547":{"id":"node_modules/d3-time-format/src/locale.js","moduleParts":{},"imported":[{"uid":"4e31-2261"}],"importedBy":[{"uid":"4e31-2262"},{"uid":"4e31-2546"}]},"4e31-2548":{"id":"node_modules/d3-time-format/src/isoFormat.js","moduleParts":{},"imported":[{"uid":"4e31-2546"}],"importedBy":[{"uid":"4e31-2262"},{"uid":"4e31-2549"}]},"4e31-2549":{"id":"node_modules/d3-time-format/src/isoParse.js","moduleParts":{},"imported":[{"uid":"4e31-2548"},{"uid":"4e31-2546"}],"importedBy":[{"uid":"4e31-2262"}]},"4e31-2550":{"id":"node_modules/d3-timer/src/interval.js","moduleParts":{},"imported":[{"uid":"4e31-326"}],"importedBy":[{"uid":"4e31-328"}]},"4e31-2551":{"id":"node_modules/d3-transition/src/active.js","moduleParts":{},"imported":[{"uid":"4e31-380"},{"uid":"4e31-332"}],"importedBy":[{"uid":"4e31-392"}]},"4e31-2552":{"id":"node_modules/@pixi/utils/lib/types/index.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-420"}]},"4e31-2553":{"id":"<runtime>","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2036"}]},"4e31-2554":{"id":"node_modules/name-suggestion-index/lib/stemmer.js","moduleParts":{},"imported":[{"uid":"4e31-2132"}],"importedBy":[{"uid":"4e31-2140"}]},"4e31-2555":{"id":"node_modules/d3-array/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2271"},{"uid":"4e31-2273"}]},"4e31-2556":{"id":"node_modules/d3-array/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2273"}]},"4e31-2557":{"id":"node_modules/d3-array/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2273"}]},"4e31-2558":{"id":"node_modules/d3-axis/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2311"}]},"4e31-2559":{"id":"node_modules/d3-brush/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2240"}]},"4e31-2560":{"id":"node_modules/d3-brush/src/event.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2240"}]},"4e31-2561":{"id":"node_modules/d3-brush/src/noevent.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2240"}]},"4e31-2562":{"id":"node_modules/d3-chord/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2312"},{"uid":"4e31-2313"}]},"4e31-2563":{"id":"node_modules/d3-chord/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2313"}]},"4e31-2564":{"id":"node_modules/d3-chord/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2313"}]},"4e31-2565":{"id":"node_modules/d3-color/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2314"},{"uid":"4e31-2315"}]},"4e31-2566":{"id":"node_modules/d3-contour/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2316"},{"uid":"4e31-2317"}]},"4e31-2567":{"id":"node_modules/d3-contour/src/ascending.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2316"}]},"4e31-2568":{"id":"node_modules/d3-contour/src/area.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2316"}]},"4e31-2569":{"id":"node_modules/d3-contour/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2316"},{"uid":"4e31-2317"}]},"4e31-2570":{"id":"node_modules/d3-contour/src/contains.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2316"}]},"4e31-2571":{"id":"node_modules/d3-contour/src/noop.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2316"}]},"4e31-2572":{"id":"node_modules/delaunator/index.js","moduleParts":{},"imported":[{"uid":"4e31-2670"}],"importedBy":[{"uid":"4e31-2318"}]},"4e31-2573":{"id":"node_modules/d3-delaunay/src/path.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2318"},{"uid":"4e31-2319"}]},"4e31-2574":{"id":"node_modules/d3-delaunay/src/polygon.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2318"},{"uid":"4e31-2319"}]},"4e31-2575":{"id":"node_modules/d3-ease/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2327"},{"uid":"4e31-2331"}]},"4e31-2576":{"id":"node_modules/d3-force/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2337"},{"uid":"4e31-2338"},{"uid":"4e31-2339"},{"uid":"4e31-2340"},{"uid":"4e31-2342"},{"uid":"4e31-2343"}]},"4e31-2577":{"id":"node_modules/d3-force/src/jiggle.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2337"},{"uid":"4e31-2338"},{"uid":"4e31-2339"}]},"4e31-2578":{"id":"node_modules/d3-force/src/lcg.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2341"}]},"4e31-2579":{"id":"node_modules/d3-format/src/exponent.js","moduleParts":{},"imported":[{"uid":"4e31-2671"}],"importedBy":[{"uid":"4e31-2345"},{"uid":"4e31-2347"},{"uid":"4e31-2348"},{"uid":"4e31-2349"}]},"4e31-2580":{"id":"node_modules/d3-format/src/formatGroup.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2345"}]},"4e31-2581":{"id":"node_modules/d3-format/src/formatNumerals.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2345"}]},"4e31-2582":{"id":"node_modules/d3-format/src/formatTrim.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2345"}]},"4e31-2583":{"id":"node_modules/d3-format/src/formatTypes.js","moduleParts":{},"imported":[{"uid":"4e31-2671"},{"uid":"4e31-2584"},{"uid":"4e31-2672"}],"importedBy":[{"uid":"4e31-2345"}]},"4e31-2584":{"id":"node_modules/d3-format/src/formatPrefixAuto.js","moduleParts":{},"imported":[{"uid":"4e31-2671"}],"importedBy":[{"uid":"4e31-2345"},{"uid":"4e31-2583"}]},"4e31-2585":{"id":"node_modules/d3-format/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2345"}]},"4e31-2586":{"id":"node_modules/d3-geo/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2350"}]},"4e31-2587":{"id":"node_modules/d3-geo/src/clip/index.js","moduleParts":{},"imported":[{"uid":"4e31-2589"},{"uid":"4e31-2591"},{"uid":"4e31-138"},{"uid":"4e31-2592"},{"uid":"4e31-122"}],"importedBy":[{"uid":"4e31-2351"},{"uid":"4e31-2352"}]},"4e31-2588":{"id":"node_modules/d3-geo/src/pointEqual.js","moduleParts":{},"imported":[{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-2352"},{"uid":"4e31-2591"}]},"4e31-2589":{"id":"node_modules/d3-geo/src/clip/buffer.js","moduleParts":{},"imported":[{"uid":"4e31-140"}],"importedBy":[{"uid":"4e31-2354"},{"uid":"4e31-2587"}]},"4e31-2590":{"id":"node_modules/d3-geo/src/clip/line.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2354"}]},"4e31-2591":{"id":"node_modules/d3-geo/src/clip/rejoin.js","moduleParts":{},"imported":[{"uid":"4e31-2588"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-2354"},{"uid":"4e31-2587"}]},"4e31-2592":{"id":"node_modules/d3-geo/src/polygonContains.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-148"},{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-2355"},{"uid":"4e31-2587"}]},"4e31-2593":{"id":"node_modules/d3-geo/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2359"},{"uid":"4e31-2370"},{"uid":"4e31-2371"}]},"4e31-2594":{"id":"node_modules/d3-geo/src/path/area.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-138"},{"uid":"4e31-140"}],"importedBy":[{"uid":"4e31-2359"}]},"4e31-2595":{"id":"node_modules/d3-geo/src/path/bounds.js","moduleParts":{},"imported":[{"uid":"4e31-140"}],"importedBy":[{"uid":"4e31-2359"},{"uid":"4e31-2600"}]},"4e31-2596":{"id":"node_modules/d3-geo/src/path/centroid.js","moduleParts":{},"imported":[{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-2359"}]},"4e31-2597":{"id":"node_modules/d3-geo/src/path/context.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-140"}],"importedBy":[{"uid":"4e31-2359"}]},"4e31-2598":{"id":"node_modules/d3-geo/src/path/measure.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-138"},{"uid":"4e31-140"}],"importedBy":[{"uid":"4e31-2359"}]},"4e31-2599":{"id":"node_modules/d3-geo/src/path/string.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2359"}]},"4e31-2600":{"id":"node_modules/d3-geo/src/projection/fit.js","moduleParts":{},"imported":[{"uid":"4e31-142"},{"uid":"4e31-2595"}],"importedBy":[{"uid":"4e31-2361"},{"uid":"4e31-2370"},{"uid":"4e31-2371"}]},"4e31-2601":{"id":"node_modules/d3-geo/src/projection/azimuthal.js","moduleParts":{},"imported":[{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-2362"},{"uid":"4e31-2363"},{"uid":"4e31-2369"},{"uid":"4e31-2373"},{"uid":"4e31-2374"}]},"4e31-2602":{"id":"node_modules/d3-geo/src/projection/conic.js","moduleParts":{},"imported":[{"uid":"4e31-138"},{"uid":"4e31-2371"}],"importedBy":[{"uid":"4e31-2364"},{"uid":"4e31-2365"},{"uid":"4e31-2366"}]},"4e31-2603":{"id":"node_modules/d3-geo/src/projection/cylindricalEqualArea.js","moduleParts":{},"imported":[{"uid":"4e31-138"}],"importedBy":[{"uid":"4e31-2365"}]},"4e31-2604":{"id":"node_modules/d3-geo/src/compose.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2371"},{"uid":"4e31-2376"}]},"4e31-2605":{"id":"node_modules/d3-geo/src/projection/resample.js","moduleParts":{},"imported":[{"uid":"4e31-148"},{"uid":"4e31-138"},{"uid":"4e31-156"}],"importedBy":[{"uid":"4e31-2371"}]},"4e31-2606":{"id":"node_modules/d3-hierarchy/src/hierarchy/count.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2607":{"id":"node_modules/d3-hierarchy/src/hierarchy/each.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2608":{"id":"node_modules/d3-hierarchy/src/hierarchy/eachBefore.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2609":{"id":"node_modules/d3-hierarchy/src/hierarchy/eachAfter.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2610":{"id":"node_modules/d3-hierarchy/src/hierarchy/find.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2611":{"id":"node_modules/d3-hierarchy/src/hierarchy/sum.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2612":{"id":"node_modules/d3-hierarchy/src/hierarchy/sort.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2613":{"id":"node_modules/d3-hierarchy/src/hierarchy/path.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2614":{"id":"node_modules/d3-hierarchy/src/hierarchy/ancestors.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2615":{"id":"node_modules/d3-hierarchy/src/hierarchy/descendants.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2616":{"id":"node_modules/d3-hierarchy/src/hierarchy/leaves.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2617":{"id":"node_modules/d3-hierarchy/src/hierarchy/links.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2618":{"id":"node_modules/d3-hierarchy/src/hierarchy/iterator.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2378"}]},"4e31-2619":{"id":"node_modules/d3-hierarchy/src/accessors.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2379"},{"uid":"4e31-2383"},{"uid":"4e31-2385"}]},"4e31-2620":{"id":"node_modules/d3-hierarchy/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2379"},{"uid":"4e31-2385"}]},"4e31-2621":{"id":"node_modules/d3-hierarchy/src/lcg.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2379"},{"uid":"4e31-2380"},{"uid":"4e31-2381"}]},"4e31-2622":{"id":"node_modules/d3-hierarchy/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2380"},{"uid":"4e31-2381"}]},"4e31-2623":{"id":"node_modules/d3-hierarchy/src/treemap/round.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2382"},{"uid":"4e31-2385"}]},"4e31-2624":{"id":"node_modules/d3-quadtree/src/add.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2625":{"id":"node_modules/d3-quadtree/src/cover.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2626":{"id":"node_modules/d3-quadtree/src/data.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2627":{"id":"node_modules/d3-quadtree/src/extent.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2628":{"id":"node_modules/d3-quadtree/src/find.js","moduleParts":{},"imported":[{"uid":"4e31-2673"}],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2629":{"id":"node_modules/d3-quadtree/src/remove.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2630":{"id":"node_modules/d3-quadtree/src/root.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2631":{"id":"node_modules/d3-quadtree/src/size.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2632":{"id":"node_modules/d3-quadtree/src/visit.js","moduleParts":{},"imported":[{"uid":"4e31-2673"}],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2633":{"id":"node_modules/d3-quadtree/src/visitAfter.js","moduleParts":{},"imported":[{"uid":"4e31-2673"}],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2634":{"id":"node_modules/d3-quadtree/src/x.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2635":{"id":"node_modules/d3-quadtree/src/y.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2404"}]},"4e31-2636":{"id":"node_modules/d3-random/src/defaultSource.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2405"},{"uid":"4e31-2406"},{"uid":"4e31-2407"},{"uid":"4e31-2408"},{"uid":"4e31-2409"},{"uid":"4e31-2410"},{"uid":"4e31-2411"},{"uid":"4e31-2412"},{"uid":"4e31-2413"},{"uid":"4e31-2414"},{"uid":"4e31-2415"},{"uid":"4e31-2416"},{"uid":"4e31-2417"},{"uid":"4e31-2418"},{"uid":"4e31-2419"},{"uid":"4e31-2420"},{"uid":"4e31-2421"}]},"4e31-2637":{"id":"node_modules/d3-scale/src/init.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2423"},{"uid":"4e31-2425"},{"uid":"4e31-2426"},{"uid":"4e31-2427"},{"uid":"4e31-2428"},{"uid":"4e31-2429"},{"uid":"4e31-2430"},{"uid":"4e31-2431"},{"uid":"4e31-2432"},{"uid":"4e31-2433"},{"uid":"4e31-2434"},{"uid":"4e31-2435"},{"uid":"4e31-2436"},{"uid":"4e31-2437"},{"uid":"4e31-2438"}]},"4e31-2638":{"id":"node_modules/d3-scale/src/number.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2424"},{"uid":"4e31-2430"},{"uid":"4e31-2639"}]},"4e31-2639":{"id":"node_modules/d3-scale/src/continuous.js","moduleParts":{},"imported":[{"uid":"4e31-122"},{"uid":"4e31-316"},{"uid":"4e31-2674"},{"uid":"4e31-2638"}],"importedBy":[{"uid":"4e31-2425"},{"uid":"4e31-2426"},{"uid":"4e31-2427"},{"uid":"4e31-2429"},{"uid":"4e31-2430"},{"uid":"4e31-2434"},{"uid":"4e31-2436"},{"uid":"4e31-2437"},{"uid":"4e31-2438"}]},"4e31-2640":{"id":"node_modules/d3-scale/src/nice.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2426"},{"uid":"4e31-2434"}]},"4e31-2641":{"id":"node_modules/d3-scale-chromatic/src/colors.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2440"},{"uid":"4e31-2441"},{"uid":"4e31-2442"},{"uid":"4e31-2443"},{"uid":"4e31-2444"},{"uid":"4e31-2445"},{"uid":"4e31-2446"},{"uid":"4e31-2447"},{"uid":"4e31-2448"},{"uid":"4e31-2449"},{"uid":"4e31-2450"},{"uid":"4e31-2451"},{"uid":"4e31-2452"},{"uid":"4e31-2453"},{"uid":"4e31-2454"},{"uid":"4e31-2455"},{"uid":"4e31-2456"},{"uid":"4e31-2457"},{"uid":"4e31-2458"},{"uid":"4e31-2459"},{"uid":"4e31-2460"},{"uid":"4e31-2461"},{"uid":"4e31-2462"},{"uid":"4e31-2463"},{"uid":"4e31-2464"},{"uid":"4e31-2465"},{"uid":"4e31-2466"},{"uid":"4e31-2467"},{"uid":"4e31-2468"},{"uid":"4e31-2469"},{"uid":"4e31-2470"},{"uid":"4e31-2471"},{"uid":"4e31-2472"},{"uid":"4e31-2473"},{"uid":"4e31-2474"},{"uid":"4e31-2475"},{"uid":"4e31-2476"},{"uid":"4e31-2482"}]},"4e31-2642":{"id":"node_modules/d3-scale-chromatic/src/ramp.js","moduleParts":{},"imported":[{"uid":"4e31-316"}],"importedBy":[{"uid":"4e31-2450"},{"uid":"4e31-2451"},{"uid":"4e31-2452"},{"uid":"4e31-2453"},{"uid":"4e31-2454"},{"uid":"4e31-2455"},{"uid":"4e31-2456"},{"uid":"4e31-2457"},{"uid":"4e31-2458"},{"uid":"4e31-2459"},{"uid":"4e31-2460"},{"uid":"4e31-2461"},{"uid":"4e31-2462"},{"uid":"4e31-2463"},{"uid":"4e31-2464"},{"uid":"4e31-2465"},{"uid":"4e31-2466"},{"uid":"4e31-2467"},{"uid":"4e31-2468"},{"uid":"4e31-2469"},{"uid":"4e31-2470"},{"uid":"4e31-2471"},{"uid":"4e31-2472"},{"uid":"4e31-2473"},{"uid":"4e31-2474"},{"uid":"4e31-2475"},{"uid":"4e31-2476"}]},"4e31-2643":{"id":"node_modules/d3-shape/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2486"},{"uid":"4e31-2487"},{"uid":"4e31-2488"},{"uid":"4e31-2489"},{"uid":"4e31-2493"},{"uid":"4e31-2494"},{"uid":"4e31-2524"}]},"4e31-2644":{"id":"node_modules/d3-shape/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2486"},{"uid":"4e31-2489"},{"uid":"4e31-2495"},{"uid":"4e31-2496"},{"uid":"4e31-2497"},{"uid":"4e31-2498"},{"uid":"4e31-2499"},{"uid":"4e31-2500"},{"uid":"4e31-2501"},{"uid":"4e31-2502"},{"uid":"4e31-2503"},{"uid":"4e31-2504"},{"uid":"4e31-2505"},{"uid":"4e31-2506"},{"uid":"4e31-2507"},{"uid":"4e31-2518"}]},"4e31-2645":{"id":"node_modules/d3-shape/src/path.js","moduleParts":{},"imported":[{"uid":"4e31-2255"}],"importedBy":[{"uid":"4e31-2486"},{"uid":"4e31-2487"},{"uid":"4e31-2488"},{"uid":"4e31-2493"},{"uid":"4e31-2494"}]},"4e31-2646":{"id":"node_modules/d3-shape/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2487"},{"uid":"4e31-2488"},{"uid":"4e31-2489"},{"uid":"4e31-2493"},{"uid":"4e31-2524"}]},"4e31-2647":{"id":"node_modules/d3-shape/src/point.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2487"},{"uid":"4e31-2488"},{"uid":"4e31-2493"}]},"4e31-2648":{"id":"node_modules/d3-shape/src/descending.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2489"}]},"4e31-2649":{"id":"node_modules/d3-shape/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2489"}]},"4e31-2650":{"id":"node_modules/d3-shape/src/curve/radial.js","moduleParts":{},"imported":[{"uid":"4e31-2520"}],"importedBy":[{"uid":"4e31-2490"},{"uid":"4e31-2491"}]},"4e31-2651":{"id":"node_modules/d3-shape/src/noop.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2508"},{"uid":"4e31-2513"},{"uid":"4e31-2516"},{"uid":"4e31-2519"}]},"4e31-2652":{"id":"node_modules/d3-time/src/duration.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2538"},{"uid":"4e31-2539"},{"uid":"4e31-2540"},{"uid":"4e31-2541"},{"uid":"4e31-2542"},{"uid":"4e31-2545"}]},"4e31-2653":{"id":"node_modules/@pixi/settings/lib/ICanvas.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-424"}]},"4e31-2654":{"id":"node_modules/@pixi/settings/lib/ICanvasRenderingContext2D.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-424"}]},"4e31-2655":{"id":"node_modules/@pixi/assets/lib/detections/index.mjs","moduleParts":{},"imported":[{"uid":"4e31-1254"}],"importedBy":[{"uid":"4e31-1244"}]},"4e31-2656":{"id":"node_modules/@pixi/assets/lib/loader/index.mjs","moduleParts":{},"imported":[{"uid":"4e31-1220"},{"uid":"4e31-2676"}],"importedBy":[{"uid":"4e31-1244"},{"uid":"4e31-1260"}]},"4e31-2657":{"id":"node_modules/@pixi/assets/lib/resolver/index.mjs","moduleParts":{},"imported":[{"uid":"4e31-1262"},{"uid":"4e31-2677"}],"importedBy":[{"uid":"4e31-1244"}]},"4e31-2658":{"id":"node_modules/@pixi/core/lib/filters/IFilterTarget.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1050"}]},"4e31-2659":{"id":"node_modules/@pixi/core/lib/IRenderer.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1050"}]},"4e31-2660":{"id":"node_modules/@pixi/core/lib/system/ISystem.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1050"}]},"4e31-2661":{"id":"node_modules/@pixi/core/lib/transformFeedback/TransformFeedback.mjs","moduleParts":{},"imported":[{"uid":"4e31-850"}],"importedBy":[{"uid":"4e31-1050"}]},"4e31-2662":{"id":"node_modules/@pixi/events/lib/FederatedEventMap.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1178"}]},"4e31-2663":{"id":"node_modules/@pixi/mesh-extras/lib/geometry/PlaneGeometry.mjs","moduleParts":{},"imported":[{"uid":"4e31-1332"}],"importedBy":[{"uid":"4e31-1342"},{"uid":"4e31-2666"}]},"4e31-2664":{"id":"node_modules/@pixi/mesh-extras/lib/NineSlicePlane.mjs","moduleParts":{},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-2666"}],"importedBy":[{"uid":"4e31-1342"}]},"4e31-2665":{"id":"node_modules/@pixi/mesh-extras/lib/SimpleMesh.mjs","moduleParts":{},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1332"}],"importedBy":[{"uid":"4e31-1342"}]},"4e31-2666":{"id":"node_modules/@pixi/mesh-extras/lib/SimplePlane.mjs","moduleParts":{},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1332"},{"uid":"4e31-2663"}],"importedBy":[{"uid":"4e31-1342"},{"uid":"4e31-2664"}]},"4e31-2667":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/TimeLimiter.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1376"}]},"4e31-2668":{"id":"node_modules/@pixi/sprite-animated/lib/AnimatedSprite.mjs","moduleParts":{},"imported":[{"uid":"4e31-1050"},{"uid":"4e31-1110"}],"importedBy":[{"uid":"4e31-1380"}]},"4e31-2669":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapTextStyle.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1428"}]},"4e31-2670":{"id":"node_modules/robust-predicates/index.js","moduleParts":{},"imported":[{"uid":"4e31-2681"},{"uid":"4e31-2682"},{"uid":"4e31-2683"},{"uid":"4e31-2684"}],"importedBy":[{"uid":"4e31-2572"}]},"4e31-2671":{"id":"node_modules/d3-format/src/formatDecimal.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2579"},{"uid":"4e31-2583"},{"uid":"4e31-2584"},{"uid":"4e31-2672"}]},"4e31-2672":{"id":"node_modules/d3-format/src/formatRounded.js","moduleParts":{},"imported":[{"uid":"4e31-2671"}],"importedBy":[{"uid":"4e31-2583"}]},"4e31-2673":{"id":"node_modules/d3-quadtree/src/quad.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2628"},{"uid":"4e31-2632"},{"uid":"4e31-2633"}]},"4e31-2674":{"id":"node_modules/d3-scale/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2639"}]},"4e31-2675":{"id":"node_modules/@pixi/assets/lib/cache/CacheParser.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1246"}]},"4e31-2676":{"id":"node_modules/@pixi/assets/lib/loader/types.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2656"}]},"4e31-2677":{"id":"node_modules/@pixi/assets/lib/resolver/types.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2657"}]},"4e31-2678":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/compressedTextureExtensions.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1270"}]},"4e31-2679":{"id":"node_modules/@pixi/math/lib/IPoint.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-878"}]},"4e31-2680":{"id":"node_modules/@pixi/math/lib/IPointData.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-878"}]},"4e31-2681":{"id":"node_modules/robust-predicates/esm/orient2d.js","moduleParts":{},"imported":[{"uid":"4e31-2690"}],"importedBy":[{"uid":"4e31-2670"}]},"4e31-2682":{"id":"node_modules/robust-predicates/esm/orient3d.js","moduleParts":{},"imported":[{"uid":"4e31-2690"}],"importedBy":[{"uid":"4e31-2670"}]},"4e31-2683":{"id":"node_modules/robust-predicates/esm/incircle.js","moduleParts":{},"imported":[{"uid":"4e31-2690"}],"importedBy":[{"uid":"4e31-2670"}]},"4e31-2684":{"id":"node_modules/robust-predicates/esm/insphere.js","moduleParts":{},"imported":[{"uid":"4e31-2690"}],"importedBy":[{"uid":"4e31-2670"}]},"4e31-2685":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/IFilterTarget.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1780"}]},"4e31-2686":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/fragments/index.mjs","moduleParts":{},"imported":[{"uid":"4e31-2711"},{"uid":"4e31-2712"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-2687":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/IRenderer.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1780"}]},"4e31-2688":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/system/ISystem.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1780"}]},"4e31-2689":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/transformFeedback/TransformFeedback.mjs","moduleParts":{},"imported":[{"uid":"4e31-1588"}],"importedBy":[{"uid":"4e31-1780"}]},"4e31-2690":{"id":"node_modules/robust-predicates/esm/util.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2681"},{"uid":"4e31-2682"},{"uid":"4e31-2683"},{"uid":"4e31-2684"}]},"4e31-2691":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Circle.mjs","moduleParts":{},"imported":[{"uid":"4e31-1608"},{"uid":"4e31-1612"}],"importedBy":[{"uid":"4e31-1614"}]},"4e31-2692":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Ellipse.mjs","moduleParts":{},"imported":[{"uid":"4e31-1608"},{"uid":"4e31-1612"}],"importedBy":[{"uid":"4e31-1614"}]},"4e31-2693":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Polygon.mjs","moduleParts":{},"imported":[{"uid":"4e31-1608"}],"importedBy":[{"uid":"4e31-1614"}]},"4e31-2694":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/RoundedRectangle.mjs","moduleParts":{},"imported":[{"uid":"4e31-1608"}],"importedBy":[{"uid":"4e31-1614"}]},"4e31-2695":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/IPoint.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1614"}]},"4e31-2696":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/IPointData.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1614"}]},"4e31-2697":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/ICanvas.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1538"}]},"4e31-2698":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/ICanvasRenderingContext2D.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1538"}]},"4e31-2699":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/path.mjs","moduleParts":{},"imported":[{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2700":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/browser/hello.mjs","moduleParts":{},"imported":[{"uid":"4e31-1550"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2701":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/color/hex.mjs","moduleParts":{},"imported":[{"uid":"4e31-1556"},{"uid":"4e31-1550"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2702":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/const.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1546"},{"uid":"4e31-2709"}]},"4e31-2703":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/createIndicesForQuads.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2704":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/interleaveTypedArrays.mjs","moduleParts":{},"imported":[{"uid":"4e31-1560"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2705":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/sign.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2706":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/CanvasRenderTarget.mjs","moduleParts":{},"imported":[{"uid":"4e31-1538"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2707":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/getCanvasBoundingBox.mjs","moduleParts":{},"imported":[{"uid":"4e31-1568"}],"importedBy":[{"uid":"4e31-1546"},{"uid":"4e31-2708"}]},"4e31-2708":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/trimCanvas.mjs","moduleParts":{},"imported":[{"uid":"4e31-2707"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2709":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/network/decomposeDataUri.mjs","moduleParts":{},"imported":[{"uid":"4e31-2702"}],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2710":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/types/index.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-1546"}]},"4e31-2711":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/fragments/default.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2686"}]},"4e31-2712":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/fragments/defaultFilter.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"4e31-2686"}]}},"env":{},"options":{"gzip":false,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"dist/rapid.js.map","children":[]},{"name":"dist/rapid.js","children":[{"name":"node_modules","children":[{"name":"aes-js/index.js","uid":"72ad-1"},{"name":"diacritics/index.js","uid":"72ad-3"},{"name":"fast-deep-equal/index.js","uid":"72ad-5"},{"name":"rbush/rbush.min.js","uid":"72ad-7"},{"name":"eventemitter3/index.js","uid":"72ad-9"},{"name":"earcut/src/earcut.js","uid":"72ad-11"},{"name":"url","children":[{"name":"node_modules","children":[{"name":"punycode/punycode.js","uid":"72ad-13"},{"name":"querystring","children":[{"uid":"72ad-17","name":"decode.js"},{"uid":"72ad-19","name":"encode.js"},{"uid":"72ad-21","name":"index.js"}]}]},{"uid":"72ad-15","name":"util.js"},{"uid":"72ad-23","name":"url.js"}]},{"name":"which-polygon","children":[{"name":"node_modules","children":[{"name":"quickselect/quickselect.js","uid":"72ad-25"},{"name":"rbush/index.js","uid":"72ad-27"}]},{"uid":"72ad-31","name":"index.js"}]},{"name":"lineclip/index.js","uid":"72ad-29"},{"name":"wgs84/index.js","uid":"72ad-33"},{"name":"@mapbox","children":[{"name":"geojson-area/index.js","uid":"72ad-35"},{"name":"polylabel/polylabel.js","uid":"72ad-59"},{"name":"geojson-rewind/index.js","uid":"72ad-61"},{"name":"sexagesimal/index.js","uid":"72ad-67"},{"name":"point-geometry/index.js","uid":"72ad-69"},{"name":"vector-tile","children":[{"name":"lib","children":[{"uid":"72ad-71","name":"vectortilefeature.js"},{"uid":"72ad-73","name":"vectortilelayer.js"},{"uid":"72ad-75","name":"vectortile.js"}]},{"uid":"72ad-77","name":"index.js"}]}]},{"name":"circle-to-polygon","children":[{"name":"input-validation","children":[{"uid":"72ad-37","name":"validateCenter.js"},{"uid":"72ad-39","name":"validateRadius.js"},{"uid":"72ad-41","name":"validateNumberOfEdges.js"},{"uid":"72ad-43","name":"validateEarthRadius.js"},{"uid":"72ad-45","name":"validateBearing.js"},{"uid":"72ad-47","name":"index.js"}]},{"uid":"72ad-49","name":"index.js"}]},{"name":"polygon-clipping/dist/polygon-clipping.umd.js","uid":"72ad-51"},{"name":"geojson-precision/index.js","uid":"72ad-53"},{"name":"@aitodotai/json-stringify-pretty-compact/index.js","uid":"72ad-55"},{"name":"tinyqueue/index.js","uid":"72ad-57"},{"name":"fast-json-stable-stringify/index.js","uid":"72ad-63"},{"name":"maplibre-gl/dist/maplibre-gl.js","uid":"72ad-65"},{"name":"ieee754/index.js","uid":"72ad-79"},{"name":"pbf/index.js","uid":"72ad-81"},{"name":"store","children":[{"name":"src","children":[{"uid":"72ad-83","name":"util.js"},{"uid":"72ad-85","name":"store-engine.js"}]},{"name":"storages","children":[{"uid":"72ad-87","name":"localStorage.js"},{"uid":"72ad-89","name":"oldFF-globalStorage.js"},{"uid":"72ad-91","name":"oldIE-userDataStorage.js"},{"uid":"72ad-93","name":"cookieStorage.js"},{"uid":"72ad-95","name":"sessionStorage.js"},{"uid":"72ad-97","name":"memoryStorage.js"},{"uid":"72ad-99","name":"all.js"}]},{"name":"plugins","children":[{"name":"lib/json2.js","uid":"72ad-101"},{"uid":"72ad-103","name":"json2.js"}]},{"name":"dist/store.legacy.js","uid":"72ad-105"}]},{"name":"@rapid-sdk","children":[{"name":"util/built/util.mjs","uid":"72ad-113"},{"name":"math/built/math.mjs","uid":"72ad-409"}]},{"name":"d3-array/src","children":[{"uid":"72ad-119","name":"ascending.js"},{"uid":"72ad-121","name":"descending.js"},{"uid":"72ad-123","name":"number.js"},{"uid":"72ad-125","name":"index.js"},{"uid":"72ad-127","name":"fsum.js"},{"uid":"72ad-129","name":"sort.js"},{"uid":"72ad-131","name":"max.js"},{"uid":"72ad-133","name":"min.js"},{"uid":"72ad-135","name":"quickselect.js"},{"uid":"72ad-137","name":"quantile.js"},{"uid":"72ad-139","name":"median.js"}]},{"name":"d3-geo/src","children":[{"uid":"72ad-141","name":"math.js"},{"uid":"72ad-143","name":"noop.js"},{"uid":"72ad-145","name":"stream.js"},{"uid":"72ad-147","name":"area.js"},{"uid":"72ad-149","name":"index.js"},{"uid":"72ad-151","name":"cartesian.js"},{"uid":"72ad-153","name":"bounds.js"},{"uid":"72ad-155","name":"centroid.js"},{"uid":"72ad-157","name":"length.js"},{"uid":"72ad-159","name":"transform.js"},{"name":"projection/mercator.js","uid":"72ad-161"}]},{"name":"d3-polygon/src","children":[{"uid":"72ad-163","name":"area.js"},{"uid":"72ad-165","name":"index.js"},{"uid":"72ad-167","name":"centroid.js"},{"uid":"72ad-169","name":"cross.js"},{"uid":"72ad-171","name":"hull.js"}]},{"name":"d3-dispatch/src","children":[{"uid":"72ad-173","name":"dispatch.js"},{"uid":"72ad-175","name":"index.js"}]},{"name":"d3-selection/src","children":[{"uid":"72ad-177","name":"namespaces.js"},{"uid":"72ad-179","name":"namespace.js"},{"uid":"72ad-181","name":"creator.js"},{"uid":"72ad-183","name":"selector.js"},{"name":"selection","children":[{"uid":"72ad-185","name":"select.js"},{"uid":"72ad-191","name":"selectAll.js"},{"uid":"72ad-195","name":"selectChild.js"},{"uid":"72ad-197","name":"selectChildren.js"},{"uid":"72ad-199","name":"filter.js"},{"uid":"72ad-201","name":"sparse.js"},{"uid":"72ad-203","name":"enter.js"},{"uid":"72ad-207","name":"data.js"},{"uid":"72ad-209","name":"exit.js"},{"uid":"72ad-211","name":"join.js"},{"uid":"72ad-213","name":"merge.js"},{"uid":"72ad-215","name":"order.js"},{"uid":"72ad-217","name":"sort.js"},{"uid":"72ad-219","name":"call.js"},{"uid":"72ad-221","name":"nodes.js"},{"uid":"72ad-223","name":"node.js"},{"uid":"72ad-225","name":"size.js"},{"uid":"72ad-227","name":"empty.js"},{"uid":"72ad-229","name":"each.js"},{"uid":"72ad-231","name":"attr.js"},{"uid":"72ad-235","name":"style.js"},{"uid":"72ad-237","name":"property.js"},{"uid":"72ad-239","name":"classed.js"},{"uid":"72ad-241","name":"text.js"},{"uid":"72ad-243","name":"html.js"},{"uid":"72ad-245","name":"raise.js"},{"uid":"72ad-247","name":"lower.js"},{"uid":"72ad-249","name":"append.js"},{"uid":"72ad-251","name":"insert.js"},{"uid":"72ad-253","name":"remove.js"},{"uid":"72ad-255","name":"clone.js"},{"uid":"72ad-257","name":"datum.js"},{"uid":"72ad-259","name":"on.js"},{"uid":"72ad-261","name":"dispatch.js"},{"uid":"72ad-263","name":"iterator.js"},{"uid":"72ad-265","name":"index.js"}]},{"uid":"72ad-187","name":"array.js"},{"uid":"72ad-189","name":"selectorAll.js"},{"uid":"72ad-193","name":"matcher.js"},{"uid":"72ad-205","name":"constant.js"},{"uid":"72ad-233","name":"window.js"},{"uid":"72ad-267","name":"select.js"},{"uid":"72ad-269","name":"index.js"},{"uid":"72ad-271","name":"sourceEvent.js"},{"uid":"72ad-273","name":"pointer.js"},{"uid":"72ad-275","name":"selectAll.js"}]},{"name":"d3-drag/src","children":[{"uid":"72ad-277","name":"noevent.js"},{"uid":"72ad-279","name":"nodrag.js"},{"uid":"72ad-281","name":"constant.js"},{"uid":"72ad-283","name":"event.js"},{"uid":"72ad-285","name":"drag.js"},{"uid":"72ad-287","name":"index.js"}]},{"name":"d3-color/src","children":[{"uid":"72ad-289","name":"define.js"},{"uid":"72ad-291","name":"color.js"},{"uid":"72ad-293","name":"index.js"}]},{"name":"d3-interpolate/src","children":[{"uid":"72ad-295","name":"basis.js"},{"uid":"72ad-297","name":"basisClosed.js"},{"uid":"72ad-299","name":"constant.js"},{"uid":"72ad-301","name":"color.js"},{"uid":"72ad-303","name":"rgb.js"},{"uid":"72ad-305","name":"numberArray.js"},{"uid":"72ad-307","name":"array.js"},{"uid":"72ad-309","name":"date.js"},{"uid":"72ad-311","name":"number.js"},{"uid":"72ad-313","name":"object.js"},{"uid":"72ad-315","name":"string.js"},{"uid":"72ad-317","name":"value.js"},{"uid":"72ad-319","name":"index.js"},{"name":"transform","children":[{"uid":"72ad-321","name":"decompose.js"},{"uid":"72ad-323","name":"parse.js"},{"uid":"72ad-325","name":"index.js"}]},{"uid":"72ad-327","name":"zoom.js"}]},{"name":"d3-timer/src","children":[{"uid":"72ad-329","name":"timer.js"},{"uid":"72ad-331","name":"index.js"},{"uid":"72ad-333","name":"timeout.js"}]},{"name":"d3-transition/src","children":[{"name":"transition","children":[{"uid":"72ad-335","name":"schedule.js"},{"uid":"72ad-341","name":"tween.js"},{"uid":"72ad-343","name":"interpolate.js"},{"uid":"72ad-345","name":"attr.js"},{"uid":"72ad-347","name":"attrTween.js"},{"uid":"72ad-349","name":"delay.js"},{"uid":"72ad-351","name":"duration.js"},{"uid":"72ad-353","name":"ease.js"},{"uid":"72ad-355","name":"easeVarying.js"},{"uid":"72ad-357","name":"filter.js"},{"uid":"72ad-359","name":"merge.js"},{"uid":"72ad-361","name":"on.js"},{"uid":"72ad-363","name":"remove.js"},{"uid":"72ad-365","name":"select.js"},{"uid":"72ad-367","name":"selectAll.js"},{"uid":"72ad-369","name":"selection.js"},{"uid":"72ad-371","name":"style.js"},{"uid":"72ad-373","name":"styleTween.js"},{"uid":"72ad-375","name":"text.js"},{"uid":"72ad-377","name":"textTween.js"},{"uid":"72ad-379","name":"transition.js"},{"uid":"72ad-381","name":"end.js"},{"uid":"72ad-383","name":"index.js"}]},{"uid":"72ad-337","name":"interrupt.js"},{"name":"selection","children":[{"uid":"72ad-339","name":"interrupt.js"},{"uid":"72ad-391","name":"transition.js"},{"uid":"72ad-393","name":"index.js"}]},{"uid":"72ad-395","name":"index.js"}]},{"name":"d3-ease/src","children":[{"uid":"72ad-385","name":"linear.js"},{"uid":"72ad-387","name":"index.js"},{"uid":"72ad-389","name":"cubic.js"}]},{"name":"d3-zoom/src","children":[{"uid":"72ad-397","name":"constant.js"},{"uid":"72ad-399","name":"event.js"},{"uid":"72ad-401","name":"transform.js"},{"uid":"72ad-403","name":"noevent.js"},{"uid":"72ad-405","name":"zoom.js"},{"uid":"72ad-407","name":"index.js"}]},{"name":"d3-fetch/src","children":[{"uid":"72ad-495","name":"text.js"},{"uid":"72ad-497","name":"json.js"},{"uid":"72ad-499","name":"index.js"},{"uid":"72ad-501","name":"xml.js"}]},{"name":"node-diff3/index.mjs","uid":"72ad-523"},{"name":"@pixi","children":[{"name":"utils","children":[{"name":"lib","children":[{"uid":"72ad-563","name":"index.mjs"},{"uid":"72ad-577","name":"settings.mjs"},{"uid":"72ad-579","name":"url.mjs"},{"uid":"72ad-581","name":"path.mjs"},{"name":"logging/deprecation.mjs","uid":"72ad-583"},{"name":"browser","children":[{"uid":"72ad-585","name":"hello.mjs"},{"uid":"72ad-587","name":"isWebGLSupported.mjs"}]},{"name":"color","children":[{"uid":"72ad-597","name":"hex.mjs"},{"uid":"72ad-601","name":"premultiply.mjs"}]},{"uid":"72ad-603","name":"const.mjs"},{"name":"data","children":[{"uid":"72ad-605","name":"createIndicesForQuads.mjs"},{"uid":"72ad-607","name":"getBufferType.mjs"},{"uid":"72ad-609","name":"interleaveTypedArrays.mjs"},{"uid":"72ad-611","name":"pow2.mjs"},{"uid":"72ad-613","name":"removeItems.mjs"},{"uid":"72ad-615","name":"sign.mjs"},{"uid":"72ad-617","name":"uid.mjs"}]},{"name":"media","children":[{"uid":"72ad-619","name":"BoundingBox.mjs"},{"uid":"72ad-621","name":"caches.mjs"},{"uid":"72ad-623","name":"CanvasRenderTarget.mjs"},{"uid":"72ad-625","name":"getCanvasBoundingBox.mjs"},{"uid":"72ad-627","name":"trimCanvas.mjs"}]},{"name":"network","children":[{"uid":"72ad-629","name":"decomposeDataUri.mjs"},{"uid":"72ad-631","name":"determineCrossOrigin.mjs"},{"uid":"72ad-633","name":"getResolutionOfUrl.mjs"}]}]},{"name":"node_modules/@pixi/color/lib","children":[{"uid":"72ad-593","name":"Color.mjs"},{"uid":"72ad-595","name":"index.mjs"}]}]},{"name":"settings/lib","children":[{"uid":"72ad-565","name":"adapter.mjs"},{"uid":"72ad-567","name":"index.mjs"},{"uid":"72ad-569","name":"settings.mjs"},{"name":"utils/isMobile.mjs","uid":"72ad-575"}]},{"name":"constants/lib/index.mjs","uid":"72ad-599"},{"name":"core","children":[{"name":"node_modules/@pixi/color/lib","children":[{"uid":"72ad-747","name":"Color.mjs"},{"uid":"72ad-749","name":"index.mjs"}]},{"name":"lib","children":[{"name":"geometry","children":[{"uid":"72ad-753","name":"ViewableBuffer.mjs"},{"uid":"72ad-773","name":"Buffer.mjs"},{"uid":"72ad-775","name":"Attribute.mjs"},{"name":"utils/interleaveTypedArrays.mjs","uid":"72ad-777"},{"uid":"72ad-779","name":"Geometry.mjs"},{"uid":"72ad-901","name":"GeometrySystem.mjs"},{"uid":"72ad-987","name":"GLBuffer.mjs"},{"uid":"72ad-989","name":"BufferSystem.mjs"}]},{"name":"shader","children":[{"name":"utils","children":[{"uid":"72ad-755","name":"checkMaxIfStatementsInShader.mjs"},{"uid":"72ad-811","name":"index.mjs"},{"uid":"72ad-813","name":"compileShader.mjs"},{"uid":"72ad-815","name":"defaultValue.mjs"},{"uid":"72ad-817","name":"uniformParsers.mjs"},{"uid":"72ad-819","name":"generateUniformsSync.mjs"},{"uid":"72ad-821","name":"getTestContext.mjs"},{"uid":"72ad-823","name":"getMaxFragmentPrecision.mjs"},{"uid":"72ad-825","name":"logProgramError.mjs"},{"uid":"72ad-827","name":"mapSize.mjs"},{"uid":"72ad-829","name":"mapType.mjs"},{"uid":"72ad-831","name":"setPrecision.mjs"},{"uid":"72ad-833","name":"unsafeEvalSupported.mjs"},{"uid":"72ad-931","name":"getAttributeData.mjs"},{"uid":"72ad-933","name":"getUniformData.mjs"},{"uid":"72ad-935","name":"generateProgram.mjs"},{"uid":"72ad-937","name":"generateUniformBufferSync.mjs"}]},{"uid":"72ad-807","name":"defaultProgram.mjs"},{"uid":"72ad-809","name":"defaultProgram2.mjs"},{"uid":"72ad-835","name":"Program.mjs"},{"uid":"72ad-837","name":"UniformGroup.mjs"},{"uid":"72ad-839","name":"Shader.mjs"},{"uid":"72ad-929","name":"GLProgram.mjs"},{"uid":"72ad-939","name":"ShaderSystem.mjs"}]},{"name":"state","children":[{"uid":"72ad-757","name":"State.mjs"},{"name":"utils/mapWebGLBlendModesToPixi.mjs","uid":"72ad-943"},{"uid":"72ad-945","name":"StateSystem.mjs"}]},{"name":"textures","children":[{"name":"resources","children":[{"uid":"72ad-759","name":"autoDetectResource.mjs"},{"uid":"72ad-765","name":"Resource.mjs"},{"uid":"72ad-767","name":"BufferResource.mjs"},{"uid":"72ad-871","name":"DepthResource.mjs"},{"uid":"72ad-877","name":"BaseImageResource.mjs"},{"uid":"72ad-879","name":"ImageResource.mjs"},{"uid":"72ad-995","name":"AbstractMultiResource.mjs"},{"uid":"72ad-997","name":"ArrayResource.mjs"},{"uid":"72ad-999","name":"index.mjs"},{"uid":"72ad-1001","name":"CanvasResource.mjs"},{"uid":"72ad-1003","name":"CubeResource.mjs"},{"uid":"72ad-1005","name":"ImageBitmapResource.mjs"},{"uid":"72ad-1007","name":"SVGResource.mjs"},{"uid":"72ad-1009","name":"VideoResource.mjs"}]},{"uid":"72ad-769","name":"BaseTexture.mjs"},{"uid":"72ad-881","name":"TextureUvs.mjs"},{"uid":"72ad-883","name":"Texture.mjs"},{"uid":"72ad-903","name":"TextureMatrix.mjs"},{"uid":"72ad-949","name":"TextureGCSystem.mjs"},{"uid":"72ad-951","name":"GLTexture.mjs"},{"name":"utils/mapTypeAndFormatToInternalFormat.mjs","uid":"72ad-953"},{"uid":"72ad-955","name":"TextureSystem.mjs"}]},{"name":"batch","children":[{"uid":"72ad-771","name":"BatchDrawCall.mjs"},{"uid":"72ad-781","name":"BatchGeometry.mjs"},{"uid":"72ad-841","name":"BatchShaderGenerator.mjs"},{"uid":"72ad-843","name":"BatchTextureArray.mjs"},{"uid":"72ad-845","name":"canUploadSameBuffer.mjs"},{"uid":"72ad-847","name":"maxRecommendedTextures.mjs"},{"uid":"72ad-849","name":"ObjectRenderer.mjs"},{"uid":"72ad-851","name":"texture.mjs"},{"uid":"72ad-853","name":"texture2.mjs"},{"uid":"72ad-855","name":"BatchRenderer.mjs"},{"uid":"72ad-867","name":"BatchSystem.mjs"}]},{"name":"filters","children":[{"uid":"72ad-857","name":"defaultFilter.mjs"},{"uid":"72ad-859","name":"defaultFilter2.mjs"},{"uid":"72ad-861","name":"Filter.mjs"},{"uid":"72ad-893","name":"FilterState.mjs"},{"uid":"72ad-895","name":"FilterSystem.mjs"},{"name":"spriteMask","children":[{"uid":"72ad-905","name":"spriteMaskFilter2.mjs"},{"uid":"72ad-907","name":"spriteMaskFilter3.mjs"},{"uid":"72ad-909","name":"SpriteMaskFilter.mjs"}]}]},{"name":"background/BackgroundSystem.mjs","uid":"72ad-863"},{"uid":"72ad-865","name":"systems.mjs"},{"name":"context/ContextSystem.mjs","uid":"72ad-869"},{"name":"framebuffer","children":[{"uid":"72ad-873","name":"Framebuffer.mjs"},{"uid":"72ad-897","name":"GLFramebuffer.mjs"},{"uid":"72ad-899","name":"FramebufferSystem.mjs"},{"uid":"72ad-985","name":"MultisampleSystem.mjs"}]},{"name":"renderTexture","children":[{"uid":"72ad-875","name":"BaseRenderTexture.mjs"},{"uid":"72ad-885","name":"RenderTexture.mjs"},{"uid":"72ad-887","name":"RenderTexturePool.mjs"},{"uid":"72ad-925","name":"GenerateTextureSystem.mjs"},{"uid":"72ad-927","name":"RenderTextureSystem.mjs"}]},{"name":"utils","children":[{"uid":"72ad-889","name":"Quad.mjs"},{"uid":"72ad-891","name":"QuadUv.mjs"}]},{"name":"mask","children":[{"uid":"72ad-911","name":"MaskData.mjs"},{"uid":"72ad-913","name":"MaskSystem.mjs"},{"uid":"72ad-915","name":"AbstractMaskSystem.mjs"},{"uid":"72ad-917","name":"ScissorSystem.mjs"},{"uid":"72ad-919","name":"StencilSystem.mjs"}]},{"name":"plugin/PluginSystem.mjs","uid":"72ad-921"},{"name":"projection/ProjectionSystem.mjs","uid":"72ad-923"},{"name":"startup/StartupSystem.mjs","uid":"72ad-941"},{"name":"system/SystemManager.mjs","uid":"72ad-947"},{"name":"transformFeedback/TransformFeedbackSystem.mjs","uid":"72ad-957"},{"name":"view/ViewSystem.mjs","uid":"72ad-959"},{"uid":"72ad-961","name":"settings.mjs"},{"uid":"72ad-963","name":"index.mjs"},{"uid":"72ad-977","name":"autoDetectRenderer.mjs"},{"name":"fragments","children":[{"uid":"72ad-979","name":"default.mjs"},{"uid":"72ad-981","name":"defaultFilter.mjs"},{"uid":"72ad-983","name":"index.mjs"}]},{"name":"render/ObjectRendererSystem.mjs","uid":"72ad-991"},{"uid":"72ad-993","name":"Renderer.mjs"}]}]},{"name":"extensions/lib/index.mjs","uid":"72ad-751"},{"name":"runner/lib","children":[{"uid":"72ad-761","name":"Runner.mjs"},{"uid":"72ad-763","name":"index.mjs"}]},{"name":"math/lib","children":[{"uid":"72ad-783","name":"const.mjs"},{"uid":"72ad-785","name":"Point.mjs"},{"name":"shapes","children":[{"uid":"72ad-787","name":"Rectangle.mjs"},{"uid":"72ad-789","name":"Circle.mjs"},{"uid":"72ad-793","name":"Ellipse.mjs"},{"uid":"72ad-795","name":"Polygon.mjs"},{"uid":"72ad-797","name":"RoundedRectangle.mjs"}]},{"uid":"72ad-791","name":"index.mjs"},{"uid":"72ad-799","name":"Matrix.mjs"},{"uid":"72ad-801","name":"groupD8.mjs"},{"uid":"72ad-803","name":"ObservablePoint.mjs"},{"uid":"72ad-805","name":"Transform.mjs"}]},{"name":"ticker/lib","children":[{"uid":"72ad-965","name":"settings.mjs"},{"uid":"72ad-967","name":"const.mjs"},{"uid":"72ad-969","name":"TickerListener.mjs"},{"uid":"72ad-971","name":"Ticker.mjs"},{"uid":"72ad-973","name":"index.mjs"},{"uid":"72ad-975","name":"TickerPlugin.mjs"}]},{"name":"display/lib","children":[{"uid":"72ad-1011","name":"settings.mjs"},{"uid":"72ad-1013","name":"Bounds.mjs"},{"uid":"72ad-1015","name":"DisplayObject.mjs"},{"uid":"72ad-1017","name":"Container.mjs"},{"uid":"72ad-1019","name":"index.mjs"}]},{"name":"sprite/lib","children":[{"uid":"72ad-1021","name":"Sprite.mjs"},{"uid":"72ad-1023","name":"index.mjs"}]},{"name":"mixin-cache-as-bitmap/lib/index.mjs","uid":"72ad-1025"},{"name":"mixin-get-child-by-name/lib/index.mjs","uid":"72ad-1027"},{"name":"mixin-get-global-position/lib/index.mjs","uid":"72ad-1029"},{"name":"filter-alpha/lib","children":[{"uid":"72ad-1031","name":"alpha.mjs"},{"uid":"72ad-1033","name":"AlphaFilter.mjs"},{"uid":"72ad-1035","name":"index.mjs"}]},{"name":"filter-blur/lib","children":[{"uid":"72ad-1037","name":"generateBlurFragSource.mjs"},{"uid":"72ad-1039","name":"generateBlurVertSource.mjs"},{"uid":"72ad-1041","name":"BlurFilterPass.mjs"},{"uid":"72ad-1043","name":"BlurFilter.mjs"},{"uid":"72ad-1045","name":"index.mjs"}]},{"name":"filter-color-matrix/lib","children":[{"uid":"72ad-1047","name":"colorMatrix.mjs"},{"uid":"72ad-1049","name":"ColorMatrixFilter.mjs"},{"uid":"72ad-1051","name":"index.mjs"}]},{"name":"filter-displacement/lib","children":[{"uid":"72ad-1053","name":"displacement.mjs"},{"uid":"72ad-1055","name":"displacement2.mjs"},{"uid":"72ad-1057","name":"DisplacementFilter.mjs"},{"uid":"72ad-1059","name":"index.mjs"}]},{"name":"filter-fxaa/lib","children":[{"uid":"72ad-1061","name":"fxaa.mjs"},{"uid":"72ad-1063","name":"fxaa2.mjs"},{"uid":"72ad-1065","name":"FXAAFilter.mjs"},{"uid":"72ad-1067","name":"index.mjs"}]},{"name":"filter-noise/lib","children":[{"uid":"72ad-1069","name":"noise.mjs"},{"uid":"72ad-1071","name":"NoiseFilter.mjs"},{"uid":"72ad-1073","name":"index.mjs"}]},{"name":"events/lib","children":[{"uid":"72ad-1079","name":"EventTicker.mjs"},{"uid":"72ad-1081","name":"FederatedEvent.mjs"},{"uid":"72ad-1083","name":"FederatedMouseEvent.mjs"},{"uid":"72ad-1085","name":"FederatedPointerEvent.mjs"},{"uid":"72ad-1087","name":"FederatedWheelEvent.mjs"},{"uid":"72ad-1089","name":"EventBoundary.mjs"},{"uid":"72ad-1091","name":"index.mjs"},{"uid":"72ad-1093","name":"EventSystem.mjs"},{"uid":"72ad-1095","name":"FederatedEventTarget.mjs"}]},{"name":"accessibility/lib","children":[{"uid":"72ad-1097","name":"accessibleTarget.mjs"},{"uid":"72ad-1099","name":"AccessibilityManager.mjs"},{"uid":"72ad-1101","name":"index.mjs"}]},{"name":"app/lib","children":[{"uid":"72ad-1103","name":"Application.mjs"},{"uid":"72ad-1105","name":"index.mjs"},{"uid":"72ad-1107","name":"ResizePlugin.mjs"}]},{"name":"assets/lib","children":[{"uid":"72ad-1109","name":"AssetExtension.mjs"},{"uid":"72ad-1111","name":"BackgroundLoader.mjs"},{"name":"utils","children":[{"uid":"72ad-1113","name":"checkDataUrl.mjs"},{"uid":"72ad-1115","name":"index.mjs"},{"uid":"72ad-1117","name":"checkExtension.mjs"},{"uid":"72ad-1119","name":"convertToList.mjs"},{"uid":"72ad-1121","name":"copySearchParams.mjs"},{"uid":"72ad-1123","name":"createStringVariations.mjs"},{"uid":"72ad-1125","name":"isSingleItem.mjs"}]},{"name":"cache","children":[{"uid":"72ad-1127","name":"Cache.mjs"},{"uid":"72ad-1159","name":"index.mjs"},{"name":"parsers","children":[{"uid":"72ad-1161","name":"cacheTextureArray.mjs"},{"uid":"72ad-1163","name":"index.mjs"}]}]},{"name":"loader","children":[{"uid":"72ad-1129","name":"Loader.mjs"},{"name":"parsers","children":[{"uid":"72ad-1131","name":"LoaderParser.mjs"},{"uid":"72ad-1133","name":"index.mjs"},{"uid":"72ad-1135","name":"loadJson.mjs"},{"uid":"72ad-1137","name":"loadTxt.mjs"},{"uid":"72ad-1139","name":"loadWebFont.mjs"},{"uid":"72ad-1141","name":"WorkerManager.mjs"},{"name":"textures","children":[{"name":"utils","children":[{"uid":"72ad-1143","name":"createTexture.mjs"},{"uid":"72ad-1151","name":"index.mjs"}]},{"uid":"72ad-1145","name":"loadTextures.mjs"},{"uid":"72ad-1147","name":"loadSVG.mjs"},{"uid":"72ad-1149","name":"index.mjs"}]}]}]},{"name":"resolver","children":[{"uid":"72ad-1153","name":"Resolver.mjs"},{"name":"parsers","children":[{"uid":"72ad-1173","name":"resolveTextureUrl.mjs"},{"uid":"72ad-1175","name":"index.mjs"}]}]},{"uid":"72ad-1155","name":"Assets.mjs"},{"uid":"72ad-1157","name":"index.mjs"},{"name":"detections/parsers","children":[{"uid":"72ad-1165","name":"detectAvif.mjs"},{"uid":"72ad-1167","name":"index.mjs"},{"uid":"72ad-1169","name":"detectWebp.mjs"},{"uid":"72ad-1171","name":"detectDefaults.mjs"}]}]},{"name":"compressed-textures/lib","children":[{"uid":"72ad-1177","name":"const.mjs"},{"uid":"72ad-1179","name":"index.mjs"},{"name":"loaders","children":[{"uid":"72ad-1181","name":"detectCompressedTextures.mjs"},{"uid":"72ad-1183","name":"index.mjs"},{"uid":"72ad-1197","name":"loadDDS.mjs"},{"uid":"72ad-1199","name":"loadKTX.mjs"},{"uid":"72ad-1201","name":"resolveCompressedTextureUrl.mjs"}]},{"name":"resources","children":[{"uid":"72ad-1185","name":"BlobResource.mjs"},{"uid":"72ad-1187","name":"index.mjs"},{"uid":"72ad-1189","name":"CompressedTextureResource.mjs"}]},{"name":"parsers","children":[{"uid":"72ad-1191","name":"parseDDS.mjs"},{"uid":"72ad-1193","name":"index.mjs"},{"uid":"72ad-1195","name":"parseKTX.mjs"}]}]},{"name":"extract/lib","children":[{"uid":"72ad-1203","name":"Extract.mjs"},{"uid":"72ad-1205","name":"index.mjs"}]},{"name":"graphics/lib","children":[{"name":"utils","children":[{"uid":"72ad-1207","name":"buildCircle.mjs"},{"uid":"72ad-1209","name":"index.mjs"},{"uid":"72ad-1211","name":"buildPoly.mjs"},{"uid":"72ad-1213","name":"buildRectangle.mjs"},{"uid":"72ad-1215","name":"buildRoundedRectangle.mjs"},{"uid":"72ad-1219","name":"ArcUtils.mjs"},{"uid":"72ad-1221","name":"BatchPart.mjs"},{"uid":"72ad-1223","name":"BezierUtils.mjs"},{"uid":"72ad-1225","name":"buildLine.mjs"},{"uid":"72ad-1227","name":"QuadraticUtils.mjs"}]},{"uid":"72ad-1217","name":"const.mjs"},{"uid":"72ad-1229","name":"index.mjs"},{"uid":"72ad-1231","name":"GraphicsData.mjs"},{"uid":"72ad-1233","name":"GraphicsGeometry.mjs"},{"name":"styles","children":[{"uid":"72ad-1235","name":"FillStyle.mjs"},{"uid":"72ad-1237","name":"LineStyle.mjs"}]},{"uid":"72ad-1239","name":"Graphics.mjs"}]},{"name":"mesh/lib","children":[{"uid":"72ad-1241","name":"MeshBatchUvs.mjs"},{"uid":"72ad-1243","name":"Mesh.mjs"},{"uid":"72ad-1245","name":"index.mjs"},{"uid":"72ad-1247","name":"MeshGeometry.mjs"},{"name":"shader","children":[{"uid":"72ad-1249","name":"mesh.mjs"},{"uid":"72ad-1251","name":"mesh2.mjs"}]},{"uid":"72ad-1253","name":"MeshMaterial.mjs"}]},{"name":"mesh-extras/lib","children":[{"uid":"72ad-1255","name":"index.mjs"},{"name":"geometry/RopeGeometry.mjs","uid":"72ad-1257"},{"uid":"72ad-1259","name":"SimpleRope.mjs"}]},{"name":"particle-container/lib","children":[{"uid":"72ad-1261","name":"ParticleContainer.mjs"},{"uid":"72ad-1263","name":"index.mjs"},{"uid":"72ad-1265","name":"ParticleBuffer.mjs"},{"uid":"72ad-1267","name":"particles.mjs"},{"uid":"72ad-1269","name":"particles2.mjs"},{"uid":"72ad-1271","name":"ParticleRenderer.mjs"}]},{"name":"text/lib","children":[{"uid":"72ad-1275","name":"const.mjs"},{"uid":"72ad-1277","name":"index.mjs"},{"uid":"72ad-1279","name":"TextMetrics.mjs"},{"uid":"72ad-1281","name":"TextStyle.mjs"},{"uid":"72ad-1283","name":"Text.mjs"}]},{"name":"sprite-animated/lib/index.mjs","uid":"72ad-1293"},{"name":"sprite-tiling/lib","children":[{"uid":"72ad-1295","name":"TilingSprite.mjs"},{"uid":"72ad-1297","name":"index.mjs"},{"uid":"72ad-1299","name":"sprite-tiling.mjs"},{"uid":"72ad-1301","name":"sprite-tiling2.mjs"},{"uid":"72ad-1303","name":"sprite-tiling-fallback.mjs"},{"uid":"72ad-1305","name":"sprite-tiling-fallback2.mjs"},{"uid":"72ad-1307","name":"sprite-tiling-simple.mjs"},{"uid":"72ad-1309","name":"TilingSpriteRenderer.mjs"}]},{"name":"spritesheet/lib","children":[{"uid":"72ad-1311","name":"Spritesheet.mjs"},{"uid":"72ad-1313","name":"index.mjs"},{"uid":"72ad-1315","name":"spritesheetAsset.mjs"}]},{"name":"text-bitmap/lib","children":[{"uid":"72ad-1317","name":"BitmapFontData.mjs"},{"name":"formats","children":[{"uid":"72ad-1319","name":"TextFormat.mjs"},{"uid":"72ad-1321","name":"index.mjs"},{"uid":"72ad-1323","name":"XMLFormat.mjs"},{"uid":"72ad-1325","name":"XMLStringFormat.mjs"}]},{"name":"utils","children":[{"uid":"72ad-1327","name":"generateFillStyle.mjs"},{"uid":"72ad-1329","name":"drawGlyph.mjs"},{"uid":"72ad-1331","name":"index.mjs"},{"uid":"72ad-1333","name":"extractCharCode.mjs"},{"uid":"72ad-1335","name":"splitTextToCharacters.mjs"},{"uid":"72ad-1337","name":"resolveCharacters.mjs"}]},{"uid":"72ad-1339","name":"BitmapFont.mjs"},{"uid":"72ad-1341","name":"index.mjs"},{"name":"shader","children":[{"uid":"72ad-1343","name":"msdf.mjs"},{"uid":"72ad-1345","name":"msdf2.mjs"}]},{"uid":"72ad-1347","name":"BitmapText.mjs"},{"uid":"72ad-1349","name":"loadBitmapFont.mjs"}]},{"name":"text-html/lib","children":[{"uid":"72ad-1351","name":"HTMLTextStyle.mjs"},{"uid":"72ad-1353","name":"HTMLText.mjs"},{"uid":"72ad-1355","name":"index.mjs"}]},{"name":"filter-adjustment/dist/filter-adjustment.mjs","uid":"72ad-1359"},{"name":"filter-kawase-blur/dist/filter-kawase-blur.mjs","uid":"72ad-1363"},{"name":"filter-advanced-bloom/dist/filter-advanced-bloom.mjs","uid":"72ad-1365"},{"name":"filter-ascii/dist/filter-ascii.mjs","uid":"72ad-1367"},{"name":"filter-bevel/dist/filter-bevel.mjs","uid":"72ad-1369"},{"name":"color/lib","children":[{"uid":"72ad-1391","name":"Color.mjs"},{"uid":"72ad-1393","name":"index.mjs"}]},{"name":"filter-bulge-pinch/dist/filter-bulge-pinch.mjs","uid":"72ad-1661"},{"name":"filter-color-gradient/dist/filter-color-gradient.mjs","uid":"72ad-1663"},{"name":"filter-color-map/dist/filter-color-map.mjs","uid":"72ad-1665"},{"name":"filter-color-overlay/dist/filter-color-overlay.mjs","uid":"72ad-1667"},{"name":"filter-color-replace/dist/filter-color-replace.mjs","uid":"72ad-1669"},{"name":"filter-convolution/dist/filter-convolution.mjs","uid":"72ad-1671"},{"name":"filter-cross-hatch/dist/filter-cross-hatch.mjs","uid":"72ad-1673"},{"name":"filter-crt/dist/filter-crt.mjs","uid":"72ad-1675"},{"name":"filter-dot/dist/filter-dot.mjs","uid":"72ad-1677"},{"name":"filter-drop-shadow/dist/filter-drop-shadow.mjs","uid":"72ad-1679"},{"name":"filter-emboss/dist/filter-emboss.mjs","uid":"72ad-1681"},{"name":"filter-glitch/dist/filter-glitch.mjs","uid":"72ad-1683"},{"name":"filter-glow/dist/filter-glow.mjs","uid":"72ad-1685"},{"name":"filter-godray/dist/filter-godray.mjs","uid":"72ad-1687"},{"name":"filter-grayscale/dist/filter-grayscale.mjs","uid":"72ad-1689"},{"name":"filter-hsl-adjustment/dist/filter-hsl-adjustment.mjs","uid":"72ad-1691"},{"name":"filter-motion-blur/dist/filter-motion-blur.mjs","uid":"72ad-1693"},{"name":"filter-multi-color-replace/dist/filter-multi-color-replace.mjs","uid":"72ad-1695"},{"name":"filter-old-film/dist/filter-old-film.mjs","uid":"72ad-1697"},{"name":"filter-outline/dist/filter-outline.mjs","uid":"72ad-1699"},{"name":"filter-pixelate/dist/filter-pixelate.mjs","uid":"72ad-1701"},{"name":"filter-radial-blur/dist/filter-radial-blur.mjs","uid":"72ad-1703"},{"name":"filter-reflection/dist/filter-reflection.mjs","uid":"72ad-1705"},{"name":"filter-rgb-split/dist/filter-rgb-split.mjs","uid":"72ad-1707"},{"name":"filter-shockwave/dist/filter-shockwave.mjs","uid":"72ad-1709"},{"name":"filter-simple-lightmap/dist/filter-simple-lightmap.mjs","uid":"72ad-1711"},{"name":"filter-tilt-shift/dist/filter-tilt-shift.mjs","uid":"72ad-1713"},{"name":"filter-twist/dist/filter-twist.mjs","uid":"72ad-1715"},{"name":"filter-zoom-blur/dist/filter-zoom-blur.mjs","uid":"72ad-1717"}]},{"name":"ismobilejs/esm","children":[{"uid":"72ad-571","name":"isMobile.js"},{"uid":"72ad-573","name":"index.js"}]},{"name":"colord","children":[{"uid":"72ad-589","name":"index.mjs"},{"name":"plugins/names.mjs","uid":"72ad-591"}]},{"name":"lodash-es","children":[{"uid":"72ad-697","name":"isObject.js"},{"uid":"72ad-699","name":"_freeGlobal.js"},{"uid":"72ad-701","name":"_root.js"},{"uid":"72ad-703","name":"now.js"},{"uid":"72ad-705","name":"_trimmedEndIndex.js"},{"uid":"72ad-707","name":"_baseTrim.js"},{"uid":"72ad-709","name":"_Symbol.js"},{"uid":"72ad-711","name":"_getRawTag.js"},{"uid":"72ad-713","name":"_objectToString.js"},{"uid":"72ad-715","name":"_baseGetTag.js"},{"uid":"72ad-717","name":"isObjectLike.js"},{"uid":"72ad-719","name":"isSymbol.js"},{"uid":"72ad-721","name":"toNumber.js"},{"uid":"72ad-723","name":"debounce.js"},{"uid":"72ad-1835","name":"throttle.js"}]},{"name":"@rapideditor","children":[{"name":"country-coder/dist/country-coder.mjs","uid":"72ad-741"},{"name":"location-conflation/index.mjs","uid":"72ad-743"},{"name":"pixi-dashed-line/dist/pixi-dashed-line.mjs","uid":"72ad-1723"},{"name":"pixi-texture-allocator/dist/pixi-texture-allocator.mjs","uid":"72ad-1773"}]},{"name":"pixi.js","children":[{"name":"lib","children":[{"uid":"72ad-1075","name":"filters.mjs"},{"uid":"72ad-1077","name":"index.mjs"}]},{"name":"node_modules/@pixi/prepare/lib","children":[{"uid":"72ad-1273","name":"settings.mjs"},{"uid":"72ad-1285","name":"CountLimiter.mjs"},{"uid":"72ad-1287","name":"BasePrepare.mjs"},{"uid":"72ad-1289","name":"index.mjs"},{"uid":"72ad-1291","name":"Prepare.mjs"}]}]},{"name":"pixi-filters","children":[{"name":"dist/esm/pixi-filters.mjs","uid":"72ad-1361"},{"name":"node_modules/@pixi","children":[{"name":"constants/lib/index.mjs","uid":"72ad-1371"},{"name":"settings/lib","children":[{"uid":"72ad-1373","name":"adapter.mjs"},{"uid":"72ad-1375","name":"index.mjs"},{"uid":"72ad-1377","name":"settings.mjs"},{"name":"utils/isMobile.mjs","uid":"72ad-1379"}]},{"name":"utils/lib","children":[{"uid":"72ad-1381","name":"settings.mjs"},{"uid":"72ad-1383","name":"index.mjs"},{"uid":"72ad-1385","name":"url.mjs"},{"name":"logging/deprecation.mjs","uid":"72ad-1387"},{"name":"browser/isWebGLSupported.mjs","uid":"72ad-1389"},{"name":"color/premultiply.mjs","uid":"72ad-1395"},{"name":"data","children":[{"uid":"72ad-1397","name":"getBufferType.mjs"},{"uid":"72ad-1399","name":"pow2.mjs"},{"uid":"72ad-1401","name":"removeItems.mjs"},{"uid":"72ad-1403","name":"uid.mjs"}]},{"name":"media","children":[{"uid":"72ad-1405","name":"BoundingBox.mjs"},{"uid":"72ad-1407","name":"caches.mjs"}]},{"name":"network","children":[{"uid":"72ad-1409","name":"determineCrossOrigin.mjs"},{"uid":"72ad-1411","name":"getResolutionOfUrl.mjs"}]}]},{"name":"extensions/lib/index.mjs","uid":"72ad-1413"},{"name":"core/lib","children":[{"name":"geometry","children":[{"uid":"72ad-1415","name":"ViewableBuffer.mjs"},{"uid":"72ad-1435","name":"Buffer.mjs"},{"uid":"72ad-1437","name":"Attribute.mjs"},{"name":"utils/interleaveTypedArrays.mjs","uid":"72ad-1439"},{"uid":"72ad-1441","name":"Geometry.mjs"},{"uid":"72ad-1555","name":"GeometrySystem.mjs"},{"uid":"72ad-1635","name":"GLBuffer.mjs"},{"uid":"72ad-1637","name":"BufferSystem.mjs"}]},{"name":"shader","children":[{"name":"utils","children":[{"uid":"72ad-1417","name":"checkMaxIfStatementsInShader.mjs"},{"uid":"72ad-1465","name":"index.mjs"},{"uid":"72ad-1467","name":"compileShader.mjs"},{"uid":"72ad-1469","name":"defaultValue.mjs"},{"uid":"72ad-1471","name":"uniformParsers.mjs"},{"uid":"72ad-1473","name":"generateUniformsSync.mjs"},{"uid":"72ad-1475","name":"getTestContext.mjs"},{"uid":"72ad-1477","name":"getMaxFragmentPrecision.mjs"},{"uid":"72ad-1479","name":"logProgramError.mjs"},{"uid":"72ad-1481","name":"mapSize.mjs"},{"uid":"72ad-1483","name":"mapType.mjs"},{"uid":"72ad-1485","name":"setPrecision.mjs"},{"uid":"72ad-1487","name":"unsafeEvalSupported.mjs"},{"uid":"72ad-1585","name":"getAttributeData.mjs"},{"uid":"72ad-1587","name":"getUniformData.mjs"},{"uid":"72ad-1589","name":"generateProgram.mjs"},{"uid":"72ad-1591","name":"generateUniformBufferSync.mjs"}]},{"uid":"72ad-1461","name":"defaultProgram.mjs"},{"uid":"72ad-1463","name":"defaultProgram2.mjs"},{"uid":"72ad-1489","name":"Program.mjs"},{"uid":"72ad-1491","name":"UniformGroup.mjs"},{"uid":"72ad-1493","name":"Shader.mjs"},{"uid":"72ad-1583","name":"GLProgram.mjs"},{"uid":"72ad-1593","name":"ShaderSystem.mjs"}]},{"name":"state","children":[{"uid":"72ad-1419","name":"State.mjs"},{"name":"utils/mapWebGLBlendModesToPixi.mjs","uid":"72ad-1597"},{"uid":"72ad-1599","name":"StateSystem.mjs"}]},{"name":"textures","children":[{"name":"resources","children":[{"uid":"72ad-1421","name":"autoDetectResource.mjs"},{"uid":"72ad-1427","name":"Resource.mjs"},{"uid":"72ad-1429","name":"BufferResource.mjs"},{"uid":"72ad-1525","name":"DepthResource.mjs"},{"uid":"72ad-1531","name":"BaseImageResource.mjs"},{"uid":"72ad-1533","name":"ImageResource.mjs"},{"uid":"72ad-1643","name":"AbstractMultiResource.mjs"},{"uid":"72ad-1645","name":"ArrayResource.mjs"},{"uid":"72ad-1647","name":"index.mjs"},{"uid":"72ad-1649","name":"CanvasResource.mjs"},{"uid":"72ad-1651","name":"CubeResource.mjs"},{"uid":"72ad-1653","name":"ImageBitmapResource.mjs"},{"uid":"72ad-1655","name":"SVGResource.mjs"},{"uid":"72ad-1657","name":"VideoResource.mjs"}]},{"uid":"72ad-1431","name":"BaseTexture.mjs"},{"uid":"72ad-1535","name":"TextureUvs.mjs"},{"uid":"72ad-1537","name":"Texture.mjs"},{"uid":"72ad-1557","name":"TextureMatrix.mjs"},{"uid":"72ad-1603","name":"TextureGCSystem.mjs"},{"uid":"72ad-1605","name":"GLTexture.mjs"},{"name":"utils/mapTypeAndFormatToInternalFormat.mjs","uid":"72ad-1607"},{"uid":"72ad-1609","name":"TextureSystem.mjs"}]},{"name":"batch","children":[{"uid":"72ad-1433","name":"BatchDrawCall.mjs"},{"uid":"72ad-1443","name":"BatchGeometry.mjs"},{"uid":"72ad-1495","name":"BatchShaderGenerator.mjs"},{"uid":"72ad-1497","name":"BatchTextureArray.mjs"},{"uid":"72ad-1499","name":"canUploadSameBuffer.mjs"},{"uid":"72ad-1501","name":"maxRecommendedTextures.mjs"},{"uid":"72ad-1503","name":"ObjectRenderer.mjs"},{"uid":"72ad-1505","name":"texture.mjs"},{"uid":"72ad-1507","name":"texture2.mjs"},{"uid":"72ad-1509","name":"BatchRenderer.mjs"},{"uid":"72ad-1521","name":"BatchSystem.mjs"}]},{"name":"filters","children":[{"uid":"72ad-1511","name":"defaultFilter.mjs"},{"uid":"72ad-1513","name":"defaultFilter2.mjs"},{"uid":"72ad-1515","name":"Filter.mjs"},{"uid":"72ad-1547","name":"FilterState.mjs"},{"uid":"72ad-1549","name":"FilterSystem.mjs"},{"name":"spriteMask","children":[{"uid":"72ad-1559","name":"spriteMaskFilter2.mjs"},{"uid":"72ad-1561","name":"spriteMaskFilter3.mjs"},{"uid":"72ad-1563","name":"SpriteMaskFilter.mjs"}]}]},{"name":"background/BackgroundSystem.mjs","uid":"72ad-1517"},{"uid":"72ad-1519","name":"systems.mjs"},{"name":"context/ContextSystem.mjs","uid":"72ad-1523"},{"name":"framebuffer","children":[{"uid":"72ad-1527","name":"Framebuffer.mjs"},{"uid":"72ad-1551","name":"GLFramebuffer.mjs"},{"uid":"72ad-1553","name":"FramebufferSystem.mjs"},{"uid":"72ad-1633","name":"MultisampleSystem.mjs"}]},{"name":"renderTexture","children":[{"uid":"72ad-1529","name":"BaseRenderTexture.mjs"},{"uid":"72ad-1539","name":"RenderTexture.mjs"},{"uid":"72ad-1541","name":"RenderTexturePool.mjs"},{"uid":"72ad-1579","name":"GenerateTextureSystem.mjs"},{"uid":"72ad-1581","name":"RenderTextureSystem.mjs"}]},{"name":"utils","children":[{"uid":"72ad-1543","name":"Quad.mjs"},{"uid":"72ad-1545","name":"QuadUv.mjs"}]},{"name":"mask","children":[{"uid":"72ad-1565","name":"MaskData.mjs"},{"uid":"72ad-1567","name":"MaskSystem.mjs"},{"uid":"72ad-1569","name":"AbstractMaskSystem.mjs"},{"uid":"72ad-1571","name":"ScissorSystem.mjs"},{"uid":"72ad-1573","name":"StencilSystem.mjs"}]},{"name":"plugin/PluginSystem.mjs","uid":"72ad-1575"},{"name":"projection/ProjectionSystem.mjs","uid":"72ad-1577"},{"name":"startup/StartupSystem.mjs","uid":"72ad-1595"},{"name":"system/SystemManager.mjs","uid":"72ad-1601"},{"name":"transformFeedback/TransformFeedbackSystem.mjs","uid":"72ad-1611"},{"name":"view/ViewSystem.mjs","uid":"72ad-1613"},{"uid":"72ad-1615","name":"settings.mjs"},{"uid":"72ad-1617","name":"index.mjs"},{"uid":"72ad-1631","name":"autoDetectRenderer.mjs"},{"name":"render/ObjectRendererSystem.mjs","uid":"72ad-1639"},{"uid":"72ad-1641","name":"Renderer.mjs"}]},{"name":"runner/lib","children":[{"uid":"72ad-1423","name":"Runner.mjs"},{"uid":"72ad-1425","name":"index.mjs"}]},{"name":"math/lib","children":[{"uid":"72ad-1445","name":"const.mjs"},{"uid":"72ad-1447","name":"Point.mjs"},{"name":"shapes/Rectangle.mjs","uid":"72ad-1449"},{"uid":"72ad-1451","name":"index.mjs"},{"uid":"72ad-1453","name":"Matrix.mjs"},{"uid":"72ad-1455","name":"groupD8.mjs"},{"uid":"72ad-1457","name":"ObservablePoint.mjs"},{"uid":"72ad-1459","name":"Transform.mjs"}]},{"name":"ticker/lib","children":[{"uid":"72ad-1619","name":"settings.mjs"},{"uid":"72ad-1621","name":"const.mjs"},{"uid":"72ad-1623","name":"TickerListener.mjs"},{"uid":"72ad-1625","name":"Ticker.mjs"},{"uid":"72ad-1627","name":"index.mjs"},{"uid":"72ad-1629","name":"TickerPlugin.mjs"}]},{"name":"filter-bloom/dist/filter-bloom.mjs","uid":"72ad-1659"}]}]},{"name":"@tmcw/togeojson/dist/togeojson.es.mjs","uid":"72ad-1769"},{"name":"osm-community-index","children":[{"name":"lib","children":[{"uid":"72ad-2005","name":"simplify.js"},{"uid":"72ad-2007","name":"resolve_strings.js"}]},{"uid":"72ad-2009","name":"index.mjs"}]},{"name":"marked/lib/marked.esm.js","uid":"72ad-2025"},{"name":"name-suggestion-index","children":[{"name":"lib","children":[{"uid":"72ad-2183","name":"matcher.js"},{"uid":"72ad-2185","name":"simplify.js"}]},{"name":"config","children":[{"uid":"72ad-2187","name":"matchGroups.json"},{"uid":"72ad-2189","name":"genericWords.json"},{"uid":"72ad-2191","name":"trees.json"}]},{"uid":"72ad-2193","name":"index.mjs"}]},{"name":"osm-auth/src/osm-auth.mjs","uid":"72ad-2197"},{"name":"@turf","children":[{"name":"helpers/dist/es/index.js","uid":"72ad-2213"},{"name":"invariant/dist/es/index.js","uid":"72ad-2215"},{"name":"bbox-clip/dist/es","children":[{"name":"lib/lineclip.js","uid":"72ad-2217"},{"uid":"72ad-2219","name":"index.js"}]}]},{"name":"d3/src/index.js","uid":"72ad-2237"},{"name":"d3-brush/src","children":[{"uid":"72ad-2239","name":"brush.js"},{"uid":"72ad-2241","name":"index.js"}]}]},{"name":"modules","children":[{"uid":"72ad-107","name":"index.js"},{"name":"actions","children":[{"uid":"72ad-109","name":"add_entity.js"},{"uid":"72ad-111","name":"index.js"},{"uid":"72ad-115","name":"reverse.js"},{"uid":"72ad-433","name":"add_member.js"},{"uid":"72ad-435","name":"add_midpoint.js"},{"uid":"72ad-437","name":"add_vertex.js"},{"uid":"72ad-439","name":"change_member.js"},{"uid":"72ad-441","name":"change_preset.js"},{"uid":"72ad-443","name":"change_tags.js"},{"uid":"72ad-447","name":"circularize.js"},{"uid":"72ad-449","name":"delete_way.js"},{"uid":"72ad-451","name":"delete_multiple.js"},{"uid":"72ad-453","name":"delete_relation.js"},{"uid":"72ad-455","name":"delete_node.js"},{"uid":"72ad-457","name":"connect.js"},{"uid":"72ad-459","name":"copy_entities.js"},{"uid":"72ad-461","name":"delete_member.js"},{"uid":"72ad-463","name":"discard_tags.js"},{"uid":"72ad-465","name":"disconnect.js"},{"uid":"72ad-467","name":"extract.js"},{"uid":"72ad-469","name":"join.js"},{"uid":"72ad-471","name":"merge.js"},{"uid":"72ad-473","name":"merge_nodes.js"},{"uid":"72ad-485","name":"split.js"},{"uid":"72ad-519","name":"merge_polygon.js"},{"uid":"72ad-521","name":"merge_remote_changes.js"},{"uid":"72ad-531","name":"move.js"},{"uid":"72ad-533","name":"move_member.js"},{"uid":"72ad-535","name":"move_node.js"},{"uid":"72ad-537","name":"noop.js"},{"uid":"72ad-539","name":"orthogonalize.js"},{"uid":"72ad-541","name":"restrict_turn.js"},{"uid":"72ad-543","name":"revert.js"},{"uid":"72ad-545","name":"rotate.js"},{"uid":"72ad-547","name":"scale.js"},{"uid":"72ad-549","name":"straighten_nodes.js"},{"uid":"72ad-551","name":"straighten_way.js"},{"uid":"72ad-553","name":"unrestrict_turn.js"},{"uid":"72ad-555","name":"reflect.js"},{"uid":"72ad-557","name":"upgrade_tags.js"},{"uid":"72ad-559","name":"rapid_accept_feature.js"},{"uid":"72ad-1885","name":"delete_members.js"}]},{"name":"osm","children":[{"uid":"72ad-117","name":"tags.js"},{"uid":"72ad-411","name":"entity.js"},{"uid":"72ad-413","name":"lanes.js"},{"uid":"72ad-429","name":"way.js"},{"uid":"72ad-431","name":"multipolygon.js"},{"uid":"72ad-445","name":"node.js"},{"uid":"72ad-475","name":"changeset.js"},{"uid":"72ad-477","name":"index.js"},{"uid":"72ad-479","name":"note.js"},{"uid":"72ad-481","name":"relation.js"},{"uid":"72ad-483","name":"qa_item.js"},{"uid":"72ad-517","name":"intersection.js"}]},{"name":"util","children":[{"uid":"72ad-415","name":"detect.js"},{"uid":"72ad-417","name":"index.js"},{"uid":"72ad-419","name":"util.js"},{"uid":"72ad-421","name":"get_set_value.js"},{"uid":"72ad-423","name":"keybinding.js"},{"uid":"72ad-425","name":"rebind.js"},{"uid":"72ad-427","name":"trigger_event.js"},{"uid":"72ad-1779","name":"dimensions.js"},{"uid":"72ad-1845","name":"jxon.js"},{"uid":"72ad-2207","name":"jsonp_request.js"}]},{"name":"core","children":[{"name":"lib","children":[{"uid":"72ad-487","name":"Collection.js"},{"uid":"72ad-489","name":"Category.js"},{"uid":"72ad-491","name":"index.js"},{"uid":"72ad-493","name":"Difference.js"},{"uid":"72ad-503","name":"ImagerySource.js"},{"uid":"72ad-505","name":"Field.js"},{"uid":"72ad-507","name":"Graph.js"},{"uid":"72ad-509","name":"Preset.js"},{"uid":"72ad-511","name":"Tree.js"},{"uid":"72ad-513","name":"ValidationFix.js"},{"uid":"72ad-515","name":"ValidationIssue.js"}]},{"uid":"72ad-695","name":"index.js"},{"uid":"72ad-725","name":"DataLoaderSystem.js"},{"uid":"72ad-733","name":"EditSystem.js"},{"uid":"72ad-735","name":"FilterSystem.js"},{"uid":"72ad-737","name":"ImagerySystem.js"},{"uid":"72ad-739","name":"LocalizationSystem.js"},{"uid":"72ad-745","name":"LocationSystem.js"},{"uid":"72ad-1781","name":"MapSystem.js"},{"uid":"72ad-1783","name":"Map3dSystem.js"},{"uid":"72ad-1785","name":"PhotoSystem.js"},{"uid":"72ad-1825","name":"PresetSystem.js"},{"uid":"72ad-1827","name":"RapidSystem.js"},{"uid":"72ad-1829","name":"StorageSystem.js"},{"uid":"72ad-2123","name":"UiSystem.js"},{"uid":"72ad-2125","name":"UploaderSystem.js"},{"uid":"72ad-2127","name":"UrlHashSystem.js"},{"uid":"72ad-2165","name":"ValidationSystem.js"},{"uid":"72ad-2225","name":"context.js"}]},{"name":"geo","children":[{"uid":"72ad-525","name":"geom.js"},{"uid":"72ad-527","name":"index.js"},{"uid":"72ad-529","name":"ortho.js"}]},{"name":"behaviors","children":[{"uid":"72ad-561","name":"index.js"},{"uid":"72ad-635","name":"AbstractBehavior.js"},{"uid":"72ad-637","name":"DragBehavior.js"},{"uid":"72ad-639","name":"DrawBehavior.js"},{"uid":"72ad-641","name":"HoverBehavior.js"},{"uid":"72ad-643","name":"KeyOperationBehavior.js"},{"uid":"72ad-685","name":"LassoBehavior.js"},{"uid":"72ad-687","name":"MapInteractionBehavior.js"},{"uid":"72ad-689","name":"MapNudgingBehavior.js"},{"uid":"72ad-691","name":"PasteBehavior.js"},{"uid":"72ad-693","name":"SelectBehavior.js"}]},{"name":"operations","children":[{"uid":"72ad-645","name":"index.js"},{"uid":"72ad-647","name":"circularize.js"},{"uid":"72ad-649","name":"continue.js"},{"uid":"72ad-651","name":"cycle_highway_tag.js"},{"uid":"72ad-655","name":"copy.js"},{"uid":"72ad-657","name":"delete.js"},{"uid":"72ad-659","name":"disconnect.js"},{"uid":"72ad-661","name":"downgrade.js"},{"uid":"72ad-663","name":"extract.js"},{"uid":"72ad-665","name":"merge.js"},{"uid":"72ad-667","name":"move.js"},{"uid":"72ad-669","name":"orthogonalize.js"},{"uid":"72ad-671","name":"paste.js"},{"uid":"72ad-673","name":"reflect.js"},{"uid":"72ad-675","name":"reverse.js"},{"uid":"72ad-677","name":"rotate.js"},{"uid":"72ad-679","name":"split.js"},{"uid":"72ad-681","name":"straighten.js"}]},{"name":"ui","children":[{"uid":"72ad-653","name":"cmd.js"},{"uid":"72ad-727","name":"icon.js"},{"uid":"72ad-729","name":"modal.js"},{"uid":"72ad-731","name":"loading.js"},{"name":"fields","children":[{"uid":"72ad-1787","name":"check.js"},{"uid":"72ad-1789","name":"index.js"},{"uid":"72ad-1793","name":"combo.js"},{"uid":"72ad-1795","name":"input.js"},{"uid":"72ad-1797","name":"access.js"},{"uid":"72ad-1799","name":"address.js"},{"uid":"72ad-1801","name":"cycleway.js"},{"uid":"72ad-1803","name":"lanes.js"},{"uid":"72ad-1809","name":"localized.js"},{"uid":"72ad-1811","name":"roadspeed.js"},{"uid":"72ad-1817","name":"radio.js"},{"uid":"72ad-1819","name":"textarea.js"},{"uid":"72ad-1821","name":"wikidata.js"},{"uid":"72ad-1823","name":"wikipedia.js"}]},{"uid":"72ad-1791","name":"combobox.js"},{"uid":"72ad-1805","name":"popover.js"},{"uid":"72ad-1807","name":"tooltip.js"},{"uid":"72ad-1813","name":"tag_reference.js"},{"uid":"72ad-1815","name":"UiField.js"},{"uid":"72ad-1831","name":"account.js"},{"uid":"72ad-1833","name":"index.js"},{"uid":"72ad-1837","name":"attribution.js"},{"uid":"72ad-1839","name":"form_fields.js"},{"uid":"72ad-1841","name":"changeset_editor.js"},{"uid":"72ad-1843","name":"commit.js"},{"uid":"72ad-1847","name":"toggle.js"},{"uid":"72ad-1849","name":"disclosure.js"},{"uid":"72ad-1851","name":"section.js"},{"name":"sections","children":[{"uid":"72ad-1853","name":"changes.js"},{"uid":"72ad-1857","name":"raw_tag_editor.js"},{"uid":"72ad-1875","name":"entity_issues.js"},{"uid":"72ad-1879","name":"feature_type.js"},{"uid":"72ad-1881","name":"preset_fields.js"},{"uid":"72ad-1883","name":"raw_member_editor.js"},{"uid":"72ad-1887","name":"raw_membership_editor.js"},{"uid":"72ad-1889","name":"selection_list.js"},{"uid":"72ad-2077","name":"background_display_options.js"},{"uid":"72ad-2081","name":"background_list.js"},{"uid":"72ad-2083","name":"background_offset.js"},{"uid":"72ad-2085","name":"grid_display_options.js"},{"uid":"72ad-2087","name":"overlay_list.js"},{"uid":"72ad-2095","name":"validation_issues.js"},{"uid":"72ad-2097","name":"validation_options.js"},{"uid":"72ad-2099","name":"validation_rules.js"},{"uid":"72ad-2101","name":"validation_status.js"},{"uid":"72ad-2107","name":"data_layers.js"},{"uid":"72ad-2109","name":"map_features.js"},{"uid":"72ad-2111","name":"map_style_options.js"},{"uid":"72ad-2113","name":"photo_overlays.js"},{"uid":"72ad-2117","name":"privacy.js"},{"uid":"72ad-2119","name":"map_interaction_options.js"},{"uid":"72ad-2233","name":"index.js"}]},{"uid":"72ad-1855","name":"commit_warnings.js"},{"uid":"72ad-1859","name":"confirm.js"},{"uid":"72ad-1861","name":"conflicts.js"},{"uid":"72ad-1863","name":"contributors.js"},{"uid":"72ad-1865","name":"data_header.js"},{"uid":"72ad-1867","name":"data_editor.js"},{"uid":"72ad-1869","name":"UiDefs.js"},{"uid":"72ad-1871","name":"edit_menu.js"},{"uid":"72ad-1873","name":"entity_editor.js"},{"uid":"72ad-1877","name":"preset_icon.js"},{"uid":"72ad-1891","name":"feature_info.js"},{"uid":"72ad-1893","name":"feature_list.js"},{"uid":"72ad-1895","name":"flash.js"},{"uid":"72ad-1897","name":"full_screen.js"},{"uid":"72ad-1899","name":"geolocate.js"},{"uid":"72ad-1901","name":"improveOSM_comments.js"},{"uid":"72ad-1903","name":"improveOSM_details.js"},{"uid":"72ad-1905","name":"improveOSM_header.js"},{"uid":"72ad-1907","name":"improveOSM_editor.js"},{"name":"intro","children":[{"uid":"72ad-1909","name":"helper.js"},{"uid":"72ad-1911","name":"UiCurtain.js"},{"uid":"72ad-1913","name":"welcome.js"},{"uid":"72ad-1915","name":"navigation.js"},{"uid":"72ad-1917","name":"point.js"},{"uid":"72ad-1919","name":"area.js"},{"uid":"72ad-1921","name":"line.js"},{"uid":"72ad-1923","name":"building.js"},{"uid":"72ad-1925","name":"start_editing.js"},{"uid":"72ad-1927","name":"rapid.js"},{"uid":"72ad-1929","name":"intro.js"}]},{"name":"panels","children":[{"uid":"72ad-1931","name":"AbstractUiPanel.js"},{"uid":"72ad-1933","name":"UiPanelBackground.js"},{"uid":"72ad-1935","name":"UiPanelHistory.js"},{"uid":"72ad-1937","name":"UiPanelLocation.js"},{"uid":"72ad-1939","name":"UiPanelMeasurement.js"},{"uid":"72ad-2231","name":"index.js"}]},{"uid":"72ad-1941","name":"info.js"},{"uid":"72ad-1943","name":"preset_list.js"},{"uid":"72ad-1945","name":"view_on_osm.js"},{"uid":"72ad-1947","name":"inspector.js"},{"uid":"72ad-1949","name":"issues_info.js"},{"uid":"72ad-1951","name":"keepRight_details.js"},{"uid":"72ad-1953","name":"keepRight_header.js"},{"uid":"72ad-1955","name":"view_on_keepRight.js"},{"uid":"72ad-1957","name":"keepRight_editor.js"},{"uid":"72ad-1959","name":"map3d_viewer.js"},{"uid":"72ad-1961","name":"map_in_map.js"},{"uid":"72ad-1963","name":"note_comments.js"},{"uid":"72ad-1965","name":"note_header.js"},{"uid":"72ad-1967","name":"note_report.js"},{"uid":"72ad-1969","name":"note_editor.js"},{"uid":"72ad-1971","name":"osmose_details.js"},{"uid":"72ad-1973","name":"osmose_header.js"},{"uid":"72ad-1975","name":"view_on_osmose.js"},{"uid":"72ad-1977","name":"osmose_editor.js"},{"uid":"72ad-1979","name":"pane.js"},{"uid":"72ad-1981","name":"photo_viewer.js"},{"uid":"72ad-1983","name":"rapid_colorpicker.js"},{"uid":"72ad-2011","name":"success.js"},{"uid":"72ad-2019","name":"rapid_splash.js"},{"uid":"72ad-2021","name":"rapid_first_edit_dialog.js"},{"uid":"72ad-2023","name":"rapid_feature_inspector.js"},{"uid":"72ad-2027","name":"rapid_view_manage_datasets.js"},{"uid":"72ad-2029","name":"rapid_feature_toggle_dialog.js"},{"uid":"72ad-2031","name":"rapid_poweruser_features_dialog.js"},{"uid":"72ad-2033","name":"rapid_service_license.js"},{"uid":"72ad-2035","name":"rapid_whatsnew.js"},{"uid":"72ad-2037","name":"restore.js"},{"uid":"72ad-2039","name":"scale.js"},{"uid":"72ad-2041","name":"shortcuts.js"},{"uid":"72ad-2043","name":"sidebar.js"},{"uid":"72ad-2045","name":"source_switch.js"},{"uid":"72ad-2047","name":"spinner.js"},{"uid":"72ad-2049","name":"splash.js"},{"uid":"72ad-2051","name":"status.js"},{"name":"tools","children":[{"uid":"72ad-2053","name":"download_osc.js"},{"uid":"72ad-2055","name":"index.js"},{"uid":"72ad-2057","name":"modes.js"},{"uid":"72ad-2059","name":"notes.js"},{"uid":"72ad-2061","name":"save.js"},{"uid":"72ad-2063","name":"sidebar_toggle.js"},{"uid":"72ad-2065","name":"undo_redo.js"},{"uid":"72ad-2067","name":"rapid_features.js"}]},{"uid":"72ad-2069","name":"top_toolbar.js"},{"uid":"72ad-2071","name":"version.js"},{"uid":"72ad-2073","name":"zoom.js"},{"uid":"72ad-2075","name":"zoom_to_selection.js"},{"name":"settings","children":[{"uid":"72ad-2079","name":"custom_background.js"},{"uid":"72ad-2105","name":"custom_data.js"},{"uid":"72ad-2235","name":"index.js"}]},{"name":"panes","children":[{"uid":"72ad-2089","name":"background.js"},{"uid":"72ad-2091","name":"index.js"},{"uid":"72ad-2093","name":"help.js"},{"uid":"72ad-2103","name":"issues.js"},{"uid":"72ad-2115","name":"map_data.js"},{"uid":"72ad-2121","name":"preferences.js"}]}]},{"name":"modes","children":[{"uid":"72ad-683","name":"select.js"},{"uid":"72ad-1985","name":"index.js"},{"uid":"72ad-1987","name":"AbstractMode.js"},{"uid":"72ad-1989","name":"AddNoteMode.js"},{"uid":"72ad-1991","name":"AddPointMode.js"},{"uid":"72ad-1993","name":"BrowseMode.js"},{"uid":"72ad-1995","name":"DragNodeMode.js"},{"uid":"72ad-1997","name":"DrawAreaMode.js"},{"uid":"72ad-1999","name":"DrawLineMode.js"},{"uid":"72ad-2001","name":"MoveMode.js"},{"uid":"72ad-2003","name":"RotateMode.js"},{"uid":"72ad-2013","name":"SaveMode.js"},{"uid":"72ad-2015","name":"SelectMode.js"},{"uid":"72ad-2017","name":"drag_note.js"}]},{"name":"pixi","children":[{"uid":"72ad-1357","name":"PixiEvents.js"},{"uid":"72ad-1719","name":"AbstractLayer.js"},{"uid":"72ad-1721","name":"PixiLayerBackgroundTiles.js"},{"uid":"72ad-1725","name":"PixiGeometry.js"},{"uid":"72ad-1727","name":"AbstractFeature.js"},{"uid":"72ad-1729","name":"helpers.js"},{"uid":"72ad-1731","name":"PixiFeaturePolygon.js"},{"uid":"72ad-1733","name":"PixiLayerEditBlocks.js"},{"uid":"72ad-1735","name":"PixiFeaturePoint.js"},{"uid":"72ad-1737","name":"PixiLayerImproveOsm.js"},{"uid":"72ad-1739","name":"PixiFeatureLine.js"},{"uid":"72ad-1741","name":"PixiLayerKartaPhotos.js"},{"uid":"72ad-1743","name":"PixiLayerKeepRight.js"},{"uid":"72ad-1745","name":"PixiLayerLabels.js"},{"uid":"72ad-1747","name":"PixiLayerMapillaryFeatures.js"},{"uid":"72ad-1749","name":"PixiLayerMapillaryPhotos.js"},{"uid":"72ad-1751","name":"PixiLayerMapillarySigns.js"},{"uid":"72ad-1753","name":"PixiLayerOsm.js"},{"uid":"72ad-1755","name":"styles.js"},{"uid":"72ad-1757","name":"PixiLayerOsmNotes.js"},{"uid":"72ad-1759","name":"PixiLayerOsmose.js"},{"uid":"72ad-1761","name":"PixiLayerRapid.js"},{"uid":"72ad-1763","name":"PixiLayerMapUI.js"},{"uid":"72ad-1765","name":"PixiLayerStreetsidePhotos.js"},{"uid":"72ad-1767","name":"PixiLayerCustomData.js"},{"uid":"72ad-1771","name":"PixiScene.js"},{"uid":"72ad-1775","name":"PixiTextures.js"},{"uid":"72ad-1777","name":"PixiRenderer.js"}]},{"name":"validations","children":[{"uid":"72ad-2129","name":"index.js"},{"uid":"72ad-2131","name":"almost_junction.js"},{"uid":"72ad-2133","name":"close_nodes.js"},{"uid":"72ad-2135","name":"crossing_ways.js"},{"uid":"72ad-2137","name":"disconnected_way.js"},{"uid":"72ad-2139","name":"duplicate_way_segments.js"},{"uid":"72ad-2141","name":"invalid_format.js"},{"uid":"72ad-2143","name":"help_request.js"},{"uid":"72ad-2145","name":"impossible_oneway.js"},{"uid":"72ad-2147","name":"incompatible_source.js"},{"uid":"72ad-2149","name":"mismatched_geometry.js"},{"uid":"72ad-2151","name":"missing_role.js"},{"uid":"72ad-2153","name":"missing_tag.js"},{"uid":"72ad-2155","name":"outdated_tags.js"},{"uid":"72ad-2157","name":"private_data.js"},{"uid":"72ad-2159","name":"y_shaped_connection.js"},{"uid":"72ad-2161","name":"suspicious_name.js"},{"uid":"72ad-2163","name":"unsquare_way.js"}]},{"name":"services","children":[{"uid":"72ad-2167","name":"index.js"},{"uid":"72ad-2169","name":"EsriService.js"},{"uid":"72ad-2171","name":"ImproveOsmService.js"},{"uid":"72ad-2173","name":"KartaviewService.js"},{"uid":"72ad-2175","name":"KeepRightService.js"},{"uid":"72ad-2177","name":"MapillaryService.js"},{"uid":"72ad-2179","name":"MapWithAIService.js"},{"uid":"72ad-2181","name":"NominatimService.js"},{"uid":"72ad-2195","name":"NsiService.js"},{"uid":"72ad-2199","name":"OsmService.js"},{"uid":"72ad-2201","name":"OsmoseService.js"},{"uid":"72ad-2203","name":"OsmWikibaseService.js"},{"uid":"72ad-2205","name":"StreetsideService.js"},{"uid":"72ad-2209","name":"TaginfoService.js"},{"uid":"72ad-2211","name":"VectorTileService.js"},{"uid":"72ad-2221","name":"WikidataService.js"},{"uid":"72ad-2223","name":"WikipediaService.js"}]},{"name":"svg","children":[{"uid":"72ad-2227","name":"tag_classes.js"},{"uid":"72ad-2229","name":"index.js"}]},{"uid":"72ad-2243","name":"main.js"}]}]}],"isRoot":true},"nodeParts":{"72ad-1":{"renderedLength":59680,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-0"},"72ad-3":{"renderedLength":11829,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2"},"72ad-5":{"renderedLength":1546,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-4"},"72ad-7":{"renderedLength":11715,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-6"},"72ad-9":{"renderedLength":6826,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-8"},"72ad-11":{"renderedLength":17861,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-10"},"72ad-13":{"renderedLength":9467,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-12"},"72ad-15":{"renderedLength":500,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-14"},"72ad-17":{"renderedLength":1435,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-16"},"72ad-19":{"renderedLength":1291,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-18"},"72ad-21":{"renderedLength":264,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-20"},"72ad-23":{"renderedLength":18651,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-22"},"72ad-25":{"renderedLength":2293,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-24"},"72ad-27":{"renderedLength":14964,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-26"},"72ad-29":{"renderedLength":3091,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-28"},"72ad-31":{"renderedLength":3497,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-30"},"72ad-33":{"renderedLength":249,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-32"},"72ad-35":{"renderedLength":2278,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-34"},"72ad-37":{"renderedLength":969,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-36"},"72ad-39":{"renderedLength":493,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-38"},"72ad-41":{"renderedLength":645,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-40"},"72ad-43":{"renderedLength":633,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-42"},"72ad-45":{"renderedLength":446,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-44"},"72ad-47":{"renderedLength":1121,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-46"},"72ad-49":{"renderedLength":3189,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-48"},"72ad-51":{"renderedLength":79572,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-50"},"72ad-53":{"renderedLength":2699,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-52"},"72ad-55":{"renderedLength":4424,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-54"},"72ad-57":{"renderedLength":2321,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-56"},"72ad-59":{"renderedLength":4435,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-58"},"72ad-61":{"renderedLength":1580,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-60"},"72ad-63":{"renderedLength":2194,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-62"},"72ad-65":{"renderedLength":1145664,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-64"},"72ad-67":{"renderedLength":3049,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-66"},"72ad-69":{"renderedLength":8844,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-68"},"72ad-71":{"renderedLength":5797,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-70"},"72ad-73":{"renderedLength":1925,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-72"},"72ad-75":{"renderedLength":577,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-74"},"72ad-77":{"renderedLength":317,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-76"},"72ad-79":{"renderedLength":2717,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-78"},"72ad-81":{"renderedLength":22340,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-80"},"72ad-83":{"renderedLength":3275,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-82"},"72ad-85":{"renderedLength":7647,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-84"},"72ad-87":{"renderedLength":932,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-86"},"72ad-89":{"renderedLength":950,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-88"},"72ad-91":{"renderedLength":3495,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-90"},"72ad-93":{"renderedLength":1723,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-92"},"72ad-95":{"renderedLength":954,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-94"},"72ad-97":{"renderedLength":796,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-96"},"72ad-99":{"renderedLength":400,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-98"},"72ad-101":{"renderedLength":6539,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-100"},"72ad-103":{"renderedLength":231,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-102"},"72ad-105":{"renderedLength":303,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-104"},"72ad-107":{"renderedLength":15302,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-106"},"72ad-109":{"renderedLength":107,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-108"},"72ad-111":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-110"},"72ad-113":{"renderedLength":9918,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-112"},"72ad-115":{"renderedLength":4382,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-114"},"72ad-117":{"renderedLength":5870,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-116"},"72ad-119":{"renderedLength":128,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-118"},"72ad-121":{"renderedLength":129,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-120"},"72ad-123":{"renderedLength":416,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-122"},"72ad-125":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-124"},"72ad-127":{"renderedLength":1006,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-126"},"72ad-129":{"renderedLength":533,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-128"},"72ad-131":{"renderedLength":498,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-130"},"72ad-133":{"renderedLength":498,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-132"},"72ad-135":{"renderedLength":1599,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-134"},"72ad-137":{"renderedLength":467,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-136"},"72ad-139":{"renderedLength":84,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-138"},"72ad-141":{"renderedLength":509,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-140"},"72ad-143":{"renderedLength":24,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-142"},"72ad-145":{"renderedLength":2513,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-144"},"72ad-147":{"renderedLength":1566,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-146"},"72ad-149":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-148"},"72ad-151":{"renderedLength":590,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-150"},"72ad-153":{"renderedLength":5332,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-152"},"72ad-155":{"renderedLength":3434,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-154"},"72ad-157":{"renderedLength":1209,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-156"},"72ad-159":{"renderedLength":821,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-158"},"72ad-161":{"renderedLength":185,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-160"},"72ad-163":{"renderedLength":253,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-162"},"72ad-165":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-164"},"72ad-167":{"renderedLength":365,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-166"},"72ad-169":{"renderedLength":125,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-168"},"72ad-171":{"renderedLength":1382,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-170"},"72ad-173":{"renderedLength":2873,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-172"},"72ad-175":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-174"},"72ad-177":{"renderedLength":265,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-176"},"72ad-179":{"renderedLength":304,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-178"},"72ad-181":{"renderedLength":593,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-180"},"72ad-183":{"renderedLength":168,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-182"},"72ad-185":{"renderedLength":646,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-184"},"72ad-187":{"renderedLength":97,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-186"},"72ad-189":{"renderedLength":191,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-188"},"72ad-191":{"renderedLength":682,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-190"},"72ad-193":{"renderedLength":223,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-192"},"72ad-195":{"renderedLength":378,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-194"},"72ad-197":{"renderedLength":399,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-196"},"72ad-199":{"renderedLength":525,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-198"},"72ad-201":{"renderedLength":77,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-200"},"72ad-203":{"renderedLength":799,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-202"},"72ad-205":{"renderedLength":86,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-204"},"72ad-207":{"renderedLength":2898,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-206"},"72ad-209":{"renderedLength":121,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-208"},"72ad-211":{"renderedLength":569,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-210"},"72ad-213":{"renderedLength":657,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-212"},"72ad-215":{"renderedLength":422,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-214"},"72ad-217":{"renderedLength":715,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-216"},"72ad-219":{"renderedLength":144,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-218"},"72ad-221":{"renderedLength":62,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-220"},"72ad-223":{"renderedLength":294,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-222"},"72ad-225":{"renderedLength":110,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-224"},"72ad-227":{"renderedLength":58,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-226"},"72ad-229":{"renderedLength":324,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-228"},"72ad-231":{"renderedLength":1499,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-230"},"72ad-233":{"renderedLength":148,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-232"},"72ad-235":{"renderedLength":932,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-234"},"72ad-237":{"renderedLength":633,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-236"},"72ad-239":{"renderedLength":1884,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-238"},"72ad-241":{"renderedLength":518,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-240"},"72ad-243":{"renderedLength":510,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-242"},"72ad-245":{"renderedLength":154,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-244"},"72ad-247":{"renderedLength":187,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-246"},"72ad-249":{"renderedLength":222,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-248"},"72ad-251":{"renderedLength":426,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-250"},"72ad-253":{"renderedLength":172,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-252"},"72ad-255":{"renderedLength":472,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-254"},"72ad-257":{"renderedLength":125,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-256"},"72ad-259":{"renderedLength":2299,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-258"},"72ad-261":{"renderedLength":922,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-260"},"72ad-263":{"renderedLength":269,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-262"},"72ad-265":{"renderedLength":1357,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-264"},"72ad-267":{"renderedLength":202,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-266"},"72ad-269":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-268"},"72ad-271":{"renderedLength":158,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-270"},"72ad-273":{"renderedLength":712,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-272"},"72ad-275":{"renderedLength":211,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-274"},"72ad-277":{"renderedLength":287,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-276"},"72ad-279":{"renderedLength":921,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-278"},"72ad-281":{"renderedLength":44,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-280"},"72ad-283":{"renderedLength":1081,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-282"},"72ad-285":{"renderedLength":5589,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-284"},"72ad-287":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-286"},"72ad-289":{"renderedLength":356,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-288"},"72ad-291":{"renderedLength":11353,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-290"},"72ad-293":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-292"},"72ad-295":{"renderedLength":602,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-294"},"72ad-297":{"renderedLength":339,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-296"},"72ad-299":{"renderedLength":44,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-298"},"72ad-301":{"renderedLength":581,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-300"},"72ad-303":{"renderedLength":1211,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-302"},"72ad-305":{"renderedLength":381,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-304"},"72ad-307":{"renderedLength":394,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-306"},"72ad-309":{"renderedLength":186,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-308"},"72ad-311":{"renderedLength":131,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-310"},"72ad-313":{"renderedLength":439,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-312"},"72ad-315":{"renderedLength":1227,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-314"},"72ad-317":{"renderedLength":526,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-316"},"72ad-319":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-318"},"72ad-321":{"renderedLength":763,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-320"},"72ad-323":{"renderedLength":650,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-322"},"72ad-325":{"renderedLength":2165,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-324"},"72ad-327":{"renderedLength":1557,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-326"},"72ad-329":{"renderedLength":2856,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-328"},"72ad-331":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-330"},"72ad-333":{"renderedLength":238,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-332"},"72ad-335":{"renderedLength":3680,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-334"},"72ad-337":{"renderedLength":653,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-336"},"72ad-339":{"renderedLength":121,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-338"},"72ad-341":{"renderedLength":1819,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-340"},"72ad-343":{"renderedLength":216,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-342"},"72ad-345":{"renderedLength":2478,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-344"},"72ad-347":{"renderedLength":1242,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-346"},"72ad-349":{"renderedLength":471,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-348"},"72ad-351":{"renderedLength":495,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-350"},"72ad-353":{"renderedLength":329,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-352"},"72ad-355":{"renderedLength":371,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-354"},"72ad-357":{"renderedLength":549,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-356"},"72ad-359":{"renderedLength":673,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-358"},"72ad-361":{"renderedLength":691,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-360"},"72ad-363":{"renderedLength":334,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-362"},"72ad-365":{"renderedLength":786,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-364"},"72ad-367":{"renderedLength":847,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-366"},"72ad-369":{"renderedLength":154,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-368"},"72ad-371":{"renderedLength":2318,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-370"},"72ad-373":{"renderedLength":827,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-372"},"72ad-375":{"renderedLength":453,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-374"},"72ad-377":{"renderedLength":680,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-376"},"72ad-379":{"renderedLength":657,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-378"},"72ad-381":{"renderedLength":628,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-380"},"72ad-383":{"renderedLength":1411,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-382"},"72ad-385":{"renderedLength":29,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-384"},"72ad-387":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-386"},"72ad-389":{"renderedLength":106,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-388"},"72ad-391":{"renderedLength":1000,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-390"},"72ad-393":{"renderedLength":126,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-392"},"72ad-395":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-394"},"72ad-397":{"renderedLength":44,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-396"},"72ad-399":{"renderedLength":493,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-398"},"72ad-401":{"renderedLength":1505,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-400"},"72ad-403":{"renderedLength":189,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-402"},"72ad-405":{"renderedLength":15674,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-404"},"72ad-407":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-406"},"72ad-409":{"renderedLength":17553,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-408"},"72ad-411":{"renderedLength":6131,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-410"},"72ad-413":{"renderedLength":7026,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-412"},"72ad-415":{"renderedLength":3030,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-414"},"72ad-417":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-416"},"72ad-419":{"renderedLength":1890,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-418"},"72ad-421":{"renderedLength":786,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-420"},"72ad-423":{"renderedLength":12360,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-422"},"72ad-425":{"renderedLength":403,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-424"},"72ad-427":{"renderedLength":209,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-426"},"72ad-429":{"renderedLength":14594,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-428"},"72ad-431":{"renderedLength":4940,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-430"},"72ad-433":{"renderedLength":4086,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-432"},"72ad-435":{"renderedLength":642,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-434"},"72ad-437":{"renderedLength":163,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-436"},"72ad-439":{"renderedLength":193,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-438"},"72ad-441":{"renderedLength":540,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-440"},"72ad-443":{"renderedLength":184,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-442"},"72ad-445":{"renderedLength":6373,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-444"},"72ad-447":{"renderedLength":8598,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-446"},"72ad-449":{"renderedLength":1034,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-448"},"72ad-451":{"renderedLength":399,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-450"},"72ad-453":{"renderedLength":1083,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-452"},"72ad-455":{"renderedLength":692,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-454"},"72ad-457":{"renderedLength":7347,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-456"},"72ad-459":{"renderedLength":403,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-458"},"72ad-461":{"renderedLength":332,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-460"},"72ad-463":{"renderedLength":729,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-462"},"72ad-465":{"renderedLength":3248,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-464"},"72ad-467":{"renderedLength":3465,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-466"},"72ad-469":{"renderedLength":5873,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-468"},"72ad-471":{"renderedLength":2031,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-470"},"72ad-473":{"renderedLength":1328,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-472"},"72ad-475":{"renderedLength":3207,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-474"},"72ad-477":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-476"},"72ad-479":{"renderedLength":1107,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-478"},"72ad-481":{"renderedLength":11211,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-480"},"72ad-483":{"renderedLength":764,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-482"},"72ad-485":{"renderedLength":8566,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-484"},"72ad-487":{"renderedLength":4636,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-486"},"72ad-489":{"renderedLength":2537,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-488"},"72ad-491":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-490"},"72ad-493":{"renderedLength":6034,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-492"},"72ad-495":{"renderedLength":254,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-494"},"72ad-497":{"renderedLength":327,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-496"},"72ad-499":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-498"},"72ad-501":{"renderedLength":270,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-500"},"72ad-503":{"renderedLength":13500,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-502"},"72ad-505":{"renderedLength":3763,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-504"},"72ad-507":{"renderedLength":15757,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-506"},"72ad-509":{"renderedLength":9851,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-508"},"72ad-511":{"renderedLength":6781,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-510"},"72ad-513":{"renderedLength":285,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-512"},"72ad-515":{"renderedLength":2071,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-514"},"72ad-517":{"renderedLength":16944,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-516"},"72ad-519":{"renderedLength":4251,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-518"},"72ad-521":{"renderedLength":7582,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-520"},"72ad-523":{"renderedLength":7074,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-522"},"72ad-525":{"renderedLength":3020,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-524"},"72ad-527":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-526"},"72ad-529":{"renderedLength":3021,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-528"},"72ad-531":{"renderedLength":10067,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-530"},"72ad-533":{"renderedLength":187,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-532"},"72ad-535":{"renderedLength":370,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-534"},"72ad-537":{"renderedLength":86,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-536"},"72ad-539":{"renderedLength":6686,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-538"},"72ad-541":{"renderedLength":981,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-540"},"72ad-543":{"renderedLength":858,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-542"},"72ad-545":{"renderedLength":426,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-544"},"72ad-547":{"renderedLength":620,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-546"},"72ad-549":{"renderedLength":2457,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-548"},"72ad-551":{"renderedLength":4696,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-550"},"72ad-553":{"renderedLength":142,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-552"},"72ad-555":{"renderedLength":1871,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-554"},"72ad-557":{"renderedLength":1986,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-556"},"72ad-559":{"renderedLength":4833,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-558"},"72ad-561":{"renderedLength":467,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-560"},"72ad-563":{"renderedLength":1737,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-562"},"72ad-565":{"renderedLength":654,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-564"},"72ad-567":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-566"},"72ad-569":{"renderedLength":128,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-568"},"72ad-571":{"renderedLength":3806,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-570"},"72ad-573":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-572"},"72ad-575":{"renderedLength":105,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-574"},"72ad-577":{"renderedLength":96,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-576"},"72ad-579":{"renderedLength":157,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-578"},"72ad-581":{"renderedLength":11688,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-580"},"72ad-583":{"renderedLength":863,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-582"},"72ad-585":{"renderedLength":242,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-584"},"72ad-587":{"renderedLength":982,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-586"},"72ad-589":{"renderedLength":8480,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-588"},"72ad-591":{"renderedLength":4204,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-590"},"72ad-593":{"renderedLength":7511,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-592"},"72ad-595":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-594"},"72ad-597":{"renderedLength":699,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-596"},"72ad-599":{"renderedLength":10083,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-598"},"72ad-601":{"renderedLength":1480,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-600"},"72ad-603":{"renderedLength":97,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-602"},"72ad-605":{"renderedLength":620,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-604"},"72ad-607":{"renderedLength":552,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-606"},"72ad-609":{"renderedLength":937,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-608"},"72ad-611":{"renderedLength":578,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-610"},"72ad-613":{"renderedLength":403,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-612"},"72ad-615":{"renderedLength":88,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-614"},"72ad-617":{"renderedLength":64,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-616"},"72ad-619":{"renderedLength":482,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-618"},"72ad-621":{"renderedLength":549,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-620"},"72ad-623":{"renderedLength":1471,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-622"},"72ad-625":{"renderedLength":1320,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-624"},"72ad-627":{"renderedLength":467,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-626"},"72ad-629":{"renderedLength":498,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-628"},"72ad-631":{"renderedLength":578,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-630"},"72ad-633":{"renderedLength":214,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-632"},"72ad-635":{"renderedLength":3232,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-634"},"72ad-637":{"renderedLength":6173,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-636"},"72ad-639":{"renderedLength":7220,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-638"},"72ad-641":{"renderedLength":2905,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-640"},"72ad-643":{"renderedLength":1929,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-642"},"72ad-645":{"renderedLength":941,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-644"},"72ad-647":{"renderedLength":3308,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-646"},"72ad-649":{"renderedLength":2100,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-648"},"72ad-651":{"renderedLength":3010,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-650"},"72ad-653":{"renderedLength":2055,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-652"},"72ad-655":{"renderedLength":3622,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-654"},"72ad-657":{"renderedLength":4963,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-656"},"72ad-659":{"renderedLength":6395,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-658"},"72ad-661":{"renderedLength":4009,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-660"},"72ad-663":{"renderedLength":3396,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-662"},"72ad-665":{"renderedLength":3299,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-664"},"72ad-667":{"renderedLength":2800,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-666"},"72ad-669":{"renderedLength":3942,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-668"},"72ad-671":{"renderedLength":2405,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-670"},"72ad-673":{"renderedLength":2989,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-672"},"72ad-675":{"renderedLength":1934,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-674"},"72ad-677":{"renderedLength":2816,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-676"},"72ad-679":{"renderedLength":2811,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-678"},"72ad-681":{"renderedLength":4406,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-680"},"72ad-683":{"renderedLength":12028,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-682"},"72ad-685":{"renderedLength":4844,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-684"},"72ad-687":{"renderedLength":7706,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-686"},"72ad-689":{"renderedLength":1875,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-688"},"72ad-691":{"renderedLength":3123,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-690"},"72ad-693":{"renderedLength":13390,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-692"},"72ad-695":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-694"},"72ad-697":{"renderedLength":170,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-696"},"72ad-699":{"renderedLength":133,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-698"},"72ad-701":{"renderedLength":187,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-700"},"72ad-703":{"renderedLength":93,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-702"},"72ad-705":{"renderedLength":237,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-704"},"72ad-707":{"renderedLength":205,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-706"},"72ad-709":{"renderedLength":69,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-708"},"72ad-711":{"renderedLength":690,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-710"},"72ad-713":{"renderedLength":224,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-712"},"72ad-715":{"renderedLength":438,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-714"},"72ad-717":{"renderedLength":134,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-716"},"72ad-719":{"renderedLength":215,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-718"},"72ad-721":{"renderedLength":827,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-720"},"72ad-723":{"renderedLength":2995,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-722"},"72ad-725":{"renderedLength":4783,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-724"},"72ad-727":{"renderedLength":255,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-726"},"72ad-729":{"renderedLength":1928,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-728"},"72ad-731":{"renderedLength":1128,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-730"},"72ad-733":{"renderedLength":20656,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-732"},"72ad-735":{"renderedLength":18478,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-734"},"72ad-737":{"renderedLength":12694,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-736"},"72ad-739":{"renderedLength":22406,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-738"},"72ad-741":{"renderedLength":679255,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-740"},"72ad-743":{"renderedLength":10739,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-742"},"72ad-745":{"renderedLength":11353,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-744"},"72ad-747":{"renderedLength":7518,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-746"},"72ad-749":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-748"},"72ad-751":{"renderedLength":3398,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-750"},"72ad-753":{"renderedLength":1951,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-752"},"72ad-755":{"renderedLength":1010,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-754"},"72ad-757":{"renderedLength":2217,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-756"},"72ad-759":{"renderedLength":637,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-758"},"72ad-761":{"renderedLength":1636,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-760"},"72ad-763":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-762"},"72ad-765":{"renderedLength":1721,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-764"},"72ad-767":{"renderedLength":1199,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-766"},"72ad-769":{"renderedLength":7978,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-768"},"72ad-771":{"renderedLength":218,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-770"},"72ad-773":{"renderedLength":987,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-772"},"72ad-775":{"renderedLength":565,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-774"},"72ad-777":{"renderedLength":958,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-776"},"72ad-779":{"renderedLength":6419,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-778"},"72ad-781":{"renderedLength":530,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-780"},"72ad-783":{"renderedLength":408,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-782"},"72ad-785":{"renderedLength":587,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-784"},"72ad-787":{"renderedLength":5104,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-786"},"72ad-789":{"renderedLength":737,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-788"},"72ad-791":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-790"},"72ad-793":{"renderedLength":842,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-792"},"72ad-795":{"renderedLength":1307,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-794"},"72ad-797":{"renderedLength":1672,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-796"},"72ad-799":{"renderedLength":6405,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-798"},"72ad-801":{"renderedLength":2577,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-800"},"72ad-803":{"renderedLength":1235,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-802"},"72ad-805":{"renderedLength":3090,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-804"},"72ad-807":{"renderedLength":165,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-806"},"72ad-809":{"renderedLength":299,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-808"},"72ad-811":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-810"},"72ad-813":{"renderedLength":173,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-812"},"72ad-815":{"renderedLength":1747,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-814"},"72ad-817":{"renderedLength":5822,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-816"},"72ad-819":{"renderedLength":5888,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-818"},"72ad-821":{"renderedLength":607,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-820"},"72ad-823":{"renderedLength":494,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-822"},"72ad-825":{"renderedLength":1602,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-824"},"72ad-827":{"renderedLength":366,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-826"},"72ad-829":{"renderedLength":1184,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-828"},"72ad-831":{"renderedLength":557,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-830"},"72ad-833":{"renderedLength":371,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-832"},"72ad-835":{"renderedLength":1744,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-834"},"72ad-837":{"renderedLength":1311,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-836"},"72ad-839":{"renderedLength":1167,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-838"},"72ad-841":{"renderedLength":1852,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-840"},"72ad-843":{"renderedLength":266,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-842"},"72ad-845":{"renderedLength":75,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-844"},"72ad-847":{"renderedLength":768,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-846"},"72ad-849":{"renderedLength":259,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-848"},"72ad-851":{"renderedLength":237,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-850"},"72ad-853":{"renderedLength":562,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-852"},"72ad-855":{"renderedLength":12107,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-854"},"72ad-857":{"renderedLength":167,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-856"},"72ad-859":{"renderedLength":599,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-858"},"72ad-861":{"renderedLength":1114,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-860"},"72ad-863":{"renderedLength":1167,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-862"},"72ad-865":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-864"},"72ad-867":{"renderedLength":1770,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-866"},"72ad-869":{"renderedLength":6170,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-868"},"72ad-871":{"renderedLength":766,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-870"},"72ad-873":{"renderedLength":2558,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-872"},"72ad-875":{"renderedLength":1484,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-874"},"72ad-877":{"renderedLength":2245,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-876"},"72ad-879":{"renderedLength":4241,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-878"},"72ad-881":{"renderedLength":1939,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-880"},"72ad-883":{"renderedLength":9761,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-882"},"72ad-885":{"renderedLength":1374,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-884"},"72ad-887":{"renderedLength":3216,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-886"},"72ad-889":{"renderedLength":267,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-888"},"72ad-891":{"renderedLength":1645,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-890"},"72ad-893":{"renderedLength":568,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-892"},"72ad-895":{"renderedLength":12378,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-894"},"72ad-897":{"renderedLength":352,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-896"},"72ad-899":{"renderedLength":13753,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-898"},"72ad-901":{"renderedLength":10228,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-900"},"72ad-903":{"renderedLength":2381,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-902"},"72ad-905":{"renderedLength":679,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-904"},"72ad-907":{"renderedLength":418,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-906"},"72ad-909":{"renderedLength":1403,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-908"},"72ad-911":{"renderedLength":1476,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-910"},"72ad-913":{"renderedLength":5831,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-912"},"72ad-915":{"renderedLength":741,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-914"},"72ad-917":{"renderedLength":3884,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-916"},"72ad-919":{"renderedLength":2606,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-918"},"72ad-921":{"renderedLength":1342,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-920"},"72ad-923":{"renderedLength":1565,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-922"},"72ad-925":{"renderedLength":1319,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-924"},"72ad-927":{"renderedLength":4216,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-926"},"72ad-929":{"renderedLength":443,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-928"},"72ad-931":{"renderedLength":637,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-930"},"72ad-933":{"renderedLength":647,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-932"},"72ad-935":{"renderedLength":1971,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-934"},"72ad-937":{"renderedLength":5156,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-936"},"72ad-939":{"renderedLength":5007,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-938"},"72ad-941":{"renderedLength":672,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-940"},"72ad-943":{"renderedLength":2292,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-942"},"72ad-945":{"renderedLength":3896,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-944"},"72ad-947":{"renderedLength":1531,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-946"},"72ad-949":{"renderedLength":2086,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-948"},"72ad-951":{"renderedLength":361,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-950"},"72ad-953":{"renderedLength":3831,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-952"},"72ad-955":{"renderedLength":8900,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-954"},"72ad-957":{"renderedLength":2736,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-956"},"72ad-959":{"renderedLength":1621,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-958"},"72ad-961":{"renderedLength":4350,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-960"},"72ad-963":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-962"},"72ad-965":{"renderedLength":279,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-964"},"72ad-967":{"renderedLength":468,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-966"},"72ad-969":{"renderedLength":1353,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-968"},"72ad-971":{"renderedLength":5368,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-970"},"72ad-973":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-972"},"72ad-975":{"renderedLength":1086,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-974"},"72ad-977":{"renderedLength":339,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-976"},"72ad-979":{"renderedLength":302,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-978"},"72ad-981":{"renderedLength":605,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-980"},"72ad-983":{"renderedLength":89,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-982"},"72ad-985":{"renderedLength":1204,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-984"},"72ad-987":{"renderedLength":177,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-986"},"72ad-989":{"renderedLength":3009,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-988"},"72ad-991":{"renderedLength":1816,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-990"},"72ad-993":{"renderedLength":5470,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-992"},"72ad-995":{"renderedLength":2570,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-994"},"72ad-997":{"renderedLength":1537,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-996"},"72ad-999":{"renderedLength":143,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-998"},"72ad-1001":{"renderedLength":390,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1000"},"72ad-1003":{"renderedLength":2649,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1002"},"72ad-1005":{"renderedLength":2523,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1004"},"72ad-1007":{"renderedLength":3457,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1006"},"72ad-1009":{"renderedLength":5808,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1008"},"72ad-1011":{"renderedLength":351,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1010"},"72ad-1013":{"renderedLength":7896,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1012"},"72ad-1015":{"renderedLength":8325,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1014"},"72ad-1017":{"renderedLength":11180,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1016"},"72ad-1019":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1018"},"72ad-1021":{"renderedLength":8615,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1020"},"72ad-1023":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1022"},"72ad-1025":{"renderedLength":9712,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1024"},"72ad-1027":{"renderedLength":615,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1026"},"72ad-1029":{"renderedLength":309,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1028"},"72ad-1031":{"renderedLength":194,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1030"},"72ad-1033":{"renderedLength":288,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1032"},"72ad-1035":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1034"},"72ad-1037":{"renderedLength":1396,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1036"},"72ad-1039":{"renderedLength":1503,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1038"},"72ad-1041":{"renderedLength":2366,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1040"},"72ad-1043":{"renderedLength":2422,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1042"},"72ad-1045":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1044"},"72ad-1047":{"renderedLength":1239,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1046"},"72ad-1049":{"renderedLength":12315,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1048"},"72ad-1051":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1050"},"72ad-1053":{"renderedLength":529,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1052"},"72ad-1055":{"renderedLength":709,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1054"},"72ad-1057":{"renderedLength":1400,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1056"},"72ad-1059":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1058"},"72ad-1061":{"renderedLength":4303,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1060"},"72ad-1063":{"renderedLength":1167,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1062"},"72ad-1065":{"renderedLength":106,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1064"},"72ad-1067":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1066"},"72ad-1069":{"renderedLength":760,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1068"},"72ad-1071":{"renderedLength":493,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1070"},"72ad-1073":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1072"},"72ad-1075":{"renderedLength":401,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1074"},"72ad-1077":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1076"},"72ad-1079":{"renderedLength":1819,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1078"},"72ad-1081":{"renderedLength":1761,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1080"},"72ad-1083":{"renderedLength":1481,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1082"},"72ad-1085":{"renderedLength":475,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1084"},"72ad-1087":{"renderedLength":343,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1086"},"72ad-1089":{"renderedLength":25835,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1088"},"72ad-1091":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1090"},"72ad-1093":{"renderedLength":16490,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1092"},"72ad-1095":{"renderedLength":3069,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1094"},"72ad-1097":{"renderedLength":295,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1096"},"72ad-1099":{"renderedLength":10590,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1098"},"72ad-1101":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1100"},"72ad-1103":{"renderedLength":994,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1102"},"72ad-1105":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1104"},"72ad-1107":{"renderedLength":1764,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1106"},"72ad-1109":{"renderedLength":617,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1108"},"72ad-1111":{"renderedLength":1182,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1110"},"72ad-1113":{"renderedLength":256,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1112"},"72ad-1115":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1114"},"72ad-1117":{"renderedLength":264,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1116"},"72ad-1119":{"renderedLength":302,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1118"},"72ad-1121":{"renderedLength":199,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1120"},"72ad-1123":{"renderedLength":790,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1122"},"72ad-1125":{"renderedLength":53,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1124"},"72ad-1127":{"renderedLength":2292,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1126"},"72ad-1129":{"renderedLength":3972,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1128"},"72ad-1131":{"renderedLength":358,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1130"},"72ad-1133":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1132"},"72ad-1135":{"renderedLength":520,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1134"},"72ad-1137":{"renderedLength":504,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1136"},"72ad-1139":{"renderedLength":2350,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1138"},"72ad-1141":{"renderedLength":4494,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1140"},"72ad-1143":{"renderedLength":204,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1142"},"72ad-1145":{"renderedLength":1966,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1144"},"72ad-1147":{"renderedLength":981,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1146"},"72ad-1149":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1148"},"72ad-1151":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1150"},"72ad-1153":{"renderedLength":8521,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1152"},"72ad-1155":{"renderedLength":7574,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1154"},"72ad-1157":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1156"},"72ad-1159":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1158"},"72ad-1161":{"renderedLength":434,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1160"},"72ad-1163":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1162"},"72ad-1165":{"renderedLength":975,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1164"},"72ad-1167":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1166"},"72ad-1169":{"renderedLength":611,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1168"},"72ad-1171":{"renderedLength":379,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1170"},"72ad-1173":{"renderedLength":308,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1172"},"72ad-1175":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1174"},"72ad-1177":{"renderedLength":5319,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1176"},"72ad-1179":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1178"},"72ad-1181":{"renderedLength":1678,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1180"},"72ad-1183":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1182"},"72ad-1185":{"renderedLength":1283,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1184"},"72ad-1187":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1186"},"72ad-1189":{"renderedLength":3224,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1188"},"72ad-1191":{"renderedLength":6047,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1190"},"72ad-1193":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1192"},"72ad-1195":{"renderedLength":8621,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1194"},"72ad-1197":{"renderedLength":1030,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1196"},"72ad-1199":{"renderedLength":1348,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1198"},"72ad-1201":{"renderedLength":1116,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1200"},"72ad-1203":{"renderedLength":5152,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1202"},"72ad-1205":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1204"},"72ad-1207":{"renderedLength":4166,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1206"},"72ad-1209":{"renderedLength":249,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1208"},"72ad-1211":{"renderedLength":1932,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1210"},"72ad-1213":{"renderedLength":913,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1212"},"72ad-1215":{"renderedLength":228,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1214"},"72ad-1217":{"renderedLength":916,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1216"},"72ad-1219":{"renderedLength":2113,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1218"},"72ad-1221":{"renderedLength":517,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1220"},"72ad-1223":{"renderedLength":1670,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1222"},"72ad-1225":{"renderedLength":11694,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1224"},"72ad-1227":{"renderedLength":1233,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1226"},"72ad-1229":{"renderedLength":243,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1228"},"72ad-1231":{"renderedLength":638,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1230"},"72ad-1233":{"renderedLength":15496,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1232"},"72ad-1235":{"renderedLength":687,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1234"},"72ad-1237":{"renderedLength":841,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1236"},"72ad-1239":{"renderedLength":14977,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1238"},"72ad-1241":{"renderedLength":787,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1240"},"72ad-1243":{"renderedLength":6550,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1242"},"72ad-1245":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1244"},"72ad-1247":{"renderedLength":538,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1246"},"72ad-1249":{"renderedLength":194,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1248"},"72ad-1251":{"renderedLength":415,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1250"},"72ad-1253":{"renderedLength":2218,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1252"},"72ad-1255":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1254"},"72ad-1257":{"renderedLength":3749,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1256"},"72ad-1259":{"renderedLength":675,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1258"},"72ad-1261":{"renderedLength":2880,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1260"},"72ad-1263":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1262"},"72ad-1265":{"renderedLength":4201,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1264"},"72ad-1267":{"renderedLength":215,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1266"},"72ad-1269":{"renderedLength":689,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1268"},"72ad-1271":{"renderedLength":8037,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1270"},"72ad-1273":{"renderedLength":341,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1272"},"72ad-1275":{"renderedLength":277,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1274"},"72ad-1277":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1276"},"72ad-1279":{"renderedLength":12969,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1278"},"72ad-1281":{"renderedLength":9413,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1280"},"72ad-1283":{"renderedLength":13575,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1282"},"72ad-1285":{"renderedLength":286,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1284"},"72ad-1287":{"renderedLength":5103,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1286"},"72ad-1289":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1288"},"72ad-1291":{"renderedLength":1337,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1290"},"72ad-1293":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1292"},"72ad-1295":{"renderedLength":32,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1294"},"72ad-1297":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1296"},"72ad-1299":{"renderedLength":694,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1298"},"72ad-1301":{"renderedLength":477,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1300"},"72ad-1303":{"renderedLength":892,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1302"},"72ad-1305":{"renderedLength":492,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1304"},"72ad-1307":{"renderedLength":322,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1306"},"72ad-1309":{"renderedLength":3282,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1308"},"72ad-1311":{"renderedLength":4441,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1310"},"72ad-1313":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1312"},"72ad-1315":{"renderedLength":3280,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1314"},"72ad-1317":{"renderedLength":208,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1316"},"72ad-1319":{"renderedLength":2237,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1318"},"72ad-1321":{"renderedLength":259,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1320"},"72ad-1323":{"renderedLength":2490,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1322"},"72ad-1325":{"renderedLength":322,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1324"},"72ad-1327":{"renderedLength":2556,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1326"},"72ad-1329":{"renderedLength":1736,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1328"},"72ad-1331":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1330"},"72ad-1333":{"renderedLength":111,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1332"},"72ad-1335":{"renderedLength":107,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1334"},"72ad-1337":{"renderedLength":956,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1336"},"72ad-1339":{"renderedLength":8117,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1338"},"72ad-1341":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1340"},"72ad-1343":{"renderedLength":1216,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1342"},"72ad-1345":{"renderedLength":483,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1344"},"72ad-1347":{"renderedLength":17035,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1346"},"72ad-1349":{"renderedLength":1356,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1348"},"72ad-1351":{"renderedLength":7930,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1350"},"72ad-1353":{"renderedLength":8753,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1352"},"72ad-1355":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1354"},"72ad-1357":{"renderedLength":10667,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1356"},"72ad-1359":{"renderedLength":1593,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1358"},"72ad-1361":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1360"},"72ad-1363":{"renderedLength":4488,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1362"},"72ad-1365":{"renderedLength":3614,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1364"},"72ad-1367":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1366"},"72ad-1369":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1368"},"72ad-1371":{"renderedLength":10121,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1370"},"72ad-1373":{"renderedLength":655,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1372"},"72ad-1375":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1374"},"72ad-1377":{"renderedLength":130,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1376"},"72ad-1379":{"renderedLength":107,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1378"},"72ad-1381":{"renderedLength":98,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1380"},"72ad-1383":{"renderedLength":120,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1382"},"72ad-1385":{"renderedLength":162,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1384"},"72ad-1387":{"renderedLength":867,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1386"},"72ad-1389":{"renderedLength":990,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1388"},"72ad-1391":{"renderedLength":5652,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1390"},"72ad-1393":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1392"},"72ad-1395":{"renderedLength":636,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1394"},"72ad-1397":{"renderedLength":553,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1396"},"72ad-1399":{"renderedLength":581,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1398"},"72ad-1401":{"renderedLength":404,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1400"},"72ad-1403":{"renderedLength":67,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1402"},"72ad-1405":{"renderedLength":487,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1404"},"72ad-1407":{"renderedLength":148,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1406"},"72ad-1409":{"renderedLength":585,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1408"},"72ad-1411":{"renderedLength":216,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1410"},"72ad-1413":{"renderedLength":3408,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1412"},"72ad-1415":{"renderedLength":1952,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1414"},"72ad-1417":{"renderedLength":1015,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1416"},"72ad-1419":{"renderedLength":2245,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1418"},"72ad-1421":{"renderedLength":641,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1420"},"72ad-1423":{"renderedLength":1640,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1422"},"72ad-1425":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1424"},"72ad-1427":{"renderedLength":1725,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1426"},"72ad-1429":{"renderedLength":1202,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1428"},"72ad-1431":{"renderedLength":8038,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1430"},"72ad-1433":{"renderedLength":220,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1432"},"72ad-1435":{"renderedLength":993,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1434"},"72ad-1437":{"renderedLength":568,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1436"},"72ad-1439":{"renderedLength":959,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1438"},"72ad-1441":{"renderedLength":6432,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1440"},"72ad-1443":{"renderedLength":536,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1442"},"72ad-1445":{"renderedLength":413,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1444"},"72ad-1447":{"renderedLength":589,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1446"},"72ad-1449":{"renderedLength":5117,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1448"},"72ad-1451":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1450"},"72ad-1453":{"renderedLength":6412,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1452"},"72ad-1455":{"renderedLength":2633,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1454"},"72ad-1457":{"renderedLength":1237,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1456"},"72ad-1459":{"renderedLength":3099,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1458"},"72ad-1461":{"renderedLength":166,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1460"},"72ad-1463":{"renderedLength":300,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1462"},"72ad-1465":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1464"},"72ad-1467":{"renderedLength":174,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1466"},"72ad-1469":{"renderedLength":1752,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1468"},"72ad-1471":{"renderedLength":5823,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1470"},"72ad-1473":{"renderedLength":5896,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1472"},"72ad-1475":{"renderedLength":619,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1474"},"72ad-1477":{"renderedLength":504,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1476"},"72ad-1479":{"renderedLength":1606,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1478"},"72ad-1481":{"renderedLength":369,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1480"},"72ad-1483":{"renderedLength":1193,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1482"},"72ad-1485":{"renderedLength":562,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1484"},"72ad-1487":{"renderedLength":378,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1486"},"72ad-1489":{"renderedLength":1770,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1488"},"72ad-1491":{"renderedLength":1317,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1490"},"72ad-1493":{"renderedLength":1174,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1492"},"72ad-1495":{"renderedLength":1857,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1494"},"72ad-1497":{"renderedLength":267,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1496"},"72ad-1499":{"renderedLength":76,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1498"},"72ad-1501":{"renderedLength":770,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1500"},"72ad-1503":{"renderedLength":260,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1502"},"72ad-1505":{"renderedLength":237,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1504"},"72ad-1507":{"renderedLength":562,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1506"},"72ad-1509":{"renderedLength":12103,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1508"},"72ad-1511":{"renderedLength":167,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1510"},"72ad-1513":{"renderedLength":599,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1512"},"72ad-1515":{"renderedLength":1127,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1514"},"72ad-1517":{"renderedLength":1174,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1516"},"72ad-1519":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1518"},"72ad-1521":{"renderedLength":1776,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1520"},"72ad-1523":{"renderedLength":6181,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1522"},"72ad-1525":{"renderedLength":769,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1524"},"72ad-1527":{"renderedLength":2570,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1526"},"72ad-1529":{"renderedLength":1489,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1528"},"72ad-1531":{"renderedLength":2249,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1530"},"72ad-1533":{"renderedLength":4246,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1532"},"72ad-1535":{"renderedLength":1953,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1534"},"72ad-1537":{"renderedLength":9830,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1536"},"72ad-1539":{"renderedLength":1378,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1538"},"72ad-1541":{"renderedLength":3225,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1540"},"72ad-1543":{"renderedLength":269,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1542"},"72ad-1545":{"renderedLength":1647,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1544"},"72ad-1547":{"renderedLength":574,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1546"},"72ad-1549":{"renderedLength":12407,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1548"},"72ad-1551":{"renderedLength":354,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1550"},"72ad-1553":{"renderedLength":13667,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1552"},"72ad-1555":{"renderedLength":10236,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1554"},"72ad-1557":{"renderedLength":2387,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1556"},"72ad-1559":{"renderedLength":680,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1558"},"72ad-1561":{"renderedLength":419,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1560"},"72ad-1563":{"renderedLength":1409,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1562"},"72ad-1565":{"renderedLength":1480,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1564"},"72ad-1567":{"renderedLength":5853,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1566"},"72ad-1569":{"renderedLength":742,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1568"},"72ad-1571":{"renderedLength":3901,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1570"},"72ad-1573":{"renderedLength":2613,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1572"},"72ad-1575":{"renderedLength":1351,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1574"},"72ad-1577":{"renderedLength":1571,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1576"},"72ad-1579":{"renderedLength":1329,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1578"},"72ad-1581":{"renderedLength":3864,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1580"},"72ad-1583":{"renderedLength":444,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1582"},"72ad-1585":{"renderedLength":640,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1584"},"72ad-1587":{"renderedLength":650,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1586"},"72ad-1589":{"renderedLength":1979,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1588"},"72ad-1591":{"renderedLength":5172,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1590"},"72ad-1593":{"renderedLength":5023,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1592"},"72ad-1595":{"renderedLength":679,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1594"},"72ad-1597":{"renderedLength":2323,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1596"},"72ad-1599":{"renderedLength":3908,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1598"},"72ad-1601":{"renderedLength":1534,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1600"},"72ad-1603":{"renderedLength":2101,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1602"},"72ad-1605":{"renderedLength":364,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1604"},"72ad-1607":{"renderedLength":3915,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1606"},"72ad-1609":{"renderedLength":8921,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1608"},"72ad-1611":{"renderedLength":2741,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1610"},"72ad-1613":{"renderedLength":1632,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1612"},"72ad-1615":{"renderedLength":4401,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1614"},"72ad-1617":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1616"},"72ad-1619":{"renderedLength":283,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1618"},"72ad-1621":{"renderedLength":470,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1620"},"72ad-1623":{"renderedLength":1354,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1622"},"72ad-1625":{"renderedLength":5389,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1624"},"72ad-1627":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1626"},"72ad-1629":{"renderedLength":1094,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1628"},"72ad-1631":{"renderedLength":88,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1630"},"72ad-1633":{"renderedLength":1216,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1632"},"72ad-1635":{"renderedLength":178,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1634"},"72ad-1637":{"renderedLength":3015,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1636"},"72ad-1639":{"renderedLength":1821,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1638"},"72ad-1641":{"renderedLength":5502,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1640"},"72ad-1643":{"renderedLength":2575,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1642"},"72ad-1645":{"renderedLength":1540,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1644"},"72ad-1647":{"renderedLength":152,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1646"},"72ad-1649":{"renderedLength":392,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1648"},"72ad-1651":{"renderedLength":2661,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1650"},"72ad-1653":{"renderedLength":2532,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1652"},"72ad-1655":{"renderedLength":3469,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1654"},"72ad-1657":{"renderedLength":5823,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1656"},"72ad-1659":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1658"},"72ad-1661":{"renderedLength":2100,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1660"},"72ad-1663":{"renderedLength":25437,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1662"},"72ad-1665":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1664"},"72ad-1667":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1666"},"72ad-1669":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1668"},"72ad-1671":{"renderedLength":2264,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1670"},"72ad-1673":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1672"},"72ad-1675":{"renderedLength":4130,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1674"},"72ad-1677":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1676"},"72ad-1679":{"renderedLength":4527,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1678"},"72ad-1681":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1680"},"72ad-1683":{"renderedLength":7592,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1682"},"72ad-1685":{"renderedLength":3653,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1684"},"72ad-1687":{"renderedLength":6213,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1686"},"72ad-1689":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1688"},"72ad-1691":{"renderedLength":2793,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1690"},"72ad-1693":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1692"},"72ad-1695":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1694"},"72ad-1697":{"renderedLength":5566,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1696"},"72ad-1699":{"renderedLength":2988,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1698"},"72ad-1701":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1700"},"72ad-1703":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1702"},"72ad-1705":{"renderedLength":3053,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1704"},"72ad-1707":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1706"},"72ad-1709":{"renderedLength":3294,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1708"},"72ad-1711":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1710"},"72ad-1713":{"renderedLength":4357,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1712"},"72ad-1715":{"renderedLength":1814,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1714"},"72ad-1717":{"renderedLength":4061,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1716"},"72ad-1719":{"renderedLength":13514,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1718"},"72ad-1721":{"renderedLength":11215,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1720"},"72ad-1723":{"renderedLength":10698,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1722"},"72ad-1725":{"renderedLength":7687,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1724"},"72ad-1727":{"renderedLength":7562,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1726"},"72ad-1729":{"renderedLength":5633,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1728"},"72ad-1731":{"renderedLength":10503,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1730"},"72ad-1733":{"renderedLength":3415,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1732"},"72ad-1735":{"renderedLength":9276,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1734"},"72ad-1737":{"renderedLength":2355,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1736"},"72ad-1739":{"renderedLength":9621,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1738"},"72ad-1741":{"renderedLength":5202,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1740"},"72ad-1743":{"renderedLength":2233,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1742"},"72ad-1745":{"renderedLength":23471,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1744"},"72ad-1747":{"renderedLength":2923,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1746"},"72ad-1749":{"renderedLength":5279,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1748"},"72ad-1751":{"renderedLength":2900,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1750"},"72ad-1753":{"renderedLength":24167,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1752"},"72ad-1755":{"renderedLength":13701,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1754"},"72ad-1757":{"renderedLength":2377,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1756"},"72ad-1759":{"renderedLength":2332,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1758"},"72ad-1761":{"renderedLength":11678,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1760"},"72ad-1763":{"renderedLength":6564,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1762"},"72ad-1765":{"renderedLength":5087,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1764"},"72ad-1767":{"renderedLength":15574,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1766"},"72ad-1769":{"renderedLength":21678,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1768"},"72ad-1771":{"renderedLength":7843,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1770"},"72ad-1773":{"renderedLength":21946,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1772"},"72ad-1775":{"renderedLength":15243,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1774"},"72ad-1777":{"renderedLength":10552,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1776"},"72ad-1779":{"renderedLength":464,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1778"},"72ad-1781":{"renderedLength":20571,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1780"},"72ad-1783":{"renderedLength":8291,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1782"},"72ad-1785":{"renderedLength":8821,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1784"},"72ad-1787":{"renderedLength":5648,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1786"},"72ad-1789":{"renderedLength":833,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1788"},"72ad-1791":{"renderedLength":12478,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1790"},"72ad-1793":{"renderedLength":19822,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1792"},"72ad-1795":{"renderedLength":7244,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1794"},"72ad-1797":{"renderedLength":5788,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1796"},"72ad-1799":{"renderedLength":8027,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1798"},"72ad-1801":{"renderedLength":4215,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1800"},"72ad-1803":{"renderedLength":2727,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1802"},"72ad-1805":{"renderedLength":9397,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1804"},"72ad-1807":{"renderedLength":2217,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1806"},"72ad-1809":{"renderedLength":13271,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1808"},"72ad-1811":{"renderedLength":3231,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1810"},"72ad-1813":{"renderedLength":4305,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1812"},"72ad-1815":{"renderedLength":9696,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1814"},"72ad-1817":{"renderedLength":7770,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1816"},"72ad-1819":{"renderedLength":1607,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1818"},"72ad-1821":{"renderedLength":9527,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1820"},"72ad-1823":{"renderedLength":8243,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1822"},"72ad-1825":{"renderedLength":15713,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1824"},"72ad-1827":{"renderedLength":6652,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1826"},"72ad-1829":{"renderedLength":1819,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1828"},"72ad-1831":{"renderedLength":2222,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1830"},"72ad-1833":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1832"},"72ad-1835":{"renderedLength":574,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1834"},"72ad-1837":{"renderedLength":2252,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1836"},"72ad-1839":{"renderedLength":3149,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1838"},"72ad-1841":{"renderedLength":3173,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1840"},"72ad-1843":{"renderedLength":16347,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1842"},"72ad-1845":{"renderedLength":5850,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1844"},"72ad-1847":{"renderedLength":362,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1846"},"72ad-1849":{"renderedLength":2834,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1848"},"72ad-1851":{"renderedLength":2951,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1850"},"72ad-1853":{"renderedLength":3767,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1852"},"72ad-1855":{"renderedLength":2131,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1854"},"72ad-1857":{"renderedLength":15230,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1856"},"72ad-1859":{"renderedLength":711,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1858"},"72ad-1861":{"renderedLength":7604,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1860"},"72ad-1863":{"renderedLength":2012,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1862"},"72ad-1865":{"renderedLength":768,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1864"},"72ad-1867":{"renderedLength":1429,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1866"},"72ad-1869":{"renderedLength":2686,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1868"},"72ad-1871":{"renderedLength":7030,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1870"},"72ad-1873":{"renderedLength":10164,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1872"},"72ad-1875":{"renderedLength":6529,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1874"},"72ad-1877":{"renderedLength":7371,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1876"},"72ad-1879":{"renderedLength":3548,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1878"},"72ad-1881":{"renderedLength":3958,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1880"},"72ad-1883":{"renderedLength":10011,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1882"},"72ad-1885":{"renderedLength":287,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1884"},"72ad-1887":{"renderedLength":14926,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1886"},"72ad-1889":{"renderedLength":2949,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1888"},"72ad-1891":{"renderedLength":1277,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1890"},"72ad-1893":{"renderedLength":8752,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1892"},"72ad-1895":{"renderedLength":2243,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1894"},"72ad-1897":{"renderedLength":1612,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1896"},"72ad-1899":{"renderedLength":2721,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1898"},"72ad-1901":{"renderedLength":2213,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1900"},"72ad-1903":{"renderedLength":3132,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1902"},"72ad-1905":{"renderedLength":1709,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1904"},"72ad-1907":{"renderedLength":4599,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1906"},"72ad-1909":{"renderedLength":9477,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1908"},"72ad-1911":{"renderedLength":12467,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1910"},"72ad-1913":{"renderedLength":2719,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1912"},"72ad-1915":{"renderedLength":14606,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1914"},"72ad-1917":{"renderedLength":14127,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1916"},"72ad-1919":{"renderedLength":13503,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1918"},"72ad-1921":{"renderedLength":31638,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1920"},"72ad-1923":{"renderedLength":21070,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1922"},"72ad-1925":{"renderedLength":3173,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1924"},"72ad-1927":{"renderedLength":10619,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1926"},"72ad-1929":{"renderedLength":6901,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1928"},"72ad-1931":{"renderedLength":747,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1930"},"72ad-1933":{"renderedLength":5054,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1932"},"72ad-1935":{"renderedLength":7678,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1934"},"72ad-1937":{"renderedLength":2926,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1936"},"72ad-1939":{"renderedLength":6901,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1938"},"72ad-1941":{"renderedLength":3337,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1940"},"72ad-1943":{"renderedLength":14377,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1942"},"72ad-1945":{"renderedLength":906,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1944"},"72ad-1947":{"renderedLength":3944,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1946"},"72ad-1949":{"renderedLength":2032,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1948"},"72ad-1951":{"renderedLength":3292,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1950"},"72ad-1953":{"renderedLength":1568,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1952"},"72ad-1955":{"renderedLength":885,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1954"},"72ad-1957":{"renderedLength":4711,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1956"},"72ad-1959":{"renderedLength":6081,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1958"},"72ad-1961":{"renderedLength":8223,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1960"},"72ad-1963":{"renderedLength":2950,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1962"},"72ad-1965":{"renderedLength":1418,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1964"},"72ad-1967":{"renderedLength":784,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1966"},"72ad-1969":{"renderedLength":8753,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1968"},"72ad-1971":{"renderedLength":4423,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1970"},"72ad-1973":{"renderedLength":1625,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1972"},"72ad-1975":{"renderedLength":848,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1974"},"72ad-1977":{"renderedLength":3190,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1976"},"72ad-1979":{"renderedLength":2556,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1978"},"72ad-1981":{"renderedLength":4153,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1980"},"72ad-1983":{"renderedLength":4147,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1982"},"72ad-1985":{"renderedLength":481,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1984"},"72ad-1987":{"renderedLength":1222,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1986"},"72ad-1989":{"renderedLength":2038,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1988"},"72ad-1991":{"renderedLength":4089,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1990"},"72ad-1993":{"renderedLength":1111,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1992"},"72ad-1995":{"renderedLength":9201,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1994"},"72ad-1997":{"renderedLength":13066,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1996"},"72ad-1999":{"renderedLength":15110,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-1998"},"72ad-2001":{"renderedLength":4720,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2000"},"72ad-2003":{"renderedLength":5745,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2002"},"72ad-2005":{"renderedLength":1518,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2004"},"72ad-2007":{"renderedLength":3105,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2006"},"72ad-2009":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2008"},"72ad-2011":{"renderedLength":9686,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2010"},"72ad-2013":{"renderedLength":7926,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2012"},"72ad-2015":{"renderedLength":4875,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2014"},"72ad-2017":{"renderedLength":2413,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2016"},"72ad-2019":{"renderedLength":2215,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2018"},"72ad-2021":{"renderedLength":1358,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2020"},"72ad-2023":{"renderedLength":8619,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2022"},"72ad-2025":{"renderedLength":75121,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2024"},"72ad-2027":{"renderedLength":13614,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2026"},"72ad-2029":{"renderedLength":8104,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2028"},"72ad-2031":{"renderedLength":4387,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2030"},"72ad-2033":{"renderedLength":255,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2032"},"72ad-2035":{"renderedLength":2347,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2034"},"72ad-2037":{"renderedLength":1381,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2036"},"72ad-2039":{"renderedLength":2203,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2038"},"72ad-2041":{"renderedLength":6659,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2040"},"72ad-2043":{"renderedLength":11840,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2042"},"72ad-2045":{"renderedLength":1125,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2044"},"72ad-2047":{"renderedLength":461,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2046"},"72ad-2049":{"renderedLength":2618,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2048"},"72ad-2051":{"renderedLength":1946,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2050"},"72ad-2053":{"renderedLength":2348,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2052"},"72ad-2055":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2054"},"72ad-2057":{"renderedLength":3271,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2056"},"72ad-2059":{"renderedLength":2569,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2058"},"72ad-2061":{"renderedLength":2823,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2060"},"72ad-2063":{"renderedLength":632,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2062"},"72ad-2065":{"renderedLength":3004,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2064"},"72ad-2067":{"renderedLength":2933,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2066"},"72ad-2069":{"renderedLength":1795,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2068"},"72ad-2071":{"renderedLength":1321,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2070"},"72ad-2073":{"renderedLength":2956,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2072"},"72ad-2075":{"renderedLength":2007,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2074"},"72ad-2077":{"renderedLength":3422,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2076"},"72ad-2079":{"renderedLength":3127,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2078"},"72ad-2081":{"renderedLength":10200,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2080"},"72ad-2083":{"renderedLength":3900,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2082"},"72ad-2085":{"renderedLength":2086,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2084"},"72ad-2087":{"renderedLength":2808,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2086"},"72ad-2089":{"renderedLength":566,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2088"},"72ad-2091":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2090"},"72ad-2093":{"renderedLength":10054,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2092"},"72ad-2095":{"renderedLength":5494,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2094"},"72ad-2097":{"renderedLength":1941,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2096"},"72ad-2099":{"renderedLength":4195,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2098"},"72ad-2101":{"renderedLength":5041,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2100"},"72ad-2103":{"renderedLength":508,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2102"},"72ad-2105":{"renderedLength":2951,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2104"},"72ad-2107":{"renderedLength":7462,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2106"},"72ad-2109":{"renderedLength":2369,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2108"},"72ad-2111":{"renderedLength":2315,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2110"},"72ad-2113":{"renderedLength":7600,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2112"},"72ad-2115":{"renderedLength":408,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2114"},"72ad-2117":{"renderedLength":1869,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2116"},"72ad-2119":{"renderedLength":1988,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2118"},"72ad-2121":{"renderedLength":346,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2120"},"72ad-2123":{"renderedLength":13286,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2122"},"72ad-2125":{"renderedLength":11074,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2124"},"72ad-2127":{"renderedLength":6842,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2126"},"72ad-2129":{"renderedLength":1109,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2128"},"72ad-2131":{"renderedLength":10157,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2130"},"72ad-2133":{"renderedLength":9494,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2132"},"72ad-2135":{"renderedLength":27340,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2134"},"72ad-2137":{"renderedLength":6138,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2136"},"72ad-2139":{"renderedLength":3404,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2138"},"72ad-2141":{"renderedLength":1553,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2140"},"72ad-2143":{"renderedLength":1470,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2142"},"72ad-2145":{"renderedLength":6990,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2144"},"72ad-2147":{"renderedLength":2279,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2146"},"72ad-2149":{"renderedLength":12773,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2148"},"72ad-2151":{"renderedLength":3098,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2150"},"72ad-2153":{"renderedLength":4296,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2152"},"72ad-2155":{"renderedLength":8787,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2154"},"72ad-2157":{"renderedLength":3320,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2156"},"72ad-2159":{"renderedLength":4212,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2158"},"72ad-2161":{"renderedLength":5733,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2160"},"72ad-2163":{"renderedLength":4577,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2162"},"72ad-2165":{"renderedLength":25673,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2164"},"72ad-2167":{"renderedLength":765,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2166"},"72ad-2169":{"renderedLength":10530,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2168"},"72ad-2171":{"renderedLength":15212,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2170"},"72ad-2173":{"renderedLength":15322,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2172"},"72ad-2175":{"renderedLength":15210,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2174"},"72ad-2177":{"renderedLength":21433,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2176"},"72ad-2179":{"renderedLength":9161,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2178"},"72ad-2181":{"renderedLength":3772,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2180"},"72ad-2183":{"renderedLength":15035,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2182"},"72ad-2185":{"renderedLength":1336,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2184"},"72ad-2187":{"renderedLength":6688,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2186"},"72ad-2189":{"renderedLength":745,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2188"},"72ad-2191":{"renderedLength":1153,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2190"},"72ad-2193":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2192"},"72ad-2195":{"renderedLength":19844,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2194"},"72ad-2197":{"renderedLength":8131,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2196"},"72ad-2199":{"renderedLength":42539,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2198"},"72ad-2201":{"renderedLength":10361,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2200"},"72ad-2203":{"renderedLength":10415,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2202"},"72ad-2205":{"renderedLength":30876,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2204"},"72ad-2207":{"renderedLength":1369,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2206"},"72ad-2209":{"renderedLength":10583,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2208"},"72ad-2211":{"renderedLength":7204,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2210"},"72ad-2213":{"renderedLength":2828,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2212"},"72ad-2215":{"renderedLength":129,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2214"},"72ad-2217":{"renderedLength":2359,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2216"},"72ad-2219":{"renderedLength":1485,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2218"},"72ad-2221":{"renderedLength":6707,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2220"},"72ad-2223":{"renderedLength":3571,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2222"},"72ad-2225":{"renderedLength":16919,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2224"},"72ad-2227":{"renderedLength":4597,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2226"},"72ad-2229":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2228"},"72ad-2231":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2230"},"72ad-2233":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2232"},"72ad-2235":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2234"},"72ad-2237":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2236"},"72ad-2239":{"renderedLength":971,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2238"},"72ad-2241":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2240"},"72ad-2243":{"renderedLength":512,"gzipLength":0,"brotliLength":0,"mainUid":"72ad-2242"}},"nodeMetas":{"72ad-0":{"id":"node_modules/aes-js/index.js","moduleParts":{"dist/rapid.js":"72ad-1"},"imported":[],"importedBy":[{"uid":"72ad-112"}]},"72ad-2":{"id":"node_modules/diacritics/index.js","moduleParts":{"dist/rapid.js":"72ad-3"},"imported":[],"importedBy":[{"uid":"72ad-112"},{"uid":"72ad-2184"},{"uid":"72ad-2004"}]},"72ad-4":{"id":"node_modules/fast-deep-equal/index.js","moduleParts":{"dist/rapid.js":"72ad-5"},"imported":[],"importedBy":[{"uid":"72ad-520"},{"uid":"72ad-2210"},{"uid":"72ad-1842"},{"uid":"72ad-1872"},{"uid":"72ad-2148"},{"uid":"72ad-492"}]},"72ad-6":{"id":"node_modules/rbush/rbush.min.js","moduleParts":{"dist/rapid.js":"72ad-7"},"imported":[],"importedBy":[{"uid":"72ad-2170"},{"uid":"72ad-2172"},{"uid":"72ad-2174"},{"uid":"72ad-2176"},{"uid":"72ad-2180"},{"uid":"72ad-2198"},{"uid":"72ad-2200"},{"uid":"72ad-2204"},{"uid":"72ad-510"},{"uid":"72ad-1744"}]},"72ad-8":{"id":"node_modules/eventemitter3/index.js","moduleParts":{"dist/rapid.js":"72ad-9"},"imported":[],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-1382"}]},"72ad-10":{"id":"node_modules/earcut/src/earcut.js","moduleParts":{"dist/rapid.js":"72ad-11"},"imported":[],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-1382"}]},"72ad-12":{"id":"node_modules/url/node_modules/punycode/punycode.js","moduleParts":{"dist/rapid.js":"72ad-13"},"imported":[],"importedBy":[{"uid":"72ad-22"}]},"72ad-14":{"id":"node_modules/url/util.js","moduleParts":{"dist/rapid.js":"72ad-15"},"imported":[],"importedBy":[{"uid":"72ad-22"}]},"72ad-16":{"id":"node_modules/url/node_modules/querystring/decode.js","moduleParts":{"dist/rapid.js":"72ad-17"},"imported":[],"importedBy":[{"uid":"72ad-20"}]},"72ad-18":{"id":"node_modules/url/node_modules/querystring/encode.js","moduleParts":{"dist/rapid.js":"72ad-19"},"imported":[],"importedBy":[{"uid":"72ad-20"}]},"72ad-20":{"id":"node_modules/url/node_modules/querystring/index.js","moduleParts":{"dist/rapid.js":"72ad-21"},"imported":[{"uid":"72ad-16"},{"uid":"72ad-18"}],"importedBy":[{"uid":"72ad-22"}]},"72ad-22":{"id":"node_modules/url/url.js","moduleParts":{"dist/rapid.js":"72ad-23"},"imported":[{"uid":"72ad-12"},{"uid":"72ad-14"},{"uid":"72ad-20"}],"importedBy":[{"uid":"72ad-578"},{"uid":"72ad-1384"}]},"72ad-24":{"id":"node_modules/which-polygon/node_modules/quickselect/quickselect.js","moduleParts":{"dist/rapid.js":"72ad-25"},"imported":[],"importedBy":[{"uid":"72ad-26"}]},"72ad-26":{"id":"node_modules/which-polygon/node_modules/rbush/index.js","moduleParts":{"dist/rapid.js":"72ad-27"},"imported":[{"uid":"72ad-24"}],"importedBy":[{"uid":"72ad-30"}]},"72ad-28":{"id":"node_modules/lineclip/index.js","moduleParts":{"dist/rapid.js":"72ad-29"},"imported":[],"importedBy":[{"uid":"72ad-30"}]},"72ad-30":{"id":"node_modules/which-polygon/index.js","moduleParts":{"dist/rapid.js":"72ad-31"},"imported":[{"uid":"72ad-26"},{"uid":"72ad-28"}],"importedBy":[{"uid":"72ad-736"},{"uid":"72ad-744"},{"uid":"72ad-740"},{"uid":"72ad-2182"}]},"72ad-32":{"id":"node_modules/wgs84/index.js","moduleParts":{"dist/rapid.js":"72ad-33"},"imported":[],"importedBy":[{"uid":"72ad-34"}]},"72ad-34":{"id":"node_modules/@mapbox/geojson-area/index.js","moduleParts":{"dist/rapid.js":"72ad-35"},"imported":[{"uid":"72ad-32"}],"importedBy":[{"uid":"72ad-744"},{"uid":"72ad-742"}]},"72ad-36":{"id":"node_modules/circle-to-polygon/input-validation/validateCenter.js","moduleParts":{"dist/rapid.js":"72ad-37"},"imported":[],"importedBy":[{"uid":"72ad-46"}]},"72ad-38":{"id":"node_modules/circle-to-polygon/input-validation/validateRadius.js","moduleParts":{"dist/rapid.js":"72ad-39"},"imported":[],"importedBy":[{"uid":"72ad-46"}]},"72ad-40":{"id":"node_modules/circle-to-polygon/input-validation/validateNumberOfEdges.js","moduleParts":{"dist/rapid.js":"72ad-41"},"imported":[],"importedBy":[{"uid":"72ad-46"}]},"72ad-42":{"id":"node_modules/circle-to-polygon/input-validation/validateEarthRadius.js","moduleParts":{"dist/rapid.js":"72ad-43"},"imported":[],"importedBy":[{"uid":"72ad-46"}]},"72ad-44":{"id":"node_modules/circle-to-polygon/input-validation/validateBearing.js","moduleParts":{"dist/rapid.js":"72ad-45"},"imported":[],"importedBy":[{"uid":"72ad-46"}]},"72ad-46":{"id":"node_modules/circle-to-polygon/input-validation/index.js","moduleParts":{"dist/rapid.js":"72ad-47"},"imported":[{"uid":"72ad-36"},{"uid":"72ad-38"},{"uid":"72ad-40"},{"uid":"72ad-42"},{"uid":"72ad-44"}],"importedBy":[{"uid":"72ad-48"}]},"72ad-48":{"id":"node_modules/circle-to-polygon/index.js","moduleParts":{"dist/rapid.js":"72ad-49"},"imported":[{"uid":"72ad-46"}],"importedBy":[{"uid":"72ad-742"}]},"72ad-50":{"id":"node_modules/polygon-clipping/dist/polygon-clipping.umd.js","moduleParts":{"dist/rapid.js":"72ad-51"},"imported":[],"importedBy":[{"uid":"72ad-2210"},{"uid":"72ad-742"}]},"72ad-52":{"id":"node_modules/geojson-precision/index.js","moduleParts":{"dist/rapid.js":"72ad-53"},"imported":[],"importedBy":[{"uid":"72ad-742"}]},"72ad-54":{"id":"node_modules/@aitodotai/json-stringify-pretty-compact/index.js","moduleParts":{"dist/rapid.js":"72ad-55"},"imported":[],"importedBy":[{"uid":"72ad-742"}]},"72ad-56":{"id":"node_modules/tinyqueue/index.js","moduleParts":{"dist/rapid.js":"72ad-57"},"imported":[],"importedBy":[{"uid":"72ad-58"}]},"72ad-58":{"id":"node_modules/@mapbox/polylabel/polylabel.js","moduleParts":{"dist/rapid.js":"72ad-59"},"imported":[{"uid":"72ad-56"}],"importedBy":[{"uid":"72ad-1724"}]},"72ad-60":{"id":"node_modules/@mapbox/geojson-rewind/index.js","moduleParts":{"dist/rapid.js":"72ad-61"},"imported":[],"importedBy":[{"uid":"72ad-1752"},{"uid":"72ad-1760"}]},"72ad-62":{"id":"node_modules/fast-json-stable-stringify/index.js","moduleParts":{"dist/rapid.js":"72ad-63"},"imported":[],"importedBy":[{"uid":"72ad-2210"},{"uid":"72ad-1766"}]},"72ad-64":{"id":"node_modules/maplibre-gl/dist/maplibre-gl.js","moduleParts":{"dist/rapid.js":"72ad-65"},"imported":[],"importedBy":[{"uid":"72ad-1782"}]},"72ad-66":{"id":"node_modules/@mapbox/sexagesimal/index.js","moduleParts":{"dist/rapid.js":"72ad-67"},"imported":[],"importedBy":[{"uid":"72ad-1892"}]},"72ad-68":{"id":"node_modules/@mapbox/point-geometry/index.js","moduleParts":{"dist/rapid.js":"72ad-69"},"imported":[],"importedBy":[{"uid":"72ad-70"}]},"72ad-70":{"id":"node_modules/@mapbox/vector-tile/lib/vectortilefeature.js","moduleParts":{"dist/rapid.js":"72ad-71"},"imported":[{"uid":"72ad-68"}],"importedBy":[{"uid":"72ad-76"},{"uid":"72ad-72"}]},"72ad-72":{"id":"node_modules/@mapbox/vector-tile/lib/vectortilelayer.js","moduleParts":{"dist/rapid.js":"72ad-73"},"imported":[{"uid":"72ad-70"}],"importedBy":[{"uid":"72ad-76"},{"uid":"72ad-74"}]},"72ad-74":{"id":"node_modules/@mapbox/vector-tile/lib/vectortile.js","moduleParts":{"dist/rapid.js":"72ad-75"},"imported":[{"uid":"72ad-72"}],"importedBy":[{"uid":"72ad-76"}]},"72ad-76":{"id":"node_modules/@mapbox/vector-tile/index.js","moduleParts":{"dist/rapid.js":"72ad-77"},"imported":[{"uid":"72ad-74"},{"uid":"72ad-70"},{"uid":"72ad-72"}],"importedBy":[{"uid":"72ad-2176"},{"uid":"72ad-2210"}]},"72ad-78":{"id":"node_modules/ieee754/index.js","moduleParts":{"dist/rapid.js":"72ad-79"},"imported":[],"importedBy":[{"uid":"72ad-80"}]},"72ad-80":{"id":"node_modules/pbf/index.js","moduleParts":{"dist/rapid.js":"72ad-81"},"imported":[{"uid":"72ad-78"}],"importedBy":[{"uid":"72ad-2176"},{"uid":"72ad-2210"}]},"72ad-82":{"id":"node_modules/store/src/util.js","moduleParts":{"dist/rapid.js":"72ad-83"},"imported":[],"importedBy":[{"uid":"72ad-84"},{"uid":"72ad-86"},{"uid":"72ad-88"},{"uid":"72ad-90"},{"uid":"72ad-92"},{"uid":"72ad-94"}]},"72ad-84":{"id":"node_modules/store/src/store-engine.js","moduleParts":{"dist/rapid.js":"72ad-85"},"imported":[{"uid":"72ad-82"}],"importedBy":[{"uid":"72ad-104"}]},"72ad-86":{"id":"node_modules/store/storages/localStorage.js","moduleParts":{"dist/rapid.js":"72ad-87"},"imported":[{"uid":"72ad-82"}],"importedBy":[{"uid":"72ad-98"}]},"72ad-88":{"id":"node_modules/store/storages/oldFF-globalStorage.js","moduleParts":{"dist/rapid.js":"72ad-89"},"imported":[{"uid":"72ad-82"}],"importedBy":[{"uid":"72ad-98"}]},"72ad-90":{"id":"node_modules/store/storages/oldIE-userDataStorage.js","moduleParts":{"dist/rapid.js":"72ad-91"},"imported":[{"uid":"72ad-82"}],"importedBy":[{"uid":"72ad-98"}]},"72ad-92":{"id":"node_modules/store/storages/cookieStorage.js","moduleParts":{"dist/rapid.js":"72ad-93"},"imported":[{"uid":"72ad-82"}],"importedBy":[{"uid":"72ad-98"}]},"72ad-94":{"id":"node_modules/store/storages/sessionStorage.js","moduleParts":{"dist/rapid.js":"72ad-95"},"imported":[{"uid":"72ad-82"}],"importedBy":[{"uid":"72ad-98"}]},"72ad-96":{"id":"node_modules/store/storages/memoryStorage.js","moduleParts":{"dist/rapid.js":"72ad-97"},"imported":[],"importedBy":[{"uid":"72ad-98"}]},"72ad-98":{"id":"node_modules/store/storages/all.js","moduleParts":{"dist/rapid.js":"72ad-99"},"imported":[{"uid":"72ad-86"},{"uid":"72ad-88"},{"uid":"72ad-90"},{"uid":"72ad-92"},{"uid":"72ad-94"},{"uid":"72ad-96"}],"importedBy":[{"uid":"72ad-104"}]},"72ad-100":{"id":"node_modules/store/plugins/lib/json2.js","moduleParts":{"dist/rapid.js":"72ad-101"},"imported":[],"importedBy":[{"uid":"72ad-102"}]},"72ad-102":{"id":"node_modules/store/plugins/json2.js","moduleParts":{"dist/rapid.js":"72ad-103"},"imported":[{"uid":"72ad-100"}],"importedBy":[{"uid":"72ad-104"}]},"72ad-104":{"id":"node_modules/store/dist/store.legacy.js","moduleParts":{"dist/rapid.js":"72ad-105"},"imported":[{"uid":"72ad-84"},{"uid":"72ad-98"},{"uid":"72ad-102"}],"importedBy":[{"uid":"72ad-2196"}]},"72ad-106":{"id":"modules/index.js","moduleParts":{"dist/rapid.js":"72ad-107"},"imported":[{"uid":"72ad-110"},{"uid":"72ad-560"},{"uid":"72ad-694"},{"uid":"72ad-526"},{"uid":"72ad-1984"},{"uid":"72ad-644"},{"uid":"72ad-476"},{"uid":"72ad-2166"},{"uid":"72ad-2228"},{"uid":"72ad-1788"},{"uid":"72ad-2230"},{"uid":"72ad-2090"},{"uid":"72ad-2232"},{"uid":"72ad-2234"},{"uid":"72ad-1832"},{"uid":"72ad-416"},{"uid":"72ad-2128"},{"uid":"72ad-2236"},{"uid":"72ad-408"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-2242"}]},"72ad-108":{"id":"modules/actions/add_entity.js","moduleParts":{"dist/rapid.js":"72ad-109"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1990"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-1886"}]},"72ad-110":{"id":"modules/actions/index.js","moduleParts":{"dist/rapid.js":"72ad-111"},"imported":[{"uid":"72ad-108"},{"uid":"72ad-432"},{"uid":"72ad-434"},{"uid":"72ad-436"},{"uid":"72ad-438"},{"uid":"72ad-440"},{"uid":"72ad-442"},{"uid":"72ad-446"},{"uid":"72ad-456"},{"uid":"72ad-458"},{"uid":"72ad-460"},{"uid":"72ad-450"},{"uid":"72ad-454"},{"uid":"72ad-452"},{"uid":"72ad-448"},{"uid":"72ad-462"},{"uid":"72ad-464"},{"uid":"72ad-466"},{"uid":"72ad-468"},{"uid":"72ad-470"},{"uid":"72ad-472"},{"uid":"72ad-518"},{"uid":"72ad-520"},{"uid":"72ad-530"},{"uid":"72ad-532"},{"uid":"72ad-534"},{"uid":"72ad-536"},{"uid":"72ad-538"},{"uid":"72ad-540"},{"uid":"72ad-114"},{"uid":"72ad-542"},{"uid":"72ad-544"},{"uid":"72ad-546"},{"uid":"72ad-484"},{"uid":"72ad-548"},{"uid":"72ad-550"},{"uid":"72ad-552"},{"uid":"72ad-554"},{"uid":"72ad-556"},{"uid":"72ad-558"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-650"},{"uid":"72ad-2022"},{"uid":"72ad-2052"}]},"72ad-112":{"id":"node_modules/@rapid-sdk/util/built/util.mjs","moduleParts":{"dist/rapid.js":"72ad-113"},"imported":[{"uid":"72ad-0"},{"uid":"72ad-2"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-432"},{"uid":"72ad-434"},{"uid":"72ad-446"},{"uid":"72ad-456"},{"uid":"72ad-452"},{"uid":"72ad-468"},{"uid":"72ad-470"},{"uid":"72ad-518"},{"uid":"72ad-520"},{"uid":"72ad-530"},{"uid":"72ad-544"},{"uid":"72ad-546"},{"uid":"72ad-484"},{"uid":"72ad-550"},{"uid":"72ad-554"},{"uid":"72ad-684"},{"uid":"72ad-2224"},{"uid":"72ad-732"},{"uid":"72ad-734"},{"uid":"72ad-738"},{"uid":"72ad-1824"},{"uid":"72ad-2124"},{"uid":"72ad-2126"},{"uid":"72ad-2164"},{"uid":"72ad-1994"},{"uid":"72ad-2002"},{"uid":"72ad-682"},{"uid":"72ad-646"},{"uid":"72ad-648"},{"uid":"72ad-650"},{"uid":"72ad-654"},{"uid":"72ad-656"},{"uid":"72ad-658"},{"uid":"72ad-662"},{"uid":"72ad-666"},{"uid":"72ad-668"},{"uid":"72ad-672"},{"uid":"72ad-676"},{"uid":"72ad-680"},{"uid":"72ad-410"},{"uid":"72ad-444"},{"uid":"72ad-428"},{"uid":"72ad-516"},{"uid":"72ad-2168"},{"uid":"72ad-2170"},{"uid":"72ad-2172"},{"uid":"72ad-2174"},{"uid":"72ad-2180"},{"uid":"72ad-2198"},{"uid":"72ad-2200"},{"uid":"72ad-2202"},{"uid":"72ad-2204"},{"uid":"72ad-2208"},{"uid":"72ad-2210"},{"uid":"72ad-2220"},{"uid":"72ad-2222"},{"uid":"72ad-1792"},{"uid":"72ad-1798"},{"uid":"72ad-1808"},{"uid":"72ad-1816"},{"uid":"72ad-1938"},{"uid":"72ad-1852"},{"uid":"72ad-1874"},{"uid":"72ad-1878"},{"uid":"72ad-1880"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1840"},{"uid":"72ad-1842"},{"uid":"72ad-1854"},{"uid":"72ad-1860"},{"uid":"72ad-1872"},{"uid":"72ad-1814"},{"uid":"72ad-1928"},{"uid":"72ad-2040"},{"uid":"72ad-2042"},{"uid":"72ad-418"},{"uid":"72ad-422"},{"uid":"72ad-2148"},{"uid":"72ad-2154"},{"uid":"72ad-2156"},{"uid":"72ad-488"},{"uid":"72ad-486"},{"uid":"72ad-492"},{"uid":"72ad-502"},{"uid":"72ad-504"},{"uid":"72ad-506"},{"uid":"72ad-508"},{"uid":"72ad-1922"},{"uid":"72ad-1766"}]},"72ad-114":{"id":"modules/actions/reverse.js","moduleParts":{"dist/rapid.js":"72ad-115"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-674"},{"uid":"72ad-516"},{"uid":"72ad-430"},{"uid":"72ad-1786"},{"uid":"72ad-2144"}]},"72ad-116":{"id":"modules/osm/tags.js","moduleParts":{"dist/rapid.js":"72ad-117"},"imported":[],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-448"},{"uid":"72ad-468"},{"uid":"72ad-470"},{"uid":"72ad-1824"},{"uid":"72ad-410"},{"uid":"72ad-428"},{"uid":"72ad-430"},{"uid":"72ad-2226"},{"uid":"72ad-2130"},{"uid":"72ad-2132"},{"uid":"72ad-2134"},{"uid":"72ad-2136"},{"uid":"72ad-2144"},{"uid":"72ad-2148"},{"uid":"72ad-2152"},{"uid":"72ad-508"},{"uid":"72ad-1754"}]},"72ad-118":{"id":"node_modules/d3-array/src/ascending.js","moduleParts":{"dist/rapid.js":"72ad-119"},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2261"},{"uid":"72ad-2262"},{"uid":"72ad-2270"},{"uid":"72ad-2284"},{"uid":"72ad-2285"},{"uid":"72ad-2286"},{"uid":"72ad-2287"},{"uid":"72ad-2288"},{"uid":"72ad-128"}]},"72ad-120":{"id":"node_modules/d3-array/src/descending.js","moduleParts":{"dist/rapid.js":"72ad-121"},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2262"}]},"72ad-122":{"id":"node_modules/d3-array/src/number.js","moduleParts":{"dist/rapid.js":"72ad-123"},"imported":[],"importedBy":[{"uid":"72ad-2261"},{"uid":"72ad-136"}]},"72ad-124":{"id":"node_modules/d3-array/src/index.js","moduleParts":{"dist/rapid.js":"72ad-125"},"imported":[{"uid":"72ad-2261"},{"uid":"72ad-118"},{"uid":"72ad-2262"},{"uid":"72ad-2263"},{"uid":"72ad-2264"},{"uid":"72ad-2265"},{"uid":"72ad-2266"},{"uid":"72ad-120"},{"uid":"72ad-2267"},{"uid":"72ad-2268"},{"uid":"72ad-126"},{"uid":"72ad-2269"},{"uid":"72ad-2270"},{"uid":"72ad-2271"},{"uid":"72ad-2272"},{"uid":"72ad-2273"},{"uid":"72ad-2274"},{"uid":"72ad-130"},{"uid":"72ad-2275"},{"uid":"72ad-2276"},{"uid":"72ad-138"},{"uid":"72ad-2277"},{"uid":"72ad-132"},{"uid":"72ad-2278"},{"uid":"72ad-2279"},{"uid":"72ad-2280"},{"uid":"72ad-2281"},{"uid":"72ad-2282"},{"uid":"72ad-136"},{"uid":"72ad-134"},{"uid":"72ad-2283"},{"uid":"72ad-2284"},{"uid":"72ad-2285"},{"uid":"72ad-2286"},{"uid":"72ad-2287"},{"uid":"72ad-2288"},{"uid":"72ad-2289"},{"uid":"72ad-2290"},{"uid":"72ad-2291"},{"uid":"72ad-2292"},{"uid":"72ad-2293"},{"uid":"72ad-2294"},{"uid":"72ad-2295"},{"uid":"72ad-2296"},{"uid":"72ad-2297"},{"uid":"72ad-2298"},{"uid":"72ad-2299"},{"uid":"72ad-2300"},{"uid":"72ad-2301"},{"uid":"72ad-128"},{"uid":"72ad-2302"},{"uid":"72ad-2303"},{"uid":"72ad-2304"},{"uid":"72ad-2305"},{"uid":"72ad-2306"},{"uid":"72ad-2307"},{"uid":"72ad-2308"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-446"},{"uid":"72ad-2080"},{"uid":"72ad-2086"},{"uid":"72ad-2314"},{"uid":"72ad-2315"},{"uid":"72ad-146"},{"uid":"72ad-152"},{"uid":"72ad-154"},{"uid":"72ad-2352"},{"uid":"72ad-2355"},{"uid":"72ad-156"},{"uid":"72ad-2421"},{"uid":"72ad-2423"},{"uid":"72ad-2424"},{"uid":"72ad-2426"},{"uid":"72ad-2429"},{"uid":"72ad-2430"},{"uid":"72ad-2431"},{"uid":"72ad-2435"},{"uid":"72ad-2437"},{"uid":"72ad-2543"},{"uid":"72ad-2585"},{"uid":"72ad-2590"},{"uid":"72ad-2592"},{"uid":"72ad-2596"},{"uid":"72ad-2637"}]},"72ad-126":{"id":"node_modules/d3-array/src/fsum.js","moduleParts":{"dist/rapid.js":"72ad-127"},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-128":{"id":"node_modules/d3-array/src/sort.js","moduleParts":{"dist/rapid.js":"72ad-129"},"imported":[{"uid":"72ad-118"},{"uid":"72ad-2282"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2270"},{"uid":"72ad-136"},{"uid":"72ad-134"},{"uid":"72ad-2284"}]},"72ad-130":{"id":"node_modules/d3-array/src/max.js","moduleParts":{"dist/rapid.js":"72ad-131"},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-136"}]},"72ad-132":{"id":"node_modules/d3-array/src/min.js","moduleParts":{"dist/rapid.js":"72ad-133"},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-136"},{"uid":"72ad-2293"}]},"72ad-134":{"id":"node_modules/d3-array/src/quickselect.js","moduleParts":{"dist/rapid.js":"72ad-135"},"imported":[{"uid":"72ad-128"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-136"}]},"72ad-136":{"id":"node_modules/d3-array/src/quantile.js","moduleParts":{"dist/rapid.js":"72ad-137"},"imported":[{"uid":"72ad-130"},{"uid":"72ad-2275"},{"uid":"72ad-132"},{"uid":"72ad-2278"},{"uid":"72ad-134"},{"uid":"72ad-122"},{"uid":"72ad-128"},{"uid":"72ad-2287"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2272"},{"uid":"72ad-138"}]},"72ad-138":{"id":"node_modules/d3-array/src/median.js","moduleParts":{"dist/rapid.js":"72ad-139"},"imported":[{"uid":"72ad-136"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-140":{"id":"node_modules/d3-geo/src/math.js","moduleParts":{"dist/rapid.js":"72ad-141"},"imported":[],"importedBy":[{"uid":"72ad-146"},{"uid":"72ad-152"},{"uid":"72ad-154"},{"uid":"72ad-2348"},{"uid":"72ad-2349"},{"uid":"72ad-2350"},{"uid":"72ad-2352"},{"uid":"72ad-2353"},{"uid":"72ad-2355"},{"uid":"72ad-2356"},{"uid":"72ad-156"},{"uid":"72ad-2359"},{"uid":"72ad-2360"},{"uid":"72ad-2361"},{"uid":"72ad-2362"},{"uid":"72ad-2363"},{"uid":"72ad-2364"},{"uid":"72ad-2365"},{"uid":"72ad-2367"},{"uid":"72ad-2368"},{"uid":"72ad-2369"},{"uid":"72ad-160"},{"uid":"72ad-2370"},{"uid":"72ad-2371"},{"uid":"72ad-2372"},{"uid":"72ad-2373"},{"uid":"72ad-2374"},{"uid":"72ad-150"},{"uid":"72ad-2585"},{"uid":"72ad-2586"},{"uid":"72ad-2589"},{"uid":"72ad-2590"},{"uid":"72ad-2592"},{"uid":"72ad-2594"},{"uid":"72ad-2595"},{"uid":"72ad-2596"},{"uid":"72ad-2599"},{"uid":"72ad-2600"},{"uid":"72ad-2601"},{"uid":"72ad-2603"}]},"72ad-142":{"id":"node_modules/d3-geo/src/noop.js","moduleParts":{"dist/rapid.js":"72ad-143"},"imported":[],"importedBy":[{"uid":"72ad-146"},{"uid":"72ad-154"},{"uid":"72ad-156"},{"uid":"72ad-2587"},{"uid":"72ad-2592"},{"uid":"72ad-2593"},{"uid":"72ad-2595"},{"uid":"72ad-2596"}]},"72ad-144":{"id":"node_modules/d3-geo/src/stream.js","moduleParts":{"dist/rapid.js":"72ad-145"},"imported":[],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-146"},{"uid":"72ad-152"},{"uid":"72ad-154"},{"uid":"72ad-156"},{"uid":"72ad-2357"},{"uid":"72ad-2598"}]},"72ad-146":{"id":"node_modules/d3-geo/src/area.js","moduleParts":{"dist/rapid.js":"72ad-147"},"imported":[{"uid":"72ad-124"},{"uid":"72ad-140"},{"uid":"72ad-142"},{"uid":"72ad-144"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-152"}]},"72ad-148":{"id":"node_modules/d3-geo/src/index.js","moduleParts":{"dist/rapid.js":"72ad-149"},"imported":[{"uid":"72ad-146"},{"uid":"72ad-152"},{"uid":"72ad-154"},{"uid":"72ad-2348"},{"uid":"72ad-2349"},{"uid":"72ad-2350"},{"uid":"72ad-2351"},{"uid":"72ad-2352"},{"uid":"72ad-2353"},{"uid":"72ad-2354"},{"uid":"72ad-2355"},{"uid":"72ad-2356"},{"uid":"72ad-156"},{"uid":"72ad-2357"},{"uid":"72ad-2358"},{"uid":"72ad-2359"},{"uid":"72ad-2360"},{"uid":"72ad-2361"},{"uid":"72ad-2362"},{"uid":"72ad-2363"},{"uid":"72ad-2364"},{"uid":"72ad-2365"},{"uid":"72ad-2366"},{"uid":"72ad-2367"},{"uid":"72ad-2368"},{"uid":"72ad-2369"},{"uid":"72ad-160"},{"uid":"72ad-2370"},{"uid":"72ad-2371"},{"uid":"72ad-2372"},{"uid":"72ad-2373"},{"uid":"72ad-2374"},{"uid":"72ad-144"},{"uid":"72ad-158"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-408"},{"uid":"72ad-2014"},{"uid":"72ad-480"},{"uid":"72ad-428"},{"uid":"72ad-1938"},{"uid":"72ad-502"},{"uid":"72ad-1766"}]},"72ad-150":{"id":"node_modules/d3-geo/src/cartesian.js","moduleParts":{"dist/rapid.js":"72ad-151"},"imported":[{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-152"},{"uid":"72ad-2348"},{"uid":"72ad-2350"},{"uid":"72ad-2590"},{"uid":"72ad-2603"}]},"72ad-152":{"id":"node_modules/d3-geo/src/bounds.js","moduleParts":{"dist/rapid.js":"72ad-153"},"imported":[{"uid":"72ad-124"},{"uid":"72ad-146"},{"uid":"72ad-150"},{"uid":"72ad-140"},{"uid":"72ad-144"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-154":{"id":"node_modules/d3-geo/src/centroid.js","moduleParts":{"dist/rapid.js":"72ad-155"},"imported":[{"uid":"72ad-124"},{"uid":"72ad-140"},{"uid":"72ad-142"},{"uid":"72ad-144"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-156":{"id":"node_modules/d3-geo/src/length.js","moduleParts":{"dist/rapid.js":"72ad-157"},"imported":[{"uid":"72ad-124"},{"uid":"72ad-140"},{"uid":"72ad-142"},{"uid":"72ad-144"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2354"}]},"72ad-158":{"id":"node_modules/d3-geo/src/transform.js","moduleParts":{"dist/rapid.js":"72ad-159"},"imported":[],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2368"},{"uid":"72ad-2369"},{"uid":"72ad-2603"}]},"72ad-160":{"id":"node_modules/d3-geo/src/projection/mercator.js","moduleParts":{"dist/rapid.js":"72ad-161"},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2374"},{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2362"},{"uid":"72ad-2373"}]},"72ad-162":{"id":"node_modules/d3-polygon/src/area.js","moduleParts":{"dist/rapid.js":"72ad-163"},"imported":[],"importedBy":[{"uid":"72ad-164"}]},"72ad-164":{"id":"node_modules/d3-polygon/src/index.js","moduleParts":{"dist/rapid.js":"72ad-165"},"imported":[{"uid":"72ad-162"},{"uid":"72ad-166"},{"uid":"72ad-170"},{"uid":"72ad-2400"},{"uid":"72ad-2401"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-408"},{"uid":"72ad-446"},{"uid":"72ad-466"},{"uid":"72ad-2002"},{"uid":"72ad-1724"}]},"72ad-166":{"id":"node_modules/d3-polygon/src/centroid.js","moduleParts":{"dist/rapid.js":"72ad-167"},"imported":[],"importedBy":[{"uid":"72ad-164"}]},"72ad-168":{"id":"node_modules/d3-polygon/src/cross.js","moduleParts":{"dist/rapid.js":"72ad-169"},"imported":[],"importedBy":[{"uid":"72ad-170"}]},"72ad-170":{"id":"node_modules/d3-polygon/src/hull.js","moduleParts":{"dist/rapid.js":"72ad-171"},"imported":[{"uid":"72ad-168"}],"importedBy":[{"uid":"72ad-164"}]},"72ad-172":{"id":"node_modules/d3-dispatch/src/dispatch.js","moduleParts":{"dist/rapid.js":"72ad-173"},"imported":[],"importedBy":[{"uid":"72ad-174"}]},"72ad-174":{"id":"node_modules/d3-dispatch/src/index.js","moduleParts":{"dist/rapid.js":"72ad-175"},"imported":[{"uid":"72ad-172"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2224"},{"uid":"72ad-1786"},{"uid":"72ad-1792"},{"uid":"72ad-1794"},{"uid":"72ad-1796"},{"uid":"72ad-1798"},{"uid":"72ad-1800"},{"uid":"72ad-1802"},{"uid":"72ad-1808"},{"uid":"72ad-1810"},{"uid":"72ad-1816"},{"uid":"72ad-1818"},{"uid":"72ad-1820"},{"uid":"72ad-1822"},{"uid":"72ad-1878"},{"uid":"72ad-1880"},{"uid":"72ad-1856"},{"uid":"72ad-2078"},{"uid":"72ad-2104"},{"uid":"72ad-1840"},{"uid":"72ad-1790"},{"uid":"72ad-1842"},{"uid":"72ad-1860"},{"uid":"72ad-1848"},{"uid":"72ad-1870"},{"uid":"72ad-1872"},{"uid":"72ad-1814"},{"uid":"72ad-1906"},{"uid":"72ad-1956"},{"uid":"72ad-1968"},{"uid":"72ad-1976"},{"uid":"72ad-1980"},{"uid":"72ad-1942"},{"uid":"72ad-1982"},{"uid":"72ad-2026"},{"uid":"72ad-2010"},{"uid":"72ad-1912"},{"uid":"72ad-1914"},{"uid":"72ad-1916"},{"uid":"72ad-1918"},{"uid":"72ad-1920"},{"uid":"72ad-1922"},{"uid":"72ad-1924"},{"uid":"72ad-1926"},{"uid":"72ad-2238"},{"uid":"72ad-284"},{"uid":"72ad-2339"},{"uid":"72ad-404"},{"uid":"72ad-2066"},{"uid":"72ad-334"}]},"72ad-176":{"id":"node_modules/d3-selection/src/namespaces.js","moduleParts":{"dist/rapid.js":"72ad-177"},"imported":[],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-180"},{"uid":"72ad-178"}]},"72ad-178":{"id":"node_modules/d3-selection/src/namespace.js","moduleParts":{"dist/rapid.js":"72ad-179"},"imported":[{"uid":"72ad-176"}],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-180"},{"uid":"72ad-230"}]},"72ad-180":{"id":"node_modules/d3-selection/src/creator.js","moduleParts":{"dist/rapid.js":"72ad-181"},"imported":[{"uid":"72ad-178"},{"uid":"72ad-176"}],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-2481"},{"uid":"72ad-248"},{"uid":"72ad-250"}]},"72ad-182":{"id":"node_modules/d3-selection/src/selector.js","moduleParts":{"dist/rapid.js":"72ad-183"},"imported":[],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-184"},{"uid":"72ad-250"}]},"72ad-184":{"id":"node_modules/d3-selection/src/selection/select.js","moduleParts":{"dist/rapid.js":"72ad-185"},"imported":[{"uid":"72ad-264"},{"uid":"72ad-182"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-186":{"id":"node_modules/d3-selection/src/array.js","moduleParts":{"dist/rapid.js":"72ad-187"},"imported":[],"importedBy":[{"uid":"72ad-274"},{"uid":"72ad-190"}]},"72ad-188":{"id":"node_modules/d3-selection/src/selectorAll.js","moduleParts":{"dist/rapid.js":"72ad-189"},"imported":[],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-190"}]},"72ad-190":{"id":"node_modules/d3-selection/src/selection/selectAll.js","moduleParts":{"dist/rapid.js":"72ad-191"},"imported":[{"uid":"72ad-264"},{"uid":"72ad-186"},{"uid":"72ad-188"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-192":{"id":"node_modules/d3-selection/src/matcher.js","moduleParts":{"dist/rapid.js":"72ad-193"},"imported":[],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-194"},{"uid":"72ad-196"},{"uid":"72ad-198"}]},"72ad-194":{"id":"node_modules/d3-selection/src/selection/selectChild.js","moduleParts":{"dist/rapid.js":"72ad-195"},"imported":[{"uid":"72ad-192"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-196":{"id":"node_modules/d3-selection/src/selection/selectChildren.js","moduleParts":{"dist/rapid.js":"72ad-197"},"imported":[{"uid":"72ad-192"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-198":{"id":"node_modules/d3-selection/src/selection/filter.js","moduleParts":{"dist/rapid.js":"72ad-199"},"imported":[{"uid":"72ad-264"},{"uid":"72ad-192"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-200":{"id":"node_modules/d3-selection/src/selection/sparse.js","moduleParts":{"dist/rapid.js":"72ad-201"},"imported":[],"importedBy":[{"uid":"72ad-202"},{"uid":"72ad-208"}]},"72ad-202":{"id":"node_modules/d3-selection/src/selection/enter.js","moduleParts":{"dist/rapid.js":"72ad-203"},"imported":[{"uid":"72ad-200"},{"uid":"72ad-264"}],"importedBy":[{"uid":"72ad-264"},{"uid":"72ad-206"}]},"72ad-204":{"id":"node_modules/d3-selection/src/constant.js","moduleParts":{"dist/rapid.js":"72ad-205"},"imported":[],"importedBy":[{"uid":"72ad-206"}]},"72ad-206":{"id":"node_modules/d3-selection/src/selection/data.js","moduleParts":{"dist/rapid.js":"72ad-207"},"imported":[{"uid":"72ad-264"},{"uid":"72ad-202"},{"uid":"72ad-204"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-208":{"id":"node_modules/d3-selection/src/selection/exit.js","moduleParts":{"dist/rapid.js":"72ad-209"},"imported":[{"uid":"72ad-200"},{"uid":"72ad-264"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-210":{"id":"node_modules/d3-selection/src/selection/join.js","moduleParts":{"dist/rapid.js":"72ad-211"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-212":{"id":"node_modules/d3-selection/src/selection/merge.js","moduleParts":{"dist/rapid.js":"72ad-213"},"imported":[{"uid":"72ad-264"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-214":{"id":"node_modules/d3-selection/src/selection/order.js","moduleParts":{"dist/rapid.js":"72ad-215"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-216":{"id":"node_modules/d3-selection/src/selection/sort.js","moduleParts":{"dist/rapid.js":"72ad-217"},"imported":[{"uid":"72ad-264"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-218":{"id":"node_modules/d3-selection/src/selection/call.js","moduleParts":{"dist/rapid.js":"72ad-219"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-220":{"id":"node_modules/d3-selection/src/selection/nodes.js","moduleParts":{"dist/rapid.js":"72ad-221"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-222":{"id":"node_modules/d3-selection/src/selection/node.js","moduleParts":{"dist/rapid.js":"72ad-223"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-224":{"id":"node_modules/d3-selection/src/selection/size.js","moduleParts":{"dist/rapid.js":"72ad-225"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-226":{"id":"node_modules/d3-selection/src/selection/empty.js","moduleParts":{"dist/rapid.js":"72ad-227"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-228":{"id":"node_modules/d3-selection/src/selection/each.js","moduleParts":{"dist/rapid.js":"72ad-229"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-230":{"id":"node_modules/d3-selection/src/selection/attr.js","moduleParts":{"dist/rapid.js":"72ad-231"},"imported":[{"uid":"72ad-178"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-232":{"id":"node_modules/d3-selection/src/window.js","moduleParts":{"dist/rapid.js":"72ad-233"},"imported":[],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-234"},{"uid":"72ad-260"}]},"72ad-234":{"id":"node_modules/d3-selection/src/selection/style.js","moduleParts":{"dist/rapid.js":"72ad-235"},"imported":[{"uid":"72ad-232"}],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-264"}]},"72ad-236":{"id":"node_modules/d3-selection/src/selection/property.js","moduleParts":{"dist/rapid.js":"72ad-237"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-238":{"id":"node_modules/d3-selection/src/selection/classed.js","moduleParts":{"dist/rapid.js":"72ad-239"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-240":{"id":"node_modules/d3-selection/src/selection/text.js","moduleParts":{"dist/rapid.js":"72ad-241"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-242":{"id":"node_modules/d3-selection/src/selection/html.js","moduleParts":{"dist/rapid.js":"72ad-243"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-244":{"id":"node_modules/d3-selection/src/selection/raise.js","moduleParts":{"dist/rapid.js":"72ad-245"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-246":{"id":"node_modules/d3-selection/src/selection/lower.js","moduleParts":{"dist/rapid.js":"72ad-247"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-248":{"id":"node_modules/d3-selection/src/selection/append.js","moduleParts":{"dist/rapid.js":"72ad-249"},"imported":[{"uid":"72ad-180"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-250":{"id":"node_modules/d3-selection/src/selection/insert.js","moduleParts":{"dist/rapid.js":"72ad-251"},"imported":[{"uid":"72ad-180"},{"uid":"72ad-182"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-252":{"id":"node_modules/d3-selection/src/selection/remove.js","moduleParts":{"dist/rapid.js":"72ad-253"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-254":{"id":"node_modules/d3-selection/src/selection/clone.js","moduleParts":{"dist/rapid.js":"72ad-255"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-256":{"id":"node_modules/d3-selection/src/selection/datum.js","moduleParts":{"dist/rapid.js":"72ad-257"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-258":{"id":"node_modules/d3-selection/src/selection/on.js","moduleParts":{"dist/rapid.js":"72ad-259"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-260":{"id":"node_modules/d3-selection/src/selection/dispatch.js","moduleParts":{"dist/rapid.js":"72ad-261"},"imported":[{"uid":"72ad-232"}],"importedBy":[{"uid":"72ad-264"}]},"72ad-262":{"id":"node_modules/d3-selection/src/selection/iterator.js","moduleParts":{"dist/rapid.js":"72ad-263"},"imported":[],"importedBy":[{"uid":"72ad-264"}]},"72ad-264":{"id":"node_modules/d3-selection/src/selection/index.js","moduleParts":{"dist/rapid.js":"72ad-265"},"imported":[{"uid":"72ad-184"},{"uid":"72ad-190"},{"uid":"72ad-194"},{"uid":"72ad-196"},{"uid":"72ad-198"},{"uid":"72ad-206"},{"uid":"72ad-202"},{"uid":"72ad-208"},{"uid":"72ad-210"},{"uid":"72ad-212"},{"uid":"72ad-214"},{"uid":"72ad-216"},{"uid":"72ad-218"},{"uid":"72ad-220"},{"uid":"72ad-222"},{"uid":"72ad-224"},{"uid":"72ad-226"},{"uid":"72ad-228"},{"uid":"72ad-230"},{"uid":"72ad-234"},{"uid":"72ad-236"},{"uid":"72ad-238"},{"uid":"72ad-240"},{"uid":"72ad-242"},{"uid":"72ad-244"},{"uid":"72ad-246"},{"uid":"72ad-248"},{"uid":"72ad-250"},{"uid":"72ad-252"},{"uid":"72ad-254"},{"uid":"72ad-256"},{"uid":"72ad-258"},{"uid":"72ad-260"},{"uid":"72ad-262"}],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-266"},{"uid":"72ad-274"},{"uid":"72ad-184"},{"uid":"72ad-190"},{"uid":"72ad-198"},{"uid":"72ad-206"},{"uid":"72ad-202"},{"uid":"72ad-208"},{"uid":"72ad-212"},{"uid":"72ad-216"}]},"72ad-266":{"id":"node_modules/d3-selection/src/select.js","moduleParts":{"dist/rapid.js":"72ad-267"},"imported":[{"uid":"72ad-264"}],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-2481"}]},"72ad-268":{"id":"node_modules/d3-selection/src/index.js","moduleParts":{"dist/rapid.js":"72ad-269"},"imported":[{"uid":"72ad-2481"},{"uid":"72ad-180"},{"uid":"72ad-2482"},{"uid":"72ad-192"},{"uid":"72ad-178"},{"uid":"72ad-176"},{"uid":"72ad-272"},{"uid":"72ad-2483"},{"uid":"72ad-266"},{"uid":"72ad-274"},{"uid":"72ad-264"},{"uid":"72ad-182"},{"uid":"72ad-188"},{"uid":"72ad-234"},{"uid":"72ad-232"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2224"},{"uid":"72ad-732"},{"uid":"72ad-1780"},{"uid":"72ad-2122"},{"uid":"72ad-2012"},{"uid":"72ad-2014"},{"uid":"72ad-682"},{"uid":"72ad-2168"},{"uid":"72ad-2176"},{"uid":"72ad-2204"},{"uid":"72ad-2226"},{"uid":"72ad-1786"},{"uid":"72ad-1792"},{"uid":"72ad-1794"},{"uid":"72ad-1796"},{"uid":"72ad-1798"},{"uid":"72ad-1800"},{"uid":"72ad-1808"},{"uid":"72ad-1810"},{"uid":"72ad-1816"},{"uid":"72ad-1818"},{"uid":"72ad-1820"},{"uid":"72ad-1822"},{"uid":"72ad-1932"},{"uid":"72ad-1934"},{"uid":"72ad-1936"},{"uid":"72ad-1938"},{"uid":"72ad-2080"},{"uid":"72ad-2082"},{"uid":"72ad-1852"},{"uid":"72ad-2106"},{"uid":"72ad-1874"},{"uid":"72ad-2086"},{"uid":"72ad-2112"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1888"},{"uid":"72ad-2094"},{"uid":"72ad-2098"},{"uid":"72ad-1836"},{"uid":"72ad-1790"},{"uid":"72ad-1842"},{"uid":"72ad-1860"},{"uid":"72ad-1862"},{"uid":"72ad-1868"},{"uid":"72ad-1870"},{"uid":"72ad-1892"},{"uid":"72ad-1814"},{"uid":"72ad-1838"},{"uid":"72ad-1898"},{"uid":"72ad-1900"},{"uid":"72ad-1902"},{"uid":"72ad-1906"},{"uid":"72ad-1940"},{"uid":"72ad-1946"},{"uid":"72ad-1948"},{"uid":"72ad-1950"},{"uid":"72ad-1956"},{"uid":"72ad-730"},{"uid":"72ad-1958"},{"uid":"72ad-1960"},{"uid":"72ad-728"},{"uid":"72ad-1962"},{"uid":"72ad-1968"},{"uid":"72ad-1970"},{"uid":"72ad-1978"},{"uid":"72ad-1980"},{"uid":"72ad-1804"},{"uid":"72ad-1942"},{"uid":"72ad-1982"},{"uid":"72ad-2022"},{"uid":"72ad-2028"},{"uid":"72ad-2030"},{"uid":"72ad-2026"},{"uid":"72ad-1850"},{"uid":"72ad-2040"},{"uid":"72ad-2042"},{"uid":"72ad-2044"},{"uid":"72ad-2010"},{"uid":"72ad-1812"},{"uid":"72ad-1846"},{"uid":"72ad-2068"},{"uid":"72ad-2072"},{"uid":"72ad-422"},{"uid":"72ad-2206"},{"uid":"72ad-2084"},{"uid":"72ad-1910"},{"uid":"72ad-1914"},{"uid":"72ad-1916"},{"uid":"72ad-1926"},{"uid":"72ad-2238"},{"uid":"72ad-284"},{"uid":"72ad-278"},{"uid":"72ad-392"},{"uid":"72ad-382"},{"uid":"72ad-404"},{"uid":"72ad-2056"},{"uid":"72ad-2058"},{"uid":"72ad-2064"},{"uid":"72ad-344"},{"uid":"72ad-346"},{"uid":"72ad-356"},{"uid":"72ad-364"},{"uid":"72ad-366"},{"uid":"72ad-368"},{"uid":"72ad-370"}]},"72ad-270":{"id":"node_modules/d3-selection/src/sourceEvent.js","moduleParts":{"dist/rapid.js":"72ad-271"},"imported":[],"importedBy":[{"uid":"72ad-272"},{"uid":"72ad-2483"}]},"72ad-272":{"id":"node_modules/d3-selection/src/pointer.js","moduleParts":{"dist/rapid.js":"72ad-273"},"imported":[{"uid":"72ad-270"}],"importedBy":[{"uid":"72ad-268"},{"uid":"72ad-2483"}]},"72ad-274":{"id":"node_modules/d3-selection/src/selectAll.js","moduleParts":{"dist/rapid.js":"72ad-275"},"imported":[{"uid":"72ad-186"},{"uid":"72ad-264"}],"importedBy":[{"uid":"72ad-268"}]},"72ad-276":{"id":"node_modules/d3-drag/src/noevent.js","moduleParts":{"dist/rapid.js":"72ad-277"},"imported":[],"importedBy":[{"uid":"72ad-284"},{"uid":"72ad-278"}]},"72ad-278":{"id":"node_modules/d3-drag/src/nodrag.js","moduleParts":{"dist/rapid.js":"72ad-279"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-276"}],"importedBy":[{"uid":"72ad-286"},{"uid":"72ad-284"}]},"72ad-280":{"id":"node_modules/d3-drag/src/constant.js","moduleParts":{"dist/rapid.js":"72ad-281"},"imported":[],"importedBy":[{"uid":"72ad-284"}]},"72ad-282":{"id":"node_modules/d3-drag/src/event.js","moduleParts":{"dist/rapid.js":"72ad-283"},"imported":[],"importedBy":[{"uid":"72ad-284"}]},"72ad-284":{"id":"node_modules/d3-drag/src/drag.js","moduleParts":{"dist/rapid.js":"72ad-285"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-278"},{"uid":"72ad-276"},{"uid":"72ad-280"},{"uid":"72ad-282"}],"importedBy":[{"uid":"72ad-286"}]},"72ad-286":{"id":"node_modules/d3-drag/src/index.js","moduleParts":{"dist/rapid.js":"72ad-287"},"imported":[{"uid":"72ad-284"},{"uid":"72ad-278"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-1792"},{"uid":"72ad-1882"},{"uid":"72ad-2238"},{"uid":"72ad-404"}]},"72ad-288":{"id":"node_modules/d3-color/src/define.js","moduleParts":{"dist/rapid.js":"72ad-289"},"imported":[],"importedBy":[{"uid":"72ad-290"},{"uid":"72ad-2312"},{"uid":"72ad-2313"}]},"72ad-290":{"id":"node_modules/d3-color/src/color.js","moduleParts":{"dist/rapid.js":"72ad-291"},"imported":[{"uid":"72ad-288"}],"importedBy":[{"uid":"72ad-292"},{"uid":"72ad-2312"},{"uid":"72ad-2313"}]},"72ad-292":{"id":"node_modules/d3-color/src/index.js","moduleParts":{"dist/rapid.js":"72ad-293"},"imported":[{"uid":"72ad-290"},{"uid":"72ad-2312"},{"uid":"72ad-2313"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-316"},{"uid":"72ad-302"},{"uid":"72ad-2393"},{"uid":"72ad-2394"},{"uid":"72ad-2395"},{"uid":"72ad-2396"},{"uid":"72ad-2476"},{"uid":"72ad-2477"},{"uid":"72ad-2478"},{"uid":"72ad-342"}]},"72ad-294":{"id":"node_modules/d3-interpolate/src/basis.js","moduleParts":{"dist/rapid.js":"72ad-295"},"imported":[],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-296"},{"uid":"72ad-302"}]},"72ad-296":{"id":"node_modules/d3-interpolate/src/basisClosed.js","moduleParts":{"dist/rapid.js":"72ad-297"},"imported":[{"uid":"72ad-294"}],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-302"}]},"72ad-298":{"id":"node_modules/d3-interpolate/src/constant.js","moduleParts":{"dist/rapid.js":"72ad-299"},"imported":[],"importedBy":[{"uid":"72ad-316"},{"uid":"72ad-300"}]},"72ad-300":{"id":"node_modules/d3-interpolate/src/color.js","moduleParts":{"dist/rapid.js":"72ad-301"},"imported":[{"uid":"72ad-298"}],"importedBy":[{"uid":"72ad-2391"},{"uid":"72ad-302"},{"uid":"72ad-2393"},{"uid":"72ad-2394"},{"uid":"72ad-2395"},{"uid":"72ad-2396"}]},"72ad-302":{"id":"node_modules/d3-interpolate/src/rgb.js","moduleParts":{"dist/rapid.js":"72ad-303"},"imported":[{"uid":"72ad-292"},{"uid":"72ad-294"},{"uid":"72ad-296"},{"uid":"72ad-300"}],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-316"}]},"72ad-304":{"id":"node_modules/d3-interpolate/src/numberArray.js","moduleParts":{"dist/rapid.js":"72ad-305"},"imported":[],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-316"},{"uid":"72ad-306"}]},"72ad-306":{"id":"node_modules/d3-interpolate/src/array.js","moduleParts":{"dist/rapid.js":"72ad-307"},"imported":[{"uid":"72ad-316"},{"uid":"72ad-304"}],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-316"}]},"72ad-308":{"id":"node_modules/d3-interpolate/src/date.js","moduleParts":{"dist/rapid.js":"72ad-309"},"imported":[],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-316"}]},"72ad-310":{"id":"node_modules/d3-interpolate/src/number.js","moduleParts":{"dist/rapid.js":"72ad-311"},"imported":[],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-316"},{"uid":"72ad-314"},{"uid":"72ad-324"}]},"72ad-312":{"id":"node_modules/d3-interpolate/src/object.js","moduleParts":{"dist/rapid.js":"72ad-313"},"imported":[{"uid":"72ad-316"}],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-316"}]},"72ad-314":{"id":"node_modules/d3-interpolate/src/string.js","moduleParts":{"dist/rapid.js":"72ad-315"},"imported":[{"uid":"72ad-310"}],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-316"}]},"72ad-316":{"id":"node_modules/d3-interpolate/src/value.js","moduleParts":{"dist/rapid.js":"72ad-317"},"imported":[{"uid":"72ad-292"},{"uid":"72ad-302"},{"uid":"72ad-306"},{"uid":"72ad-308"},{"uid":"72ad-310"},{"uid":"72ad-312"},{"uid":"72ad-314"},{"uid":"72ad-298"},{"uid":"72ad-304"}],"importedBy":[{"uid":"72ad-318"},{"uid":"72ad-306"},{"uid":"72ad-312"},{"uid":"72ad-2397"}]},"72ad-318":{"id":"node_modules/d3-interpolate/src/index.js","moduleParts":{"dist/rapid.js":"72ad-319"},"imported":[{"uid":"72ad-316"},{"uid":"72ad-306"},{"uid":"72ad-294"},{"uid":"72ad-296"},{"uid":"72ad-308"},{"uid":"72ad-2390"},{"uid":"72ad-2391"},{"uid":"72ad-310"},{"uid":"72ad-304"},{"uid":"72ad-312"},{"uid":"72ad-2392"},{"uid":"72ad-314"},{"uid":"72ad-324"},{"uid":"72ad-326"},{"uid":"72ad-302"},{"uid":"72ad-2393"},{"uid":"72ad-2394"},{"uid":"72ad-2395"},{"uid":"72ad-2396"},{"uid":"72ad-2397"},{"uid":"72ad-2398"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-1946"},{"uid":"72ad-2042"},{"uid":"72ad-1918"},{"uid":"72ad-1720"},{"uid":"72ad-2238"},{"uid":"72ad-2434"},{"uid":"72ad-2436"},{"uid":"72ad-2476"},{"uid":"72ad-2477"},{"uid":"72ad-404"},{"uid":"72ad-2060"},{"uid":"72ad-2637"},{"uid":"72ad-2640"},{"uid":"72ad-344"},{"uid":"72ad-370"},{"uid":"72ad-342"}]},"72ad-320":{"id":"node_modules/d3-interpolate/src/transform/decompose.js","moduleParts":{"dist/rapid.js":"72ad-321"},"imported":[],"importedBy":[{"uid":"72ad-322"}]},"72ad-322":{"id":"node_modules/d3-interpolate/src/transform/parse.js","moduleParts":{"dist/rapid.js":"72ad-323"},"imported":[{"uid":"72ad-320"}],"importedBy":[{"uid":"72ad-324"}]},"72ad-324":{"id":"node_modules/d3-interpolate/src/transform/index.js","moduleParts":{"dist/rapid.js":"72ad-325"},"imported":[{"uid":"72ad-310"},{"uid":"72ad-322"}],"importedBy":[{"uid":"72ad-318"}]},"72ad-326":{"id":"node_modules/d3-interpolate/src/zoom.js","moduleParts":{"dist/rapid.js":"72ad-327"},"imported":[],"importedBy":[{"uid":"72ad-318"}]},"72ad-328":{"id":"node_modules/d3-timer/src/timer.js","moduleParts":{"dist/rapid.js":"72ad-329"},"imported":[],"importedBy":[{"uid":"72ad-330"},{"uid":"72ad-332"},{"uid":"72ad-2548"}]},"72ad-330":{"id":"node_modules/d3-timer/src/index.js","moduleParts":{"dist/rapid.js":"72ad-331"},"imported":[{"uid":"72ad-328"},{"uid":"72ad-332"},{"uid":"72ad-2548"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2204"},{"uid":"72ad-1894"},{"uid":"72ad-2339"},{"uid":"72ad-390"},{"uid":"72ad-334"}]},"72ad-332":{"id":"node_modules/d3-timer/src/timeout.js","moduleParts":{"dist/rapid.js":"72ad-333"},"imported":[{"uid":"72ad-328"}],"importedBy":[{"uid":"72ad-330"}]},"72ad-334":{"id":"node_modules/d3-transition/src/transition/schedule.js","moduleParts":{"dist/rapid.js":"72ad-335"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-330"}],"importedBy":[{"uid":"72ad-2549"},{"uid":"72ad-336"},{"uid":"72ad-390"},{"uid":"72ad-348"},{"uid":"72ad-350"},{"uid":"72ad-352"},{"uid":"72ad-354"},{"uid":"72ad-360"},{"uid":"72ad-364"},{"uid":"72ad-366"},{"uid":"72ad-370"},{"uid":"72ad-378"},{"uid":"72ad-340"},{"uid":"72ad-380"}]},"72ad-336":{"id":"node_modules/d3-transition/src/interrupt.js","moduleParts":{"dist/rapid.js":"72ad-337"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-394"},{"uid":"72ad-338"}]},"72ad-338":{"id":"node_modules/d3-transition/src/selection/interrupt.js","moduleParts":{"dist/rapid.js":"72ad-339"},"imported":[{"uid":"72ad-336"}],"importedBy":[{"uid":"72ad-392"}]},"72ad-340":{"id":"node_modules/d3-transition/src/transition/tween.js","moduleParts":{"dist/rapid.js":"72ad-341"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"},{"uid":"72ad-344"},{"uid":"72ad-370"},{"uid":"72ad-374"}]},"72ad-342":{"id":"node_modules/d3-transition/src/transition/interpolate.js","moduleParts":{"dist/rapid.js":"72ad-343"},"imported":[{"uid":"72ad-292"},{"uid":"72ad-318"}],"importedBy":[{"uid":"72ad-344"},{"uid":"72ad-370"}]},"72ad-344":{"id":"node_modules/d3-transition/src/transition/attr.js","moduleParts":{"dist/rapid.js":"72ad-345"},"imported":[{"uid":"72ad-318"},{"uid":"72ad-268"},{"uid":"72ad-340"},{"uid":"72ad-342"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-346":{"id":"node_modules/d3-transition/src/transition/attrTween.js","moduleParts":{"dist/rapid.js":"72ad-347"},"imported":[{"uid":"72ad-268"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-348":{"id":"node_modules/d3-transition/src/transition/delay.js","moduleParts":{"dist/rapid.js":"72ad-349"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-350":{"id":"node_modules/d3-transition/src/transition/duration.js","moduleParts":{"dist/rapid.js":"72ad-351"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-352":{"id":"node_modules/d3-transition/src/transition/ease.js","moduleParts":{"dist/rapid.js":"72ad-353"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-354":{"id":"node_modules/d3-transition/src/transition/easeVarying.js","moduleParts":{"dist/rapid.js":"72ad-355"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-356":{"id":"node_modules/d3-transition/src/transition/filter.js","moduleParts":{"dist/rapid.js":"72ad-357"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-382"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-358":{"id":"node_modules/d3-transition/src/transition/merge.js","moduleParts":{"dist/rapid.js":"72ad-359"},"imported":[{"uid":"72ad-382"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-360":{"id":"node_modules/d3-transition/src/transition/on.js","moduleParts":{"dist/rapid.js":"72ad-361"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-362":{"id":"node_modules/d3-transition/src/transition/remove.js","moduleParts":{"dist/rapid.js":"72ad-363"},"imported":[],"importedBy":[{"uid":"72ad-382"}]},"72ad-364":{"id":"node_modules/d3-transition/src/transition/select.js","moduleParts":{"dist/rapid.js":"72ad-365"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-382"},{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-366":{"id":"node_modules/d3-transition/src/transition/selectAll.js","moduleParts":{"dist/rapid.js":"72ad-367"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-382"},{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-368":{"id":"node_modules/d3-transition/src/transition/selection.js","moduleParts":{"dist/rapid.js":"72ad-369"},"imported":[{"uid":"72ad-268"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-370":{"id":"node_modules/d3-transition/src/transition/style.js","moduleParts":{"dist/rapid.js":"72ad-371"},"imported":[{"uid":"72ad-318"},{"uid":"72ad-268"},{"uid":"72ad-334"},{"uid":"72ad-340"},{"uid":"72ad-342"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-372":{"id":"node_modules/d3-transition/src/transition/styleTween.js","moduleParts":{"dist/rapid.js":"72ad-373"},"imported":[],"importedBy":[{"uid":"72ad-382"}]},"72ad-374":{"id":"node_modules/d3-transition/src/transition/text.js","moduleParts":{"dist/rapid.js":"72ad-375"},"imported":[{"uid":"72ad-340"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-376":{"id":"node_modules/d3-transition/src/transition/textTween.js","moduleParts":{"dist/rapid.js":"72ad-377"},"imported":[],"importedBy":[{"uid":"72ad-382"}]},"72ad-378":{"id":"node_modules/d3-transition/src/transition/transition.js","moduleParts":{"dist/rapid.js":"72ad-379"},"imported":[{"uid":"72ad-382"},{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-380":{"id":"node_modules/d3-transition/src/transition/end.js","moduleParts":{"dist/rapid.js":"72ad-381"},"imported":[{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-382"}]},"72ad-382":{"id":"node_modules/d3-transition/src/transition/index.js","moduleParts":{"dist/rapid.js":"72ad-383"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-344"},{"uid":"72ad-346"},{"uid":"72ad-348"},{"uid":"72ad-350"},{"uid":"72ad-352"},{"uid":"72ad-354"},{"uid":"72ad-356"},{"uid":"72ad-358"},{"uid":"72ad-360"},{"uid":"72ad-362"},{"uid":"72ad-364"},{"uid":"72ad-366"},{"uid":"72ad-368"},{"uid":"72ad-370"},{"uid":"72ad-372"},{"uid":"72ad-374"},{"uid":"72ad-376"},{"uid":"72ad-378"},{"uid":"72ad-340"},{"uid":"72ad-380"}],"importedBy":[{"uid":"72ad-394"},{"uid":"72ad-2549"},{"uid":"72ad-390"},{"uid":"72ad-356"},{"uid":"72ad-358"},{"uid":"72ad-364"},{"uid":"72ad-366"},{"uid":"72ad-378"}]},"72ad-384":{"id":"node_modules/d3-ease/src/linear.js","moduleParts":{"dist/rapid.js":"72ad-385"},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-386":{"id":"node_modules/d3-ease/src/index.js","moduleParts":{"dist/rapid.js":"72ad-387"},"imported":[{"uid":"72ad-384"},{"uid":"72ad-2322"},{"uid":"72ad-388"},{"uid":"72ad-2323"},{"uid":"72ad-2324"},{"uid":"72ad-2325"},{"uid":"72ad-2326"},{"uid":"72ad-2327"},{"uid":"72ad-2328"},{"uid":"72ad-2329"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-732"},{"uid":"72ad-2080"},{"uid":"72ad-1910"},{"uid":"72ad-390"}]},"72ad-388":{"id":"node_modules/d3-ease/src/cubic.js","moduleParts":{"dist/rapid.js":"72ad-389"},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-390":{"id":"node_modules/d3-transition/src/selection/transition.js","moduleParts":{"dist/rapid.js":"72ad-391"},"imported":[{"uid":"72ad-382"},{"uid":"72ad-334"},{"uid":"72ad-386"},{"uid":"72ad-330"}],"importedBy":[{"uid":"72ad-392"}]},"72ad-392":{"id":"node_modules/d3-transition/src/selection/index.js","moduleParts":{"dist/rapid.js":"72ad-393"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-338"},{"uid":"72ad-390"}],"importedBy":[{"uid":"72ad-394"}]},"72ad-394":{"id":"node_modules/d3-transition/src/index.js","moduleParts":{"dist/rapid.js":"72ad-395"},"imported":[{"uid":"72ad-392"},{"uid":"72ad-382"},{"uid":"72ad-2549"},{"uid":"72ad-336"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2238"},{"uid":"72ad-404"}]},"72ad-396":{"id":"node_modules/d3-zoom/src/constant.js","moduleParts":{"dist/rapid.js":"72ad-397"},"imported":[],"importedBy":[{"uid":"72ad-404"}]},"72ad-398":{"id":"node_modules/d3-zoom/src/event.js","moduleParts":{"dist/rapid.js":"72ad-399"},"imported":[],"importedBy":[{"uid":"72ad-404"}]},"72ad-400":{"id":"node_modules/d3-zoom/src/transform.js","moduleParts":{"dist/rapid.js":"72ad-401"},"imported":[],"importedBy":[{"uid":"72ad-406"},{"uid":"72ad-404"}]},"72ad-402":{"id":"node_modules/d3-zoom/src/noevent.js","moduleParts":{"dist/rapid.js":"72ad-403"},"imported":[],"importedBy":[{"uid":"72ad-404"}]},"72ad-404":{"id":"node_modules/d3-zoom/src/zoom.js","moduleParts":{"dist/rapid.js":"72ad-405"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-286"},{"uid":"72ad-318"},{"uid":"72ad-268"},{"uid":"72ad-394"},{"uid":"72ad-396"},{"uid":"72ad-398"},{"uid":"72ad-400"},{"uid":"72ad-402"}],"importedBy":[{"uid":"72ad-406"}]},"72ad-406":{"id":"node_modules/d3-zoom/src/index.js","moduleParts":{"dist/rapid.js":"72ad-407"},"imported":[{"uid":"72ad-404"},{"uid":"72ad-400"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-408"},{"uid":"72ad-2172"},{"uid":"72ad-1960"}]},"72ad-408":{"id":"node_modules/@rapid-sdk/math/built/math.mjs","moduleParts":{"dist/rapid.js":"72ad-409"},"imported":[{"uid":"72ad-164"},{"uid":"72ad-148"},{"uid":"72ad-406"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-434"},{"uid":"72ad-446"},{"uid":"72ad-466"},{"uid":"72ad-468"},{"uid":"72ad-472"},{"uid":"72ad-518"},{"uid":"72ad-520"},{"uid":"72ad-530"},{"uid":"72ad-534"},{"uid":"72ad-538"},{"uid":"72ad-544"},{"uid":"72ad-484"},{"uid":"72ad-548"},{"uid":"72ad-550"},{"uid":"72ad-554"},{"uid":"72ad-558"},{"uid":"72ad-636"},{"uid":"72ad-638"},{"uid":"72ad-684"},{"uid":"72ad-686"},{"uid":"72ad-688"},{"uid":"72ad-690"},{"uid":"72ad-692"},{"uid":"72ad-2224"},{"uid":"72ad-736"},{"uid":"72ad-1780"},{"uid":"72ad-1826"},{"uid":"72ad-2164"},{"uid":"72ad-524"},{"uid":"72ad-528"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-2000"},{"uid":"72ad-2002"},{"uid":"72ad-2014"},{"uid":"72ad-2016"},{"uid":"72ad-656"},{"uid":"72ad-662"},{"uid":"72ad-670"},{"uid":"72ad-474"},{"uid":"72ad-444"},{"uid":"72ad-478"},{"uid":"72ad-480"},{"uid":"72ad-428"},{"uid":"72ad-516"},{"uid":"72ad-2168"},{"uid":"72ad-2170"},{"uid":"72ad-2172"},{"uid":"72ad-2174"},{"uid":"72ad-2176"},{"uid":"72ad-2178"},{"uid":"72ad-2180"},{"uid":"72ad-2198"},{"uid":"72ad-2200"},{"uid":"72ad-2204"},{"uid":"72ad-2210"},{"uid":"72ad-1798"},{"uid":"72ad-1932"},{"uid":"72ad-1938"},{"uid":"72ad-2082"},{"uid":"72ad-2094"},{"uid":"72ad-1860"},{"uid":"72ad-1870"},{"uid":"72ad-1892"},{"uid":"72ad-1898"},{"uid":"72ad-1960"},{"uid":"72ad-2026"},{"uid":"72ad-2038"},{"uid":"72ad-2042"},{"uid":"72ad-418"},{"uid":"72ad-2130"},{"uid":"72ad-2132"},{"uid":"72ad-2134"},{"uid":"72ad-2136"},{"uid":"72ad-2144"},{"uid":"72ad-2148"},{"uid":"72ad-2158"},{"uid":"72ad-492"},{"uid":"72ad-502"},{"uid":"72ad-514"},{"uid":"72ad-1776"},{"uid":"72ad-1908"},{"uid":"72ad-1910"},{"uid":"72ad-1912"},{"uid":"72ad-1914"},{"uid":"72ad-1916"},{"uid":"72ad-1918"},{"uid":"72ad-1920"},{"uid":"72ad-1922"},{"uid":"72ad-1926"},{"uid":"72ad-1720"},{"uid":"72ad-1744"},{"uid":"72ad-1752"},{"uid":"72ad-1762"},{"uid":"72ad-1766"},{"uid":"72ad-1730"},{"uid":"72ad-1728"},{"uid":"72ad-1724"}]},"72ad-410":{"id":"modules/osm/entity.js","moduleParts":{"dist/rapid.js":"72ad-411"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-116"}],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-732"},{"uid":"72ad-474"},{"uid":"72ad-444"},{"uid":"72ad-480"},{"uid":"72ad-428"},{"uid":"72ad-516"},{"uid":"72ad-1792"},{"uid":"72ad-1892"},{"uid":"72ad-1928"}]},"72ad-412":{"id":"modules/osm/lanes.js","moduleParts":{"dist/rapid.js":"72ad-413"},"imported":[],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-428"}]},"72ad-414":{"id":"modules/util/detect.js","moduleParts":{"dist/rapid.js":"72ad-415"},"imported":[],"importedBy":[{"uid":"72ad-416"},{"uid":"72ad-690"},{"uid":"72ad-738"},{"uid":"72ad-2122"},{"uid":"72ad-652"},{"uid":"72ad-1896"},{"uid":"72ad-2040"},{"uid":"72ad-1356"}]},"72ad-416":{"id":"modules/util/index.js","moduleParts":{"dist/rapid.js":"72ad-417"},"imported":[{"uid":"72ad-414"},{"uid":"72ad-418"},{"uid":"72ad-420"},{"uid":"72ad-422"},{"uid":"72ad-424"},{"uid":"72ad-426"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-484"},{"uid":"72ad-2224"},{"uid":"72ad-2012"},{"uid":"72ad-2014"},{"uid":"72ad-682"},{"uid":"72ad-646"},{"uid":"72ad-654"},{"uid":"72ad-656"},{"uid":"72ad-662"},{"uid":"72ad-668"},{"uid":"72ad-680"},{"uid":"72ad-428"},{"uid":"72ad-2172"},{"uid":"72ad-1792"},{"uid":"72ad-1794"},{"uid":"72ad-1796"},{"uid":"72ad-1798"},{"uid":"72ad-1800"},{"uid":"72ad-1808"},{"uid":"72ad-1810"},{"uid":"72ad-1816"},{"uid":"72ad-1818"},{"uid":"72ad-1820"},{"uid":"72ad-1822"},{"uid":"72ad-1852"},{"uid":"72ad-1874"},{"uid":"72ad-1878"},{"uid":"72ad-2112"},{"uid":"72ad-1880"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1888"},{"uid":"72ad-2094"},{"uid":"72ad-2098"},{"uid":"72ad-2078"},{"uid":"72ad-2104"},{"uid":"72ad-1840"},{"uid":"72ad-1790"},{"uid":"72ad-1842"},{"uid":"72ad-1860"},{"uid":"72ad-1848"},{"uid":"72ad-1872"},{"uid":"72ad-1892"},{"uid":"72ad-1814"},{"uid":"72ad-1838"},{"uid":"72ad-1902"},{"uid":"72ad-1906"},{"uid":"72ad-1950"},{"uid":"72ad-1956"},{"uid":"72ad-1960"},{"uid":"72ad-728"},{"uid":"72ad-1968"},{"uid":"72ad-1970"},{"uid":"72ad-1976"},{"uid":"72ad-1980"},{"uid":"72ad-1942"},{"uid":"72ad-1982"},{"uid":"72ad-2026"},{"uid":"72ad-1850"},{"uid":"72ad-2042"},{"uid":"72ad-514"},{"uid":"72ad-1922"}]},"72ad-418":{"id":"modules/util/util.js","moduleParts":{"dist/rapid.js":"72ad-419"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-416"},{"uid":"72ad-1780"},{"uid":"72ad-658"},{"uid":"72ad-666"},{"uid":"72ad-672"},{"uid":"72ad-676"},{"uid":"72ad-1870"},{"uid":"72ad-1804"},{"uid":"72ad-1806"},{"uid":"72ad-1776"}]},"72ad-420":{"id":"modules/util/get_set_value.js","moduleParts":{"dist/rapid.js":"72ad-421"},"imported":[],"importedBy":[{"uid":"72ad-416"}]},"72ad-422":{"id":"modules/util/keybinding.js","moduleParts":{"dist/rapid.js":"72ad-423"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-416"},{"uid":"72ad-1792"},{"uid":"72ad-2072"}]},"72ad-424":{"id":"modules/util/rebind.js","moduleParts":{"dist/rapid.js":"72ad-425"},"imported":[],"importedBy":[{"uid":"72ad-416"},{"uid":"72ad-1786"},{"uid":"72ad-1802"},{"uid":"72ad-1848"},{"uid":"72ad-1870"},{"uid":"72ad-2010"},{"uid":"72ad-1912"},{"uid":"72ad-1914"},{"uid":"72ad-1916"},{"uid":"72ad-1918"},{"uid":"72ad-1920"},{"uid":"72ad-1924"},{"uid":"72ad-1926"}]},"72ad-426":{"id":"modules/util/trigger_event.js","moduleParts":{"dist/rapid.js":"72ad-427"},"imported":[],"importedBy":[{"uid":"72ad-416"}]},"72ad-428":{"id":"modules/osm/way.js","moduleParts":{"dist/rapid.js":"72ad-429"},"imported":[{"uid":"72ad-148"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-410"},{"uid":"72ad-412"},{"uid":"72ad-116"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-432"},{"uid":"72ad-484"},{"uid":"72ad-692"},{"uid":"72ad-430"}]},"72ad-430":{"id":"modules/osm/multipolygon.js","moduleParts":{"dist/rapid.js":"72ad-431"},"imported":[{"uid":"72ad-114"},{"uid":"72ad-116"},{"uid":"72ad-428"}],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-432"},{"uid":"72ad-468"},{"uid":"72ad-484"},{"uid":"72ad-480"},{"uid":"72ad-2148"},{"uid":"72ad-2152"},{"uid":"72ad-2154"}]},"72ad-432":{"id":"modules/actions/add_member.js","moduleParts":{"dist/rapid.js":"72ad-433"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-430"},{"uid":"72ad-428"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-484"},{"uid":"72ad-1886"}]},"72ad-434":{"id":"modules/actions/add_midpoint.js","moduleParts":{"dist/rapid.js":"72ad-435"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-692"},{"uid":"72ad-1990"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-682"},{"uid":"72ad-2130"},{"uid":"72ad-2134"}]},"72ad-436":{"id":"modules/actions/add_vertex.js","moduleParts":{"dist/rapid.js":"72ad-437"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-2148"}]},"72ad-438":{"id":"modules/actions/change_member.js","moduleParts":{"dist/rapid.js":"72ad-439"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-2150"}]},"72ad-440":{"id":"modules/actions/change_preset.js","moduleParts":{"dist/rapid.js":"72ad-441"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1942"},{"uid":"72ad-2154"},{"uid":"72ad-1916"},{"uid":"72ad-1922"}]},"72ad-442":{"id":"modules/actions/change_tags.js","moduleParts":{"dist/rapid.js":"72ad-443"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1990"},{"uid":"72ad-660"},{"uid":"72ad-1820"},{"uid":"72ad-1822"},{"uid":"72ad-1872"},{"uid":"72ad-2130"},{"uid":"72ad-2134"},{"uid":"72ad-2148"},{"uid":"72ad-2154"},{"uid":"72ad-2156"},{"uid":"72ad-2160"}]},"72ad-444":{"id":"modules/osm/node.js","moduleParts":{"dist/rapid.js":"72ad-445"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-410"}],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-446"},{"uid":"72ad-464"},{"uid":"72ad-466"},{"uid":"72ad-530"},{"uid":"72ad-692"},{"uid":"72ad-1990"},{"uid":"72ad-2134"}]},"72ad-446":{"id":"modules/actions/circularize.js","moduleParts":{"dist/rapid.js":"72ad-447"},"imported":[{"uid":"72ad-124"},{"uid":"72ad-164"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-444"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-646"}]},"72ad-448":{"id":"modules/actions/delete_way.js","moduleParts":{"dist/rapid.js":"72ad-449"},"imported":[{"uid":"72ad-116"},{"uid":"72ad-452"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-456"},{"uid":"72ad-450"},{"uid":"72ad-454"},{"uid":"72ad-468"},{"uid":"72ad-542"}]},"72ad-450":{"id":"modules/actions/delete_multiple.js","moduleParts":{"dist/rapid.js":"72ad-451"},"imported":[{"uid":"72ad-454"},{"uid":"72ad-452"},{"uid":"72ad-448"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-452"},{"uid":"72ad-520"},{"uid":"72ad-656"}]},"72ad-452":{"id":"modules/actions/delete_relation.js","moduleParts":{"dist/rapid.js":"72ad-453"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-450"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-460"},{"uid":"72ad-450"},{"uid":"72ad-454"},{"uid":"72ad-448"},{"uid":"72ad-468"},{"uid":"72ad-542"},{"uid":"72ad-552"},{"uid":"72ad-682"},{"uid":"72ad-516"}]},"72ad-454":{"id":"modules/actions/delete_node.js","moduleParts":{"dist/rapid.js":"72ad-455"},"imported":[{"uid":"72ad-452"},{"uid":"72ad-448"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-456"},{"uid":"72ad-450"},{"uid":"72ad-538"},{"uid":"72ad-550"}]},"72ad-456":{"id":"modules/actions/connect.js","moduleParts":{"dist/rapid.js":"72ad-457"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-454"},{"uid":"72ad-448"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-472"},{"uid":"72ad-1994"}]},"72ad-458":{"id":"modules/actions/copy_entities.js","moduleParts":{"dist/rapid.js":"72ad-459"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-690"},{"uid":"72ad-670"}]},"72ad-460":{"id":"modules/actions/delete_member.js","moduleParts":{"dist/rapid.js":"72ad-461"},"imported":[{"uid":"72ad-452"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1882"},{"uid":"72ad-2150"},{"uid":"72ad-1884"}]},"72ad-462":{"id":"modules/actions/discard_tags.js","moduleParts":{"dist/rapid.js":"72ad-463"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-2124"},{"uid":"72ad-1852"}]},"72ad-464":{"id":"modules/actions/disconnect.js","moduleParts":{"dist/rapid.js":"72ad-465"},"imported":[{"uid":"72ad-444"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-658"}]},"72ad-466":{"id":"modules/actions/extract.js","moduleParts":{"dist/rapid.js":"72ad-467"},"imported":[{"uid":"72ad-164"},{"uid":"72ad-408"},{"uid":"72ad-444"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-662"},{"uid":"72ad-2148"}]},"72ad-468":{"id":"modules/actions/join.js","moduleParts":{"dist/rapid.js":"72ad-469"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-452"},{"uid":"72ad-448"},{"uid":"72ad-116"},{"uid":"72ad-430"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-664"}]},"72ad-470":{"id":"modules/actions/merge.js","moduleParts":{"dist/rapid.js":"72ad-471"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-116"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-664"}]},"72ad-472":{"id":"modules/actions/merge_nodes.js","moduleParts":{"dist/rapid.js":"72ad-473"},"imported":[{"uid":"72ad-456"},{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-664"},{"uid":"72ad-2130"},{"uid":"72ad-2132"},{"uid":"72ad-2134"},{"uid":"72ad-2148"}]},"72ad-474":{"id":"modules/osm/changeset.js","moduleParts":{"dist/rapid.js":"72ad-475"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-410"}],"importedBy":[{"uid":"72ad-476"}]},"72ad-476":{"id":"modules/osm/index.js","moduleParts":{"dist/rapid.js":"72ad-477"},"imported":[{"uid":"72ad-474"},{"uid":"72ad-410"},{"uid":"72ad-444"},{"uid":"72ad-478"},{"uid":"72ad-480"},{"uid":"72ad-428"},{"uid":"72ad-482"},{"uid":"72ad-516"},{"uid":"72ad-412"},{"uid":"72ad-430"},{"uid":"72ad-116"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-518"},{"uid":"72ad-520"},{"uid":"72ad-558"},{"uid":"72ad-636"},{"uid":"72ad-686"},{"uid":"72ad-692"},{"uid":"72ad-734"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-2014"},{"uid":"72ad-682"},{"uid":"72ad-2168"},{"uid":"72ad-2170"},{"uid":"72ad-2174"},{"uid":"72ad-2178"},{"uid":"72ad-2198"},{"uid":"72ad-2200"},{"uid":"72ad-1786"},{"uid":"72ad-1938"},{"uid":"72ad-1852"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1888"},{"uid":"72ad-1842"},{"uid":"72ad-1860"},{"uid":"72ad-1966"},{"uid":"72ad-2042"},{"uid":"72ad-1954"},{"uid":"72ad-1944"},{"uid":"72ad-1974"},{"uid":"72ad-2052"}]},"72ad-478":{"id":"modules/osm/note.js","moduleParts":{"dist/rapid.js":"72ad-479"},"imported":[{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-1988"}]},"72ad-480":{"id":"modules/osm/relation.js","moduleParts":{"dist/rapid.js":"72ad-481"},"imported":[{"uid":"72ad-148"},{"uid":"72ad-408"},{"uid":"72ad-410"},{"uid":"72ad-430"}],"importedBy":[{"uid":"72ad-476"},{"uid":"72ad-540"},{"uid":"72ad-484"}]},"72ad-482":{"id":"modules/osm/qa_item.js","moduleParts":{"dist/rapid.js":"72ad-483"},"imported":[],"importedBy":[{"uid":"72ad-476"}]},"72ad-484":{"id":"modules/actions/split.js","moduleParts":{"dist/rapid.js":"72ad-485"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-432"},{"uid":"72ad-430"},{"uid":"72ad-480"},{"uid":"72ad-428"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-678"},{"uid":"72ad-516"},{"uid":"72ad-2134"}]},"72ad-486":{"id":"modules/core/lib/Collection.js","moduleParts":{"dist/rapid.js":"72ad-487"},"imported":[{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-490"},{"uid":"72ad-488"}]},"72ad-488":{"id":"modules/core/lib/Category.js","moduleParts":{"dist/rapid.js":"72ad-489"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-486"}],"importedBy":[{"uid":"72ad-490"}]},"72ad-490":{"id":"modules/core/lib/index.js","moduleParts":{"dist/rapid.js":"72ad-491"},"imported":[{"uid":"72ad-488"},{"uid":"72ad-486"},{"uid":"72ad-492"},{"uid":"72ad-502"},{"uid":"72ad-504"},{"uid":"72ad-506"},{"uid":"72ad-508"},{"uid":"72ad-510"},{"uid":"72ad-512"},{"uid":"72ad-514"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-732"},{"uid":"72ad-1824"},{"uid":"72ad-2124"},{"uid":"72ad-516"},{"uid":"72ad-2168"},{"uid":"72ad-2178"},{"uid":"72ad-2080"},{"uid":"72ad-1892"},{"uid":"72ad-2130"},{"uid":"72ad-2132"},{"uid":"72ad-2134"},{"uid":"72ad-2136"},{"uid":"72ad-2138"},{"uid":"72ad-2140"},{"uid":"72ad-2142"},{"uid":"72ad-2144"},{"uid":"72ad-2146"},{"uid":"72ad-2148"},{"uid":"72ad-2150"},{"uid":"72ad-2152"},{"uid":"72ad-2154"},{"uid":"72ad-2156"},{"uid":"72ad-2158"},{"uid":"72ad-2160"},{"uid":"72ad-2162"}]},"72ad-492":{"id":"modules/core/lib/Difference.js","moduleParts":{"dist/rapid.js":"72ad-493"},"imported":[{"uid":"72ad-4"},{"uid":"72ad-408"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-490"},{"uid":"72ad-2164"},{"uid":"72ad-510"}]},"72ad-494":{"id":"node_modules/d3-fetch/src/text.js","moduleParts":{"dist/rapid.js":"72ad-495"},"imported":[],"importedBy":[{"uid":"72ad-498"},{"uid":"72ad-2332"},{"uid":"72ad-500"}]},"72ad-496":{"id":"node_modules/d3-fetch/src/json.js","moduleParts":{"dist/rapid.js":"72ad-497"},"imported":[],"importedBy":[{"uid":"72ad-498"}]},"72ad-498":{"id":"node_modules/d3-fetch/src/index.js","moduleParts":{"dist/rapid.js":"72ad-499"},"imported":[{"uid":"72ad-2330"},{"uid":"72ad-2331"},{"uid":"72ad-2332"},{"uid":"72ad-2333"},{"uid":"72ad-496"},{"uid":"72ad-494"},{"uid":"72ad-500"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2168"},{"uid":"72ad-2170"},{"uid":"72ad-2172"},{"uid":"72ad-2174"},{"uid":"72ad-2178"},{"uid":"72ad-2180"},{"uid":"72ad-2198"},{"uid":"72ad-2200"},{"uid":"72ad-2202"},{"uid":"72ad-2204"},{"uid":"72ad-2208"},{"uid":"72ad-2220"},{"uid":"72ad-2222"},{"uid":"72ad-1868"},{"uid":"72ad-502"},{"uid":"72ad-1766"}]},"72ad-500":{"id":"node_modules/d3-fetch/src/xml.js","moduleParts":{"dist/rapid.js":"72ad-501"},"imported":[{"uid":"72ad-494"}],"importedBy":[{"uid":"72ad-498"}]},"72ad-502":{"id":"modules/core/lib/ImagerySource.js","moduleParts":{"dist/rapid.js":"72ad-503"},"imported":[{"uid":"72ad-148"},{"uid":"72ad-498"},{"uid":"72ad-112"},{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-490"},{"uid":"72ad-736"}]},"72ad-504":{"id":"modules/core/lib/Field.js","moduleParts":{"dist/rapid.js":"72ad-505"},"imported":[{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-490"}]},"72ad-506":{"id":"modules/core/lib/Graph.js","moduleParts":{"dist/rapid.js":"72ad-507"},"imported":[{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-490"}]},"72ad-508":{"id":"modules/core/lib/Preset.js","moduleParts":{"dist/rapid.js":"72ad-509"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-116"}],"importedBy":[{"uid":"72ad-490"}]},"72ad-510":{"id":"modules/core/lib/Tree.js","moduleParts":{"dist/rapid.js":"72ad-511"},"imported":[{"uid":"72ad-6"},{"uid":"72ad-492"}],"importedBy":[{"uid":"72ad-490"}]},"72ad-512":{"id":"modules/core/lib/ValidationFix.js","moduleParts":{"dist/rapid.js":"72ad-513"},"imported":[],"importedBy":[{"uid":"72ad-490"},{"uid":"72ad-514"}]},"72ad-514":{"id":"modules/core/lib/ValidationIssue.js","moduleParts":{"dist/rapid.js":"72ad-515"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-512"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-490"}]},"72ad-516":{"id":"modules/osm/intersection.js","moduleParts":{"dist/rapid.js":"72ad-517"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-452"},{"uid":"72ad-114"},{"uid":"72ad-484"},{"uid":"72ad-490"},{"uid":"72ad-410"}],"importedBy":[{"uid":"72ad-476"}]},"72ad-518":{"id":"modules/actions/merge_polygon.js","moduleParts":{"dist/rapid.js":"72ad-519"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-664"}]},"72ad-520":{"id":"modules/actions/merge_remote_changes.js","moduleParts":{"dist/rapid.js":"72ad-521"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-4"},{"uid":"72ad-522"},{"uid":"72ad-450"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-2124"}]},"72ad-522":{"id":"node_modules/node-diff3/index.mjs","moduleParts":{"dist/rapid.js":"72ad-523"},"imported":[],"importedBy":[{"uid":"72ad-520"}]},"72ad-524":{"id":"modules/geo/geom.js","moduleParts":{"dist/rapid.js":"72ad-525"},"imported":[{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-526"}]},"72ad-526":{"id":"modules/geo/index.js","moduleParts":{"dist/rapid.js":"72ad-527"},"imported":[{"uid":"72ad-524"},{"uid":"72ad-528"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-530"},{"uid":"72ad-538"},{"uid":"72ad-692"},{"uid":"72ad-1990"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-682"},{"uid":"72ad-1798"},{"uid":"72ad-2130"},{"uid":"72ad-2148"}]},"72ad-528":{"id":"modules/geo/ortho.js","moduleParts":{"dist/rapid.js":"72ad-529"},"imported":[{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-526"},{"uid":"72ad-2162"}]},"72ad-530":{"id":"modules/actions/move.js","moduleParts":{"dist/rapid.js":"72ad-531"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-526"},{"uid":"72ad-444"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-690"},{"uid":"72ad-2000"},{"uid":"72ad-662"},{"uid":"72ad-670"}]},"72ad-532":{"id":"modules/actions/move_member.js","moduleParts":{"dist/rapid.js":"72ad-533"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1882"}]},"72ad-534":{"id":"modules/actions/move_node.js","moduleParts":{"dist/rapid.js":"72ad-535"},"imported":[{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"}]},"72ad-536":{"id":"modules/actions/noop.js","moduleParts":{"dist/rapid.js":"72ad-537"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-2124"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-2000"},{"uid":"72ad-2002"},{"uid":"72ad-2016"},{"uid":"72ad-650"},{"uid":"72ad-2094"}]},"72ad-538":{"id":"modules/actions/orthogonalize.js","moduleParts":{"dist/rapid.js":"72ad-539"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-454"},{"uid":"72ad-526"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-668"},{"uid":"72ad-2162"}]},"72ad-540":{"id":"modules/actions/restrict_turn.js","moduleParts":{"dist/rapid.js":"72ad-541"},"imported":[{"uid":"72ad-480"}],"importedBy":[{"uid":"72ad-110"}]},"72ad-542":{"id":"modules/actions/revert.js","moduleParts":{"dist/rapid.js":"72ad-543"},"imported":[{"uid":"72ad-452"},{"uid":"72ad-448"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-2124"}]},"72ad-544":{"id":"modules/actions/rotate.js","moduleParts":{"dist/rapid.js":"72ad-545"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-2002"}]},"72ad-546":{"id":"modules/actions/scale.js","moduleParts":{"dist/rapid.js":"72ad-547"},"imported":[{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-110"}]},"72ad-548":{"id":"modules/actions/straighten_nodes.js","moduleParts":{"dist/rapid.js":"72ad-549"},"imported":[{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-680"}]},"72ad-550":{"id":"modules/actions/straighten_way.js","moduleParts":{"dist/rapid.js":"72ad-551"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-454"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-680"}]},"72ad-552":{"id":"modules/actions/unrestrict_turn.js","moduleParts":{"dist/rapid.js":"72ad-553"},"imported":[{"uid":"72ad-452"}],"importedBy":[{"uid":"72ad-110"}]},"72ad-554":{"id":"modules/actions/reflect.js","moduleParts":{"dist/rapid.js":"72ad-555"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-672"}]},"72ad-556":{"id":"modules/actions/upgrade_tags.js","moduleParts":{"dist/rapid.js":"72ad-557"},"imported":[],"importedBy":[{"uid":"72ad-110"},{"uid":"72ad-2154"}]},"72ad-558":{"id":"modules/actions/rapid_accept_feature.js","moduleParts":{"dist/rapid.js":"72ad-559"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-110"}]},"72ad-560":{"id":"modules/behaviors/index.js","moduleParts":{"dist/rapid.js":"72ad-561"},"imported":[{"uid":"72ad-636"},{"uid":"72ad-638"},{"uid":"72ad-640"},{"uid":"72ad-642"},{"uid":"72ad-684"},{"uid":"72ad-686"},{"uid":"72ad-688"},{"uid":"72ad-690"},{"uid":"72ad-692"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-2224"}]},"72ad-562":{"id":"node_modules/@pixi/utils/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-563"},"imported":[{"uid":"72ad-576"},{"uid":"72ad-566"},{"uid":"72ad-8"},{"uid":"72ad-10"},{"uid":"72ad-578"},{"uid":"72ad-580"},{"uid":"72ad-584"},{"uid":"72ad-586"},{"uid":"72ad-596"},{"uid":"72ad-600"},{"uid":"72ad-602"},{"uid":"72ad-604"},{"uid":"72ad-606"},{"uid":"72ad-608"},{"uid":"72ad-610"},{"uid":"72ad-612"},{"uid":"72ad-614"},{"uid":"72ad-616"},{"uid":"72ad-582"},{"uid":"72ad-618"},{"uid":"72ad-620"},{"uid":"72ad-622"},{"uid":"72ad-624"},{"uid":"72ad-626"},{"uid":"72ad-628"},{"uid":"72ad-630"},{"uid":"72ad-632"},{"uid":"72ad-2550"}],"importedBy":[{"uid":"72ad-732"},{"uid":"72ad-734"},{"uid":"72ad-736"},{"uid":"72ad-744"},{"uid":"72ad-1780"},{"uid":"72ad-1784"},{"uid":"72ad-1826"},{"uid":"72ad-2124"},{"uid":"72ad-2126"},{"uid":"72ad-2164"},{"uid":"72ad-2168"},{"uid":"72ad-2170"},{"uid":"72ad-2172"},{"uid":"72ad-2174"},{"uid":"72ad-2176"},{"uid":"72ad-2178"},{"uid":"72ad-2198"},{"uid":"72ad-2200"},{"uid":"72ad-2204"},{"uid":"72ad-2210"},{"uid":"72ad-634"},{"uid":"72ad-1776"},{"uid":"72ad-1356"},{"uid":"72ad-1770"},{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-854"},{"uid":"72ad-778"},{"uid":"72ad-920"},{"uid":"72ad-992"},{"uid":"72ad-886"},{"uid":"72ad-834"},{"uid":"72ad-768"},{"uid":"72ad-882"},{"uid":"72ad-954"},{"uid":"72ad-946"},{"uid":"72ad-876"},{"uid":"72ad-1006"},{"uid":"72ad-964"},{"uid":"72ad-776"}]},"72ad-564":{"id":"node_modules/@pixi/settings/lib/adapter.mjs","moduleParts":{"dist/rapid.js":"72ad-565"},"imported":[],"importedBy":[{"uid":"72ad-566"},{"uid":"72ad-568"}]},"72ad-566":{"id":"node_modules/@pixi/settings/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-567"},"imported":[{"uid":"72ad-564"},{"uid":"72ad-2651"},{"uid":"72ad-2652"},{"uid":"72ad-568"},{"uid":"72ad-574"}],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-576"},{"uid":"72ad-580"},{"uid":"72ad-586"},{"uid":"72ad-622"},{"uid":"72ad-632"},{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-854"},{"uid":"72ad-868"},{"uid":"72ad-898"},{"uid":"72ad-900"},{"uid":"72ad-916"},{"uid":"72ad-918"},{"uid":"72ad-992"},{"uid":"72ad-820"},{"uid":"72ad-768"},{"uid":"72ad-882"},{"uid":"72ad-958"},{"uid":"72ad-1004"},{"uid":"72ad-878"},{"uid":"72ad-1006"},{"uid":"72ad-964"},{"uid":"72ad-844"},{"uid":"72ad-846"}]},"72ad-568":{"id":"node_modules/@pixi/settings/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-569"},"imported":[{"uid":"72ad-564"}],"importedBy":[{"uid":"72ad-566"}]},"72ad-570":{"id":"node_modules/ismobilejs/esm/isMobile.js","moduleParts":{"dist/rapid.js":"72ad-571"},"imported":[],"importedBy":[{"uid":"72ad-572"}]},"72ad-572":{"id":"node_modules/ismobilejs/esm/index.js","moduleParts":{"dist/rapid.js":"72ad-573"},"imported":[{"uid":"72ad-570"}],"importedBy":[{"uid":"72ad-574"},{"uid":"72ad-1378"}]},"72ad-574":{"id":"node_modules/@pixi/settings/lib/utils/isMobile.mjs","moduleParts":{"dist/rapid.js":"72ad-575"},"imported":[{"uid":"72ad-572"}],"importedBy":[{"uid":"72ad-566"}]},"72ad-576":{"id":"node_modules/@pixi/utils/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-577"},"imported":[{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-586"},{"uid":"72ad-632"}]},"72ad-578":{"id":"node_modules/@pixi/utils/lib/url.mjs","moduleParts":{"dist/rapid.js":"72ad-579"},"imported":[{"uid":"72ad-22"}],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-630"}]},"72ad-580":{"id":"node_modules/@pixi/utils/lib/path.mjs","moduleParts":{"dist/rapid.js":"72ad-581"},"imported":[{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-582":{"id":"node_modules/@pixi/utils/lib/logging/deprecation.mjs","moduleParts":{"dist/rapid.js":"72ad-583"},"imported":[],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-584"},{"uid":"72ad-596"},{"uid":"72ad-600"}]},"72ad-584":{"id":"node_modules/@pixi/utils/lib/browser/hello.mjs","moduleParts":{"dist/rapid.js":"72ad-585"},"imported":[{"uid":"72ad-582"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-586":{"id":"node_modules/@pixi/utils/lib/browser/isWebGLSupported.mjs","moduleParts":{"dist/rapid.js":"72ad-587"},"imported":[{"uid":"72ad-576"},{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-588":{"id":"node_modules/colord/index.mjs","moduleParts":{"dist/rapid.js":"72ad-589"},"imported":[],"importedBy":[{"uid":"72ad-592"},{"uid":"72ad-746"},{"uid":"72ad-1390"}]},"72ad-590":{"id":"node_modules/colord/plugins/names.mjs","moduleParts":{"dist/rapid.js":"72ad-591"},"imported":[],"importedBy":[{"uid":"72ad-592"},{"uid":"72ad-746"},{"uid":"72ad-1390"}]},"72ad-592":{"id":"node_modules/@pixi/utils/node_modules/@pixi/color/lib/Color.mjs","moduleParts":{"dist/rapid.js":"72ad-593"},"imported":[{"uid":"72ad-588"},{"uid":"72ad-590"}],"importedBy":[{"uid":"72ad-594"}]},"72ad-594":{"id":"node_modules/@pixi/utils/node_modules/@pixi/color/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-595"},"imported":[{"uid":"72ad-592"}],"importedBy":[{"uid":"72ad-596"},{"uid":"72ad-600"}]},"72ad-596":{"id":"node_modules/@pixi/utils/lib/color/hex.mjs","moduleParts":{"dist/rapid.js":"72ad-597"},"imported":[{"uid":"72ad-594"},{"uid":"72ad-582"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-598":{"id":"node_modules/@pixi/constants/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-599"},"imported":[],"importedBy":[{"uid":"72ad-600"},{"uid":"72ad-962"},{"uid":"72ad-1772"},{"uid":"72ad-960"},{"uid":"72ad-770"},{"uid":"72ad-780"},{"uid":"72ad-854"},{"uid":"72ad-868"},{"uid":"72ad-860"},{"uid":"72ad-892"},{"uid":"72ad-894"},{"uid":"72ad-872"},{"uid":"72ad-898"},{"uid":"72ad-896"},{"uid":"72ad-984"},{"uid":"72ad-774"},{"uid":"72ad-772"},{"uid":"72ad-778"},{"uid":"72ad-900"},{"uid":"72ad-910"},{"uid":"72ad-912"},{"uid":"72ad-992"},{"uid":"72ad-874"},{"uid":"72ad-886"},{"uid":"72ad-834"},{"uid":"72ad-836"},{"uid":"72ad-820"},{"uid":"72ad-756"},{"uid":"72ad-944"},{"uid":"72ad-768"},{"uid":"72ad-950"},{"uid":"72ad-948"},{"uid":"72ad-954"},{"uid":"72ad-876"},{"uid":"72ad-996"},{"uid":"72ad-766"},{"uid":"72ad-1002"},{"uid":"72ad-1004"},{"uid":"72ad-878"},{"uid":"72ad-870"},{"uid":"72ad-830"},{"uid":"72ad-822"},{"uid":"72ad-942"},{"uid":"72ad-952"}]},"72ad-600":{"id":"node_modules/@pixi/utils/lib/color/premultiply.mjs","moduleParts":{"dist/rapid.js":"72ad-601"},"imported":[{"uid":"72ad-594"},{"uid":"72ad-598"},{"uid":"72ad-582"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-602":{"id":"node_modules/@pixi/utils/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-603"},"imported":[],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-628"}]},"72ad-604":{"id":"node_modules/@pixi/utils/lib/data/createIndicesForQuads.mjs","moduleParts":{"dist/rapid.js":"72ad-605"},"imported":[],"importedBy":[{"uid":"72ad-562"}]},"72ad-606":{"id":"node_modules/@pixi/utils/lib/data/getBufferType.mjs","moduleParts":{"dist/rapid.js":"72ad-607"},"imported":[],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-608"}]},"72ad-608":{"id":"node_modules/@pixi/utils/lib/data/interleaveTypedArrays.mjs","moduleParts":{"dist/rapid.js":"72ad-609"},"imported":[{"uid":"72ad-606"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-610":{"id":"node_modules/@pixi/utils/lib/data/pow2.mjs","moduleParts":{"dist/rapid.js":"72ad-611"},"imported":[],"importedBy":[{"uid":"72ad-562"}]},"72ad-612":{"id":"node_modules/@pixi/utils/lib/data/removeItems.mjs","moduleParts":{"dist/rapid.js":"72ad-613"},"imported":[],"importedBy":[{"uid":"72ad-562"}]},"72ad-614":{"id":"node_modules/@pixi/utils/lib/data/sign.mjs","moduleParts":{"dist/rapid.js":"72ad-615"},"imported":[],"importedBy":[{"uid":"72ad-562"}]},"72ad-616":{"id":"node_modules/@pixi/utils/lib/data/uid.mjs","moduleParts":{"dist/rapid.js":"72ad-617"},"imported":[],"importedBy":[{"uid":"72ad-562"}]},"72ad-618":{"id":"node_modules/@pixi/utils/lib/media/BoundingBox.mjs","moduleParts":{"dist/rapid.js":"72ad-619"},"imported":[],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-624"}]},"72ad-620":{"id":"node_modules/@pixi/utils/lib/media/caches.mjs","moduleParts":{"dist/rapid.js":"72ad-621"},"imported":[],"importedBy":[{"uid":"72ad-562"}]},"72ad-622":{"id":"node_modules/@pixi/utils/lib/media/CanvasRenderTarget.mjs","moduleParts":{"dist/rapid.js":"72ad-623"},"imported":[{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-624":{"id":"node_modules/@pixi/utils/lib/media/getCanvasBoundingBox.mjs","moduleParts":{"dist/rapid.js":"72ad-625"},"imported":[{"uid":"72ad-618"}],"importedBy":[{"uid":"72ad-562"},{"uid":"72ad-626"}]},"72ad-626":{"id":"node_modules/@pixi/utils/lib/media/trimCanvas.mjs","moduleParts":{"dist/rapid.js":"72ad-627"},"imported":[{"uid":"72ad-624"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-628":{"id":"node_modules/@pixi/utils/lib/network/decomposeDataUri.mjs","moduleParts":{"dist/rapid.js":"72ad-629"},"imported":[{"uid":"72ad-602"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-630":{"id":"node_modules/@pixi/utils/lib/network/determineCrossOrigin.mjs","moduleParts":{"dist/rapid.js":"72ad-631"},"imported":[{"uid":"72ad-578"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-632":{"id":"node_modules/@pixi/utils/lib/network/getResolutionOfUrl.mjs","moduleParts":{"dist/rapid.js":"72ad-633"},"imported":[{"uid":"72ad-576"},{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-562"}]},"72ad-634":{"id":"modules/behaviors/AbstractBehavior.js","moduleParts":{"dist/rapid.js":"72ad-635"},"imported":[{"uid":"72ad-562"}],"importedBy":[{"uid":"72ad-636"},{"uid":"72ad-638"},{"uid":"72ad-640"},{"uid":"72ad-642"},{"uid":"72ad-684"},{"uid":"72ad-686"},{"uid":"72ad-688"},{"uid":"72ad-690"},{"uid":"72ad-692"}]},"72ad-636":{"id":"modules/behaviors/DragBehavior.js","moduleParts":{"dist/rapid.js":"72ad-637"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-634"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-638":{"id":"modules/behaviors/DrawBehavior.js","moduleParts":{"dist/rapid.js":"72ad-639"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-634"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-640":{"id":"modules/behaviors/HoverBehavior.js","moduleParts":{"dist/rapid.js":"72ad-641"},"imported":[{"uid":"72ad-634"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-642":{"id":"modules/behaviors/KeyOperationBehavior.js","moduleParts":{"dist/rapid.js":"72ad-643"},"imported":[{"uid":"72ad-634"}],"importedBy":[{"uid":"72ad-560"},{"uid":"72ad-646"},{"uid":"72ad-648"},{"uid":"72ad-650"},{"uid":"72ad-654"},{"uid":"72ad-656"},{"uid":"72ad-658"},{"uid":"72ad-660"},{"uid":"72ad-662"},{"uid":"72ad-664"},{"uid":"72ad-666"},{"uid":"72ad-668"},{"uid":"72ad-672"},{"uid":"72ad-674"},{"uid":"72ad-676"},{"uid":"72ad-678"},{"uid":"72ad-680"}]},"72ad-644":{"id":"modules/operations/index.js","moduleParts":{"dist/rapid.js":"72ad-645"},"imported":[{"uid":"72ad-646"},{"uid":"72ad-648"},{"uid":"72ad-650"},{"uid":"72ad-654"},{"uid":"72ad-656"},{"uid":"72ad-658"},{"uid":"72ad-660"},{"uid":"72ad-662"},{"uid":"72ad-664"},{"uid":"72ad-666"},{"uid":"72ad-668"},{"uid":"72ad-670"},{"uid":"72ad-672"},{"uid":"72ad-674"},{"uid":"72ad-676"},{"uid":"72ad-678"},{"uid":"72ad-680"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-682"},{"uid":"72ad-2158"}]},"72ad-646":{"id":"modules/operations/circularize.js","moduleParts":{"dist/rapid.js":"72ad-647"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-446"},{"uid":"72ad-642"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-648":{"id":"modules/operations/continue.js","moduleParts":{"dist/rapid.js":"72ad-649"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-642"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-650":{"id":"modules/operations/cycle_highway_tag.js","moduleParts":{"dist/rapid.js":"72ad-651"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-110"},{"uid":"72ad-536"},{"uid":"72ad-642"},{"uid":"72ad-682"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-652":{"id":"modules/ui/cmd.js","moduleParts":{"dist/rapid.js":"72ad-653"},"imported":[{"uid":"72ad-414"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1780"},{"uid":"72ad-682"},{"uid":"72ad-654"},{"uid":"72ad-656"},{"uid":"72ad-660"},{"uid":"72ad-670"},{"uid":"72ad-2080"},{"uid":"72ad-2106"},{"uid":"72ad-1892"},{"uid":"72ad-1896"},{"uid":"72ad-1940"},{"uid":"72ad-1958"},{"uid":"72ad-2040"},{"uid":"72ad-2072"},{"uid":"72ad-1908"},{"uid":"72ad-2060"},{"uid":"72ad-2064"},{"uid":"72ad-2066"}]},"72ad-654":{"id":"modules/operations/copy.js","moduleParts":{"dist/rapid.js":"72ad-655"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-642"},{"uid":"72ad-652"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-656":{"id":"modules/operations/delete.js","moduleParts":{"dist/rapid.js":"72ad-657"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-450"},{"uid":"72ad-642"},{"uid":"72ad-682"},{"uid":"72ad-652"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-644"},{"uid":"72ad-1942"},{"uid":"72ad-2136"},{"uid":"72ad-2152"}]},"72ad-658":{"id":"modules/operations/disconnect.js","moduleParts":{"dist/rapid.js":"72ad-659"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-464"},{"uid":"72ad-642"},{"uid":"72ad-418"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-660":{"id":"modules/operations/downgrade.js","moduleParts":{"dist/rapid.js":"72ad-661"},"imported":[{"uid":"72ad-442"},{"uid":"72ad-642"},{"uid":"72ad-682"},{"uid":"72ad-652"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-662":{"id":"modules/operations/extract.js","moduleParts":{"dist/rapid.js":"72ad-663"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-466"},{"uid":"72ad-530"},{"uid":"72ad-642"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-664":{"id":"modules/operations/merge.js","moduleParts":{"dist/rapid.js":"72ad-665"},"imported":[{"uid":"72ad-468"},{"uid":"72ad-470"},{"uid":"72ad-472"},{"uid":"72ad-518"},{"uid":"72ad-642"},{"uid":"72ad-682"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-666":{"id":"modules/operations/move.js","moduleParts":{"dist/rapid.js":"72ad-667"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-642"},{"uid":"72ad-418"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-668":{"id":"modules/operations/orthogonalize.js","moduleParts":{"dist/rapid.js":"72ad-669"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-538"},{"uid":"72ad-642"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-670":{"id":"modules/operations/paste.js","moduleParts":{"dist/rapid.js":"72ad-671"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-458"},{"uid":"72ad-530"},{"uid":"72ad-682"},{"uid":"72ad-652"}],"importedBy":[{"uid":"72ad-644"},{"uid":"72ad-1992"}]},"72ad-672":{"id":"modules/operations/reflect.js","moduleParts":{"dist/rapid.js":"72ad-673"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-554"},{"uid":"72ad-642"},{"uid":"72ad-418"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-674":{"id":"modules/operations/reverse.js","moduleParts":{"dist/rapid.js":"72ad-675"},"imported":[{"uid":"72ad-114"},{"uid":"72ad-642"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-676":{"id":"modules/operations/rotate.js","moduleParts":{"dist/rapid.js":"72ad-677"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-642"},{"uid":"72ad-418"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-678":{"id":"modules/operations/split.js","moduleParts":{"dist/rapid.js":"72ad-679"},"imported":[{"uid":"72ad-484"},{"uid":"72ad-642"},{"uid":"72ad-682"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-680":{"id":"modules/operations/straighten.js","moduleParts":{"dist/rapid.js":"72ad-681"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-548"},{"uid":"72ad-550"},{"uid":"72ad-642"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-644"}]},"72ad-682":{"id":"modules/modes/select.js","moduleParts":{"dist/rapid.js":"72ad-683"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-434"},{"uid":"72ad-452"},{"uid":"72ad-526"},{"uid":"72ad-476"},{"uid":"72ad-644"},{"uid":"72ad-652"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1984"},{"uid":"72ad-684"},{"uid":"72ad-692"},{"uid":"72ad-2224"},{"uid":"72ad-2126"},{"uid":"72ad-2164"},{"uid":"72ad-1990"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-2000"},{"uid":"72ad-2002"},{"uid":"72ad-650"},{"uid":"72ad-656"},{"uid":"72ad-660"},{"uid":"72ad-664"},{"uid":"72ad-670"},{"uid":"72ad-678"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1888"},{"uid":"72ad-1892"},{"uid":"72ad-1902"},{"uid":"72ad-1950"},{"uid":"72ad-1970"},{"uid":"72ad-2134"},{"uid":"72ad-2148"},{"uid":"72ad-1916"},{"uid":"72ad-1918"},{"uid":"72ad-1920"},{"uid":"72ad-1922"},{"uid":"72ad-1926"}]},"72ad-684":{"id":"modules/behaviors/LassoBehavior.js","moduleParts":{"dist/rapid.js":"72ad-685"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-682"},{"uid":"72ad-634"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-686":{"id":"modules/behaviors/MapInteractionBehavior.js","moduleParts":{"dist/rapid.js":"72ad-687"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-634"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-688":{"id":"modules/behaviors/MapNudgingBehavior.js","moduleParts":{"dist/rapid.js":"72ad-689"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-634"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-690":{"id":"modules/behaviors/PasteBehavior.js","moduleParts":{"dist/rapid.js":"72ad-691"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-634"},{"uid":"72ad-458"},{"uid":"72ad-530"},{"uid":"72ad-414"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-692":{"id":"modules/behaviors/SelectBehavior.js","moduleParts":{"dist/rapid.js":"72ad-693"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-634"},{"uid":"72ad-682"},{"uid":"72ad-476"},{"uid":"72ad-434"},{"uid":"72ad-444"},{"uid":"72ad-428"},{"uid":"72ad-526"}],"importedBy":[{"uid":"72ad-560"}]},"72ad-694":{"id":"modules/core/index.js","moduleParts":{"dist/rapid.js":"72ad-695"},"imported":[{"uid":"72ad-490"},{"uid":"72ad-2224"},{"uid":"72ad-724"},{"uid":"72ad-732"},{"uid":"72ad-734"},{"uid":"72ad-736"},{"uid":"72ad-738"},{"uid":"72ad-744"},{"uid":"72ad-1780"},{"uid":"72ad-1782"},{"uid":"72ad-1784"},{"uid":"72ad-1824"},{"uid":"72ad-1826"},{"uid":"72ad-1828"},{"uid":"72ad-2122"},{"uid":"72ad-2124"},{"uid":"72ad-2126"},{"uid":"72ad-2164"}],"importedBy":[{"uid":"72ad-106"}]},"72ad-696":{"id":"node_modules/lodash-es/isObject.js","moduleParts":{"dist/rapid.js":"72ad-697"},"imported":[],"importedBy":[{"uid":"72ad-722"},{"uid":"72ad-1834"},{"uid":"72ad-720"}]},"72ad-698":{"id":"node_modules/lodash-es/_freeGlobal.js","moduleParts":{"dist/rapid.js":"72ad-699"},"imported":[],"importedBy":[{"uid":"72ad-700"}]},"72ad-700":{"id":"node_modules/lodash-es/_root.js","moduleParts":{"dist/rapid.js":"72ad-701"},"imported":[{"uid":"72ad-698"}],"importedBy":[{"uid":"72ad-702"},{"uid":"72ad-708"}]},"72ad-702":{"id":"node_modules/lodash-es/now.js","moduleParts":{"dist/rapid.js":"72ad-703"},"imported":[{"uid":"72ad-700"}],"importedBy":[{"uid":"72ad-722"}]},"72ad-704":{"id":"node_modules/lodash-es/_trimmedEndIndex.js","moduleParts":{"dist/rapid.js":"72ad-705"},"imported":[],"importedBy":[{"uid":"72ad-706"}]},"72ad-706":{"id":"node_modules/lodash-es/_baseTrim.js","moduleParts":{"dist/rapid.js":"72ad-707"},"imported":[{"uid":"72ad-704"}],"importedBy":[{"uid":"72ad-720"}]},"72ad-708":{"id":"node_modules/lodash-es/_Symbol.js","moduleParts":{"dist/rapid.js":"72ad-709"},"imported":[{"uid":"72ad-700"}],"importedBy":[{"uid":"72ad-714"},{"uid":"72ad-710"}]},"72ad-710":{"id":"node_modules/lodash-es/_getRawTag.js","moduleParts":{"dist/rapid.js":"72ad-711"},"imported":[{"uid":"72ad-708"}],"importedBy":[{"uid":"72ad-714"}]},"72ad-712":{"id":"node_modules/lodash-es/_objectToString.js","moduleParts":{"dist/rapid.js":"72ad-713"},"imported":[],"importedBy":[{"uid":"72ad-714"}]},"72ad-714":{"id":"node_modules/lodash-es/_baseGetTag.js","moduleParts":{"dist/rapid.js":"72ad-715"},"imported":[{"uid":"72ad-708"},{"uid":"72ad-710"},{"uid":"72ad-712"}],"importedBy":[{"uid":"72ad-718"}]},"72ad-716":{"id":"node_modules/lodash-es/isObjectLike.js","moduleParts":{"dist/rapid.js":"72ad-717"},"imported":[],"importedBy":[{"uid":"72ad-718"}]},"72ad-718":{"id":"node_modules/lodash-es/isSymbol.js","moduleParts":{"dist/rapid.js":"72ad-719"},"imported":[{"uid":"72ad-714"},{"uid":"72ad-716"}],"importedBy":[{"uid":"72ad-720"}]},"72ad-720":{"id":"node_modules/lodash-es/toNumber.js","moduleParts":{"dist/rapid.js":"72ad-721"},"imported":[{"uid":"72ad-706"},{"uid":"72ad-696"},{"uid":"72ad-718"}],"importedBy":[{"uid":"72ad-722"}]},"72ad-722":{"id":"node_modules/lodash-es/debounce.js","moduleParts":{"dist/rapid.js":"72ad-723"},"imported":[{"uid":"72ad-696"},{"uid":"72ad-702"},{"uid":"72ad-720"}],"importedBy":[{"uid":"72ad-2224"},{"uid":"72ad-2202"},{"uid":"72ad-2208"},{"uid":"72ad-1932"},{"uid":"72ad-1936"},{"uid":"72ad-2080"},{"uid":"72ad-2086"},{"uid":"72ad-2094"},{"uid":"72ad-2100"},{"uid":"72ad-1862"},{"uid":"72ad-1942"},{"uid":"72ad-1834"},{"uid":"72ad-2056"},{"uid":"72ad-2058"},{"uid":"72ad-2064"},{"uid":"72ad-2066"}]},"72ad-724":{"id":"modules/core/DataLoaderSystem.js","moduleParts":{"dist/rapid.js":"72ad-725"},"imported":[],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-726":{"id":"modules/ui/icon.js","moduleParts":{"dist/rapid.js":"72ad-727"},"imported":[],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1786"},{"uid":"72ad-1794"},{"uid":"72ad-1808"},{"uid":"72ad-1820"},{"uid":"72ad-1822"},{"uid":"72ad-1934"},{"uid":"72ad-2092"},{"uid":"72ad-2076"},{"uid":"72ad-2080"},{"uid":"72ad-2082"},{"uid":"72ad-1852"},{"uid":"72ad-2106"},{"uid":"72ad-1874"},{"uid":"72ad-2116"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1888"},{"uid":"72ad-2094"},{"uid":"72ad-2100"},{"uid":"72ad-1830"},{"uid":"72ad-1840"},{"uid":"72ad-1842"},{"uid":"72ad-1854"},{"uid":"72ad-1860"},{"uid":"72ad-1862"},{"uid":"72ad-1866"},{"uid":"72ad-1864"},{"uid":"72ad-1848"},{"uid":"72ad-1870"},{"uid":"72ad-1872"},{"uid":"72ad-1892"},{"uid":"72ad-1814"},{"uid":"72ad-1898"},{"uid":"72ad-1900"},{"uid":"72ad-1906"},{"uid":"72ad-1928"},{"uid":"72ad-1940"},{"uid":"72ad-1948"},{"uid":"72ad-1956"},{"uid":"72ad-1952"},{"uid":"72ad-728"},{"uid":"72ad-1962"},{"uid":"72ad-1968"},{"uid":"72ad-1964"},{"uid":"72ad-1966"},{"uid":"72ad-1976"},{"uid":"72ad-1978"},{"uid":"72ad-1980"},{"uid":"72ad-1876"},{"uid":"72ad-1942"},{"uid":"72ad-1982"},{"uid":"72ad-2022"},{"uid":"72ad-2028"},{"uid":"72ad-2026"},{"uid":"72ad-2040"},{"uid":"72ad-2050"},{"uid":"72ad-2010"},{"uid":"72ad-1812"},{"uid":"72ad-2070"},{"uid":"72ad-1954"},{"uid":"72ad-1944"},{"uid":"72ad-1974"},{"uid":"72ad-2072"},{"uid":"72ad-2074"},{"uid":"72ad-2052"},{"uid":"72ad-2056"},{"uid":"72ad-2058"},{"uid":"72ad-2060"},{"uid":"72ad-2062"},{"uid":"72ad-2064"}]},"72ad-728":{"id":"modules/ui/modal.js","moduleParts":{"dist/rapid.js":"72ad-729"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1858"},{"uid":"72ad-730"},{"uid":"72ad-2028"},{"uid":"72ad-2020"},{"uid":"72ad-2030"},{"uid":"72ad-2018"},{"uid":"72ad-2034"},{"uid":"72ad-2036"},{"uid":"72ad-2040"},{"uid":"72ad-2048"},{"uid":"72ad-1924"}]},"72ad-730":{"id":"modules/ui/loading.js","moduleParts":{"dist/rapid.js":"72ad-731"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-728"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-732"},{"uid":"72ad-2012"},{"uid":"72ad-1898"}]},"72ad-732":{"id":"modules/core/EditSystem.js","moduleParts":{"dist/rapid.js":"72ad-733"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-386"},{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-490"},{"uid":"72ad-410"},{"uid":"72ad-730"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-734":{"id":"modules/core/FilterSystem.js","moduleParts":{"dist/rapid.js":"72ad-735"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-112"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-736":{"id":"modules/core/ImagerySystem.js","moduleParts":{"dist/rapid.js":"72ad-737"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-408"},{"uid":"72ad-30"},{"uid":"72ad-502"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-738":{"id":"modules/core/LocalizationSystem.js","moduleParts":{"dist/rapid.js":"72ad-739"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-414"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-740":{"id":"node_modules/@rapideditor/country-coder/dist/country-coder.mjs","moduleParts":{"dist/rapid.js":"72ad-741"},"imported":[{"uid":"72ad-30"}],"importedBy":[{"uid":"72ad-1792"},{"uid":"72ad-1794"},{"uid":"72ad-1798"},{"uid":"72ad-1808"},{"uid":"72ad-1810"},{"uid":"72ad-742"}]},"72ad-742":{"id":"node_modules/@rapideditor/location-conflation/index.mjs","moduleParts":{"dist/rapid.js":"72ad-743"},"imported":[{"uid":"72ad-740"},{"uid":"72ad-34"},{"uid":"72ad-48"},{"uid":"72ad-50"},{"uid":"72ad-52"},{"uid":"72ad-54"}],"importedBy":[{"uid":"72ad-744"}]},"72ad-744":{"id":"modules/core/LocationSystem.js","moduleParts":{"dist/rapid.js":"72ad-745"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-742"},{"uid":"72ad-30"},{"uid":"72ad-34"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-746":{"id":"node_modules/@pixi/core/node_modules/@pixi/color/lib/Color.mjs","moduleParts":{"dist/rapid.js":"72ad-747"},"imported":[{"uid":"72ad-588"},{"uid":"72ad-590"}],"importedBy":[{"uid":"72ad-748"}]},"72ad-748":{"id":"node_modules/@pixi/core/node_modules/@pixi/color/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-749"},"imported":[{"uid":"72ad-746"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-862"},{"uid":"72ad-854"},{"uid":"72ad-874"},{"uid":"72ad-926"}]},"72ad-750":{"id":"node_modules/@pixi/extensions/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-751"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-976"},{"uid":"72ad-862"},{"uid":"72ad-854"},{"uid":"72ad-866"},{"uid":"72ad-868"},{"uid":"72ad-894"},{"uid":"72ad-898"},{"uid":"72ad-984"},{"uid":"72ad-988"},{"uid":"72ad-900"},{"uid":"72ad-912"},{"uid":"72ad-916"},{"uid":"72ad-918"},{"uid":"72ad-920"},{"uid":"72ad-922"},{"uid":"72ad-990"},{"uid":"72ad-992"},{"uid":"72ad-924"},{"uid":"72ad-926"},{"uid":"72ad-938"},{"uid":"72ad-940"},{"uid":"72ad-944"},{"uid":"72ad-948"},{"uid":"72ad-954"},{"uid":"72ad-956"},{"uid":"72ad-958"},{"uid":"72ad-974"}]},"72ad-752":{"id":"node_modules/@pixi/core/lib/geometry/ViewableBuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-753"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"}]},"72ad-754":{"id":"node_modules/@pixi/core/lib/shader/utils/checkMaxIfStatementsInShader.mjs","moduleParts":{"dist/rapid.js":"72ad-755"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"},{"uid":"72ad-810"}]},"72ad-756":{"id":"node_modules/@pixi/core/lib/state/State.mjs","moduleParts":{"dist/rapid.js":"72ad-757"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"},{"uid":"72ad-860"},{"uid":"72ad-944"}]},"72ad-758":{"id":"node_modules/@pixi/core/lib/textures/resources/autoDetectResource.mjs","moduleParts":{"dist/rapid.js":"72ad-759"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-768"},{"uid":"72ad-998"},{"uid":"72ad-994"}]},"72ad-760":{"id":"node_modules/@pixi/runner/lib/Runner.mjs","moduleParts":{"dist/rapid.js":"72ad-761"},"imported":[],"importedBy":[{"uid":"72ad-762"}]},"72ad-762":{"id":"node_modules/@pixi/runner/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-763"},"imported":[{"uid":"72ad-760"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-872"},{"uid":"72ad-772"},{"uid":"72ad-778"},{"uid":"72ad-838"},{"uid":"72ad-2659"},{"uid":"72ad-946"},{"uid":"72ad-764"}]},"72ad-764":{"id":"node_modules/@pixi/core/lib/textures/resources/Resource.mjs","moduleParts":{"dist/rapid.js":"72ad-765"},"imported":[{"uid":"72ad-762"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-768"},{"uid":"72ad-998"},{"uid":"72ad-876"},{"uid":"72ad-994"},{"uid":"72ad-766"}]},"72ad-766":{"id":"node_modules/@pixi/core/lib/textures/resources/BufferResource.mjs","moduleParts":{"dist/rapid.js":"72ad-767"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-764"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-768"},{"uid":"72ad-998"},{"uid":"72ad-870"}]},"72ad-768":{"id":"node_modules/@pixi/core/lib/textures/BaseTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-769"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-566"},{"uid":"72ad-562"},{"uid":"72ad-758"},{"uid":"72ad-766"},{"uid":"72ad-764"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-854"},{"uid":"72ad-872"},{"uid":"72ad-874"},{"uid":"72ad-882"},{"uid":"72ad-954"},{"uid":"72ad-994"}]},"72ad-770":{"id":"node_modules/@pixi/core/lib/batch/BatchDrawCall.mjs","moduleParts":{"dist/rapid.js":"72ad-771"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"}]},"72ad-772":{"id":"node_modules/@pixi/core/lib/geometry/Buffer.mjs","moduleParts":{"dist/rapid.js":"72ad-773"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-762"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-780"},{"uid":"72ad-778"},{"uid":"72ad-836"},{"uid":"72ad-890"}]},"72ad-774":{"id":"node_modules/@pixi/core/lib/geometry/Attribute.mjs","moduleParts":{"dist/rapid.js":"72ad-775"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-778"}]},"72ad-776":{"id":"node_modules/@pixi/core/lib/geometry/utils/interleaveTypedArrays.mjs","moduleParts":{"dist/rapid.js":"72ad-777"},"imported":[{"uid":"72ad-562"}],"importedBy":[{"uid":"72ad-778"}]},"72ad-778":{"id":"node_modules/@pixi/core/lib/geometry/Geometry.mjs","moduleParts":{"dist/rapid.js":"72ad-779"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-762"},{"uid":"72ad-562"},{"uid":"72ad-774"},{"uid":"72ad-772"},{"uid":"72ad-776"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-780"},{"uid":"72ad-888"},{"uid":"72ad-890"}]},"72ad-780":{"id":"node_modules/@pixi/core/lib/batch/BatchGeometry.mjs","moduleParts":{"dist/rapid.js":"72ad-781"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-772"},{"uid":"72ad-778"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"}]},"72ad-782":{"id":"node_modules/@pixi/math/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-783"},"imported":[],"importedBy":[{"uid":"72ad-790"},{"uid":"72ad-788"},{"uid":"72ad-792"},{"uid":"72ad-794"},{"uid":"72ad-786"},{"uid":"72ad-796"},{"uid":"72ad-798"}]},"72ad-784":{"id":"node_modules/@pixi/math/lib/Point.mjs","moduleParts":{"dist/rapid.js":"72ad-785"},"imported":[],"importedBy":[{"uid":"72ad-790"},{"uid":"72ad-786"},{"uid":"72ad-798"}]},"72ad-786":{"id":"node_modules/@pixi/math/lib/shapes/Rectangle.mjs","moduleParts":{"dist/rapid.js":"72ad-787"},"imported":[{"uid":"72ad-782"},{"uid":"72ad-784"}],"importedBy":[{"uid":"72ad-790"},{"uid":"72ad-788"},{"uid":"72ad-792"}]},"72ad-788":{"id":"node_modules/@pixi/math/lib/shapes/Circle.mjs","moduleParts":{"dist/rapid.js":"72ad-789"},"imported":[{"uid":"72ad-782"},{"uid":"72ad-786"}],"importedBy":[{"uid":"72ad-790"}]},"72ad-790":{"id":"node_modules/@pixi/math/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-791"},"imported":[{"uid":"72ad-788"},{"uid":"72ad-792"},{"uid":"72ad-794"},{"uid":"72ad-786"},{"uid":"72ad-796"},{"uid":"72ad-800"},{"uid":"72ad-2677"},{"uid":"72ad-2678"},{"uid":"72ad-798"},{"uid":"72ad-802"},{"uid":"72ad-784"},{"uid":"72ad-804"},{"uid":"72ad-782"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-1772"},{"uid":"72ad-840"},{"uid":"72ad-892"},{"uid":"72ad-894"},{"uid":"72ad-908"},{"uid":"72ad-898"},{"uid":"72ad-916"},{"uid":"72ad-922"},{"uid":"72ad-992"},{"uid":"72ad-924"},{"uid":"72ad-926"},{"uid":"72ad-882"},{"uid":"72ad-902"},{"uid":"72ad-880"},{"uid":"72ad-958"}]},"72ad-792":{"id":"node_modules/@pixi/math/lib/shapes/Ellipse.mjs","moduleParts":{"dist/rapid.js":"72ad-793"},"imported":[{"uid":"72ad-782"},{"uid":"72ad-786"}],"importedBy":[{"uid":"72ad-790"}]},"72ad-794":{"id":"node_modules/@pixi/math/lib/shapes/Polygon.mjs","moduleParts":{"dist/rapid.js":"72ad-795"},"imported":[{"uid":"72ad-782"}],"importedBy":[{"uid":"72ad-790"}]},"72ad-796":{"id":"node_modules/@pixi/math/lib/shapes/RoundedRectangle.mjs","moduleParts":{"dist/rapid.js":"72ad-797"},"imported":[{"uid":"72ad-782"}],"importedBy":[{"uid":"72ad-790"}]},"72ad-798":{"id":"node_modules/@pixi/math/lib/Matrix.mjs","moduleParts":{"dist/rapid.js":"72ad-799"},"imported":[{"uid":"72ad-782"},{"uid":"72ad-784"}],"importedBy":[{"uid":"72ad-790"},{"uid":"72ad-800"},{"uid":"72ad-804"}]},"72ad-800":{"id":"node_modules/@pixi/math/lib/groupD8.mjs","moduleParts":{"dist/rapid.js":"72ad-801"},"imported":[{"uid":"72ad-798"}],"importedBy":[{"uid":"72ad-790"}]},"72ad-802":{"id":"node_modules/@pixi/math/lib/ObservablePoint.mjs","moduleParts":{"dist/rapid.js":"72ad-803"},"imported":[],"importedBy":[{"uid":"72ad-790"},{"uid":"72ad-804"}]},"72ad-804":{"id":"node_modules/@pixi/math/lib/Transform.mjs","moduleParts":{"dist/rapid.js":"72ad-805"},"imported":[{"uid":"72ad-798"},{"uid":"72ad-802"}],"importedBy":[{"uid":"72ad-790"}]},"72ad-806":{"id":"node_modules/@pixi/core/lib/shader/defaultProgram.mjs","moduleParts":{"dist/rapid.js":"72ad-807"},"imported":[],"importedBy":[{"uid":"72ad-834"}]},"72ad-808":{"id":"node_modules/@pixi/core/lib/shader/defaultProgram2.mjs","moduleParts":{"dist/rapid.js":"72ad-809"},"imported":[],"importedBy":[{"uid":"72ad-834"}]},"72ad-810":{"id":"node_modules/@pixi/core/lib/shader/utils/index.mjs","moduleParts":{"dist/rapid.js":"72ad-811"},"imported":[{"uid":"72ad-754"},{"uid":"72ad-812"},{"uid":"72ad-814"},{"uid":"72ad-818"},{"uid":"72ad-822"},{"uid":"72ad-820"},{"uid":"72ad-824"},{"uid":"72ad-826"},{"uid":"72ad-828"},{"uid":"72ad-830"},{"uid":"72ad-816"},{"uid":"72ad-832"}],"importedBy":[{"uid":"72ad-834"},{"uid":"72ad-938"},{"uid":"72ad-936"}]},"72ad-812":{"id":"node_modules/@pixi/core/lib/shader/utils/compileShader.mjs","moduleParts":{"dist/rapid.js":"72ad-813"},"imported":[],"importedBy":[{"uid":"72ad-934"},{"uid":"72ad-810"}]},"72ad-814":{"id":"node_modules/@pixi/core/lib/shader/utils/defaultValue.mjs","moduleParts":{"dist/rapid.js":"72ad-815"},"imported":[],"importedBy":[{"uid":"72ad-934"},{"uid":"72ad-810"},{"uid":"72ad-932"}]},"72ad-816":{"id":"node_modules/@pixi/core/lib/shader/utils/uniformParsers.mjs","moduleParts":{"dist/rapid.js":"72ad-817"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-936"},{"uid":"72ad-810"},{"uid":"72ad-818"}]},"72ad-818":{"id":"node_modules/@pixi/core/lib/shader/utils/generateUniformsSync.mjs","moduleParts":{"dist/rapid.js":"72ad-819"},"imported":[{"uid":"72ad-816"}],"importedBy":[{"uid":"72ad-938"},{"uid":"72ad-810"}]},"72ad-820":{"id":"node_modules/@pixi/core/lib/shader/utils/getTestContext.mjs","moduleParts":{"dist/rapid.js":"72ad-821"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-810"},{"uid":"72ad-822"}]},"72ad-822":{"id":"node_modules/@pixi/core/lib/shader/utils/getMaxFragmentPrecision.mjs","moduleParts":{"dist/rapid.js":"72ad-823"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-820"}],"importedBy":[{"uid":"72ad-834"},{"uid":"72ad-810"}]},"72ad-824":{"id":"node_modules/@pixi/core/lib/shader/utils/logProgramError.mjs","moduleParts":{"dist/rapid.js":"72ad-825"},"imported":[],"importedBy":[{"uid":"72ad-934"},{"uid":"72ad-810"}]},"72ad-826":{"id":"node_modules/@pixi/core/lib/shader/utils/mapSize.mjs","moduleParts":{"dist/rapid.js":"72ad-827"},"imported":[],"importedBy":[{"uid":"72ad-936"},{"uid":"72ad-810"},{"uid":"72ad-930"}]},"72ad-828":{"id":"node_modules/@pixi/core/lib/shader/utils/mapType.mjs","moduleParts":{"dist/rapid.js":"72ad-829"},"imported":[],"importedBy":[{"uid":"72ad-810"},{"uid":"72ad-930"},{"uid":"72ad-932"}]},"72ad-830":{"id":"node_modules/@pixi/core/lib/shader/utils/setPrecision.mjs","moduleParts":{"dist/rapid.js":"72ad-831"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-834"},{"uid":"72ad-810"}]},"72ad-832":{"id":"node_modules/@pixi/core/lib/shader/utils/unsafeEvalSupported.mjs","moduleParts":{"dist/rapid.js":"72ad-833"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-938"},{"uid":"72ad-810"}]},"72ad-834":{"id":"node_modules/@pixi/core/lib/shader/Program.mjs","moduleParts":{"dist/rapid.js":"72ad-835"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-562"},{"uid":"72ad-806"},{"uid":"72ad-808"},{"uid":"72ad-810"},{"uid":"72ad-830"},{"uid":"72ad-822"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-840"},{"uid":"72ad-860"},{"uid":"72ad-838"}]},"72ad-836":{"id":"node_modules/@pixi/core/lib/shader/UniformGroup.mjs","moduleParts":{"dist/rapid.js":"72ad-837"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-772"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-840"},{"uid":"72ad-894"},{"uid":"72ad-992"},{"uid":"72ad-838"}]},"72ad-838":{"id":"node_modules/@pixi/core/lib/shader/Shader.mjs","moduleParts":{"dist/rapid.js":"72ad-839"},"imported":[{"uid":"72ad-762"},{"uid":"72ad-834"},{"uid":"72ad-836"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-840"},{"uid":"72ad-860"}]},"72ad-840":{"id":"node_modules/@pixi/core/lib/batch/BatchShaderGenerator.mjs","moduleParts":{"dist/rapid.js":"72ad-841"},"imported":[{"uid":"72ad-790"},{"uid":"72ad-834"},{"uid":"72ad-838"},{"uid":"72ad-836"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"}]},"72ad-842":{"id":"node_modules/@pixi/core/lib/batch/BatchTextureArray.mjs","moduleParts":{"dist/rapid.js":"72ad-843"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"}]},"72ad-844":{"id":"node_modules/@pixi/core/lib/batch/canUploadSameBuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-845"},"imported":[{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-854"}]},"72ad-846":{"id":"node_modules/@pixi/core/lib/batch/maxRecommendedTextures.mjs","moduleParts":{"dist/rapid.js":"72ad-847"},"imported":[{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-854"}]},"72ad-848":{"id":"node_modules/@pixi/core/lib/batch/ObjectRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-849"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-854"},{"uid":"72ad-866"}]},"72ad-850":{"id":"node_modules/@pixi/core/lib/batch/texture.mjs","moduleParts":{"dist/rapid.js":"72ad-851"},"imported":[],"importedBy":[{"uid":"72ad-854"}]},"72ad-852":{"id":"node_modules/@pixi/core/lib/batch/texture2.mjs","moduleParts":{"dist/rapid.js":"72ad-853"},"imported":[],"importedBy":[{"uid":"72ad-854"}]},"72ad-854":{"id":"node_modules/@pixi/core/lib/batch/BatchRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-855"},"imported":[{"uid":"72ad-748"},{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-566"},{"uid":"72ad-562"},{"uid":"72ad-752"},{"uid":"72ad-754"},{"uid":"72ad-756"},{"uid":"72ad-768"},{"uid":"72ad-770"},{"uid":"72ad-780"},{"uid":"72ad-840"},{"uid":"72ad-842"},{"uid":"72ad-844"},{"uid":"72ad-846"},{"uid":"72ad-848"},{"uid":"72ad-850"},{"uid":"72ad-852"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"}]},"72ad-856":{"id":"node_modules/@pixi/core/lib/filters/defaultFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-857"},"imported":[],"importedBy":[{"uid":"72ad-860"}]},"72ad-858":{"id":"node_modules/@pixi/core/lib/filters/defaultFilter2.mjs","moduleParts":{"dist/rapid.js":"72ad-859"},"imported":[],"importedBy":[{"uid":"72ad-860"}]},"72ad-860":{"id":"node_modules/@pixi/core/lib/filters/Filter.mjs","moduleParts":{"dist/rapid.js":"72ad-861"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-834"},{"uid":"72ad-838"},{"uid":"72ad-756"},{"uid":"72ad-856"},{"uid":"72ad-858"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-908"},{"uid":"72ad-910"}]},"72ad-862":{"id":"node_modules/@pixi/core/lib/background/BackgroundSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-863"},"imported":[{"uid":"72ad-748"},{"uid":"72ad-750"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-864"}]},"72ad-864":{"id":"node_modules/@pixi/core/lib/systems.mjs","moduleParts":{"dist/rapid.js":"72ad-865"},"imported":[{"uid":"72ad-862"},{"uid":"72ad-866"},{"uid":"72ad-868"},{"uid":"72ad-894"},{"uid":"72ad-898"},{"uid":"72ad-900"},{"uid":"72ad-912"},{"uid":"72ad-916"},{"uid":"72ad-918"},{"uid":"72ad-920"},{"uid":"72ad-922"},{"uid":"72ad-924"},{"uid":"72ad-926"},{"uid":"72ad-938"},{"uid":"72ad-940"},{"uid":"72ad-944"},{"uid":"72ad-946"},{"uid":"72ad-948"},{"uid":"72ad-954"},{"uid":"72ad-956"},{"uid":"72ad-958"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"}]},"72ad-866":{"id":"node_modules/@pixi/core/lib/batch/BatchSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-867"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-848"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-868":{"id":"node_modules/@pixi/core/lib/context/ContextSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-869"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-864"}]},"72ad-870":{"id":"node_modules/@pixi/core/lib/textures/resources/DepthResource.mjs","moduleParts":{"dist/rapid.js":"72ad-871"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-766"}],"importedBy":[{"uid":"72ad-872"}]},"72ad-872":{"id":"node_modules/@pixi/core/lib/framebuffer/Framebuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-873"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-762"},{"uid":"72ad-768"},{"uid":"72ad-870"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-898"},{"uid":"72ad-874"}]},"72ad-874":{"id":"node_modules/@pixi/core/lib/renderTexture/BaseRenderTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-875"},"imported":[{"uid":"72ad-748"},{"uid":"72ad-598"},{"uid":"72ad-872"},{"uid":"72ad-768"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-884"},{"uid":"72ad-886"}]},"72ad-876":{"id":"node_modules/@pixi/core/lib/textures/resources/BaseImageResource.mjs","moduleParts":{"dist/rapid.js":"72ad-877"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-562"},{"uid":"72ad-764"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"},{"uid":"72ad-1000"},{"uid":"72ad-1004"},{"uid":"72ad-878"},{"uid":"72ad-1006"},{"uid":"72ad-1008"}]},"72ad-878":{"id":"node_modules/@pixi/core/lib/textures/resources/ImageResource.mjs","moduleParts":{"dist/rapid.js":"72ad-879"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-566"},{"uid":"72ad-876"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"},{"uid":"72ad-882"}]},"72ad-880":{"id":"node_modules/@pixi/core/lib/textures/TextureUvs.mjs","moduleParts":{"dist/rapid.js":"72ad-881"},"imported":[{"uid":"72ad-790"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-882"}]},"72ad-882":{"id":"node_modules/@pixi/core/lib/textures/Texture.mjs","moduleParts":{"dist/rapid.js":"72ad-883"},"imported":[{"uid":"72ad-790"},{"uid":"72ad-566"},{"uid":"72ad-562"},{"uid":"72ad-768"},{"uid":"72ad-878"},{"uid":"72ad-880"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-884"}]},"72ad-884":{"id":"node_modules/@pixi/core/lib/renderTexture/RenderTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-885"},"imported":[{"uid":"72ad-882"},{"uid":"72ad-874"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-924"},{"uid":"72ad-886"}]},"72ad-886":{"id":"node_modules/@pixi/core/lib/renderTexture/RenderTexturePool.mjs","moduleParts":{"dist/rapid.js":"72ad-887"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-562"},{"uid":"72ad-874"},{"uid":"72ad-884"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-894"}]},"72ad-888":{"id":"node_modules/@pixi/core/lib/utils/Quad.mjs","moduleParts":{"dist/rapid.js":"72ad-889"},"imported":[{"uid":"72ad-778"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-894"}]},"72ad-890":{"id":"node_modules/@pixi/core/lib/utils/QuadUv.mjs","moduleParts":{"dist/rapid.js":"72ad-891"},"imported":[{"uid":"72ad-772"},{"uid":"72ad-778"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-894"}]},"72ad-892":{"id":"node_modules/@pixi/core/lib/filters/FilterState.mjs","moduleParts":{"dist/rapid.js":"72ad-893"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-790"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-894"}]},"72ad-894":{"id":"node_modules/@pixi/core/lib/filters/FilterSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-895"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-790"},{"uid":"72ad-886"},{"uid":"72ad-836"},{"uid":"72ad-888"},{"uid":"72ad-890"},{"uid":"72ad-892"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-896":{"id":"node_modules/@pixi/core/lib/framebuffer/GLFramebuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-897"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-898"}]},"72ad-898":{"id":"node_modules/@pixi/core/lib/framebuffer/FramebufferSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-899"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-790"},{"uid":"72ad-566"},{"uid":"72ad-872"},{"uid":"72ad-896"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-900":{"id":"node_modules/@pixi/core/lib/geometry/GeometrySystem.mjs","moduleParts":{"dist/rapid.js":"72ad-901"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-902":{"id":"node_modules/@pixi/core/lib/textures/TextureMatrix.mjs","moduleParts":{"dist/rapid.js":"72ad-903"},"imported":[{"uid":"72ad-790"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-908"}]},"72ad-904":{"id":"node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter2.mjs","moduleParts":{"dist/rapid.js":"72ad-905"},"imported":[],"importedBy":[{"uid":"72ad-908"}]},"72ad-906":{"id":"node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter3.mjs","moduleParts":{"dist/rapid.js":"72ad-907"},"imported":[],"importedBy":[{"uid":"72ad-908"}]},"72ad-908":{"id":"node_modules/@pixi/core/lib/filters/spriteMask/SpriteMaskFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-909"},"imported":[{"uid":"72ad-790"},{"uid":"72ad-902"},{"uid":"72ad-860"},{"uid":"72ad-904"},{"uid":"72ad-906"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-912"}]},"72ad-910":{"id":"node_modules/@pixi/core/lib/mask/MaskData.mjs","moduleParts":{"dist/rapid.js":"72ad-911"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-860"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-912"}]},"72ad-912":{"id":"node_modules/@pixi/core/lib/mask/MaskSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-913"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-908"},{"uid":"72ad-910"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-914":{"id":"node_modules/@pixi/core/lib/mask/AbstractMaskSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-915"},"imported":[],"importedBy":[{"uid":"72ad-916"},{"uid":"72ad-918"}]},"72ad-916":{"id":"node_modules/@pixi/core/lib/mask/ScissorSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-917"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-790"},{"uid":"72ad-566"},{"uid":"72ad-914"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-918":{"id":"node_modules/@pixi/core/lib/mask/StencilSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-919"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-566"},{"uid":"72ad-914"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-920":{"id":"node_modules/@pixi/core/lib/plugin/PluginSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-921"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-562"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-922":{"id":"node_modules/@pixi/core/lib/projection/ProjectionSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-923"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-790"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-924":{"id":"node_modules/@pixi/core/lib/renderTexture/GenerateTextureSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-925"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-790"},{"uid":"72ad-884"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-926":{"id":"node_modules/@pixi/core/lib/renderTexture/RenderTextureSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-927"},"imported":[{"uid":"72ad-748"},{"uid":"72ad-750"},{"uid":"72ad-790"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-928":{"id":"node_modules/@pixi/core/lib/shader/GLProgram.mjs","moduleParts":{"dist/rapid.js":"72ad-929"},"imported":[],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-934"}]},"72ad-930":{"id":"node_modules/@pixi/core/lib/shader/utils/getAttributeData.mjs","moduleParts":{"dist/rapid.js":"72ad-931"},"imported":[{"uid":"72ad-826"},{"uid":"72ad-828"}],"importedBy":[{"uid":"72ad-934"}]},"72ad-932":{"id":"node_modules/@pixi/core/lib/shader/utils/getUniformData.mjs","moduleParts":{"dist/rapid.js":"72ad-933"},"imported":[{"uid":"72ad-814"},{"uid":"72ad-828"}],"importedBy":[{"uid":"72ad-934"}]},"72ad-934":{"id":"node_modules/@pixi/core/lib/shader/utils/generateProgram.mjs","moduleParts":{"dist/rapid.js":"72ad-935"},"imported":[{"uid":"72ad-928"},{"uid":"72ad-812"},{"uid":"72ad-814"},{"uid":"72ad-930"},{"uid":"72ad-932"},{"uid":"72ad-824"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-938"}]},"72ad-936":{"id":"node_modules/@pixi/core/lib/shader/utils/generateUniformBufferSync.mjs","moduleParts":{"dist/rapid.js":"72ad-937"},"imported":[{"uid":"72ad-810"},{"uid":"72ad-816"},{"uid":"72ad-826"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-938"}]},"72ad-938":{"id":"node_modules/@pixi/core/lib/shader/ShaderSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-939"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-810"},{"uid":"72ad-934"},{"uid":"72ad-936"},{"uid":"72ad-832"},{"uid":"72ad-818"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-940":{"id":"node_modules/@pixi/core/lib/startup/StartupSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-941"},"imported":[{"uid":"72ad-750"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-864"}]},"72ad-942":{"id":"node_modules/@pixi/core/lib/state/utils/mapWebGLBlendModesToPixi.mjs","moduleParts":{"dist/rapid.js":"72ad-943"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-944"}]},"72ad-944":{"id":"node_modules/@pixi/core/lib/state/StateSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-945"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-756"},{"uid":"72ad-942"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-946":{"id":"node_modules/@pixi/core/lib/system/SystemManager.mjs","moduleParts":{"dist/rapid.js":"72ad-947"},"imported":[{"uid":"72ad-762"},{"uid":"72ad-562"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-992"},{"uid":"72ad-864"}]},"72ad-948":{"id":"node_modules/@pixi/core/lib/textures/TextureGCSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-949"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-864"}]},"72ad-950":{"id":"node_modules/@pixi/core/lib/textures/GLTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-951"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-954"}]},"72ad-952":{"id":"node_modules/@pixi/core/lib/textures/utils/mapTypeAndFormatToInternalFormat.mjs","moduleParts":{"dist/rapid.js":"72ad-953"},"imported":[{"uid":"72ad-598"}],"importedBy":[{"uid":"72ad-954"}]},"72ad-954":{"id":"node_modules/@pixi/core/lib/textures/TextureSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-955"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-562"},{"uid":"72ad-768"},{"uid":"72ad-950"},{"uid":"72ad-952"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-956":{"id":"node_modules/@pixi/core/lib/transformFeedback/TransformFeedbackSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-957"},"imported":[{"uid":"72ad-750"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-864"}]},"72ad-958":{"id":"node_modules/@pixi/core/lib/view/ViewSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-959"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-790"},{"uid":"72ad-566"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-960"},{"uid":"72ad-864"}]},"72ad-960":{"id":"node_modules/@pixi/core/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-961"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-566"},{"uid":"72ad-562"},{"uid":"72ad-854"},{"uid":"72ad-860"},{"uid":"72ad-834"},{"uid":"72ad-864"},{"uid":"72ad-768"},{"uid":"72ad-868"},{"uid":"72ad-862"},{"uid":"72ad-958"},{"uid":"72ad-940"},{"uid":"72ad-948"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-962":{"id":"node_modules/@pixi/core/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-963"},"imported":[{"uid":"72ad-960"},{"uid":"72ad-748"},{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-790"},{"uid":"72ad-762"},{"uid":"72ad-566"},{"uid":"72ad-972"},{"uid":"72ad-562"},{"uid":"72ad-976"},{"uid":"72ad-862"},{"uid":"72ad-770"},{"uid":"72ad-780"},{"uid":"72ad-854"},{"uid":"72ad-840"},{"uid":"72ad-866"},{"uid":"72ad-842"},{"uid":"72ad-848"},{"uid":"72ad-868"},{"uid":"72ad-860"},{"uid":"72ad-892"},{"uid":"72ad-894"},{"uid":"72ad-2656"},{"uid":"72ad-908"},{"uid":"72ad-982"},{"uid":"72ad-872"},{"uid":"72ad-898"},{"uid":"72ad-896"},{"uid":"72ad-984"},{"uid":"72ad-774"},{"uid":"72ad-772"},{"uid":"72ad-988"},{"uid":"72ad-778"},{"uid":"72ad-900"},{"uid":"72ad-752"},{"uid":"72ad-2657"},{"uid":"72ad-910"},{"uid":"72ad-912"},{"uid":"72ad-916"},{"uid":"72ad-918"},{"uid":"72ad-920"},{"uid":"72ad-922"},{"uid":"72ad-990"},{"uid":"72ad-992"},{"uid":"72ad-874"},{"uid":"72ad-924"},{"uid":"72ad-884"},{"uid":"72ad-886"},{"uid":"72ad-926"},{"uid":"72ad-928"},{"uid":"72ad-834"},{"uid":"72ad-838"},{"uid":"72ad-938"},{"uid":"72ad-836"},{"uid":"72ad-754"},{"uid":"72ad-934"},{"uid":"72ad-936"},{"uid":"72ad-820"},{"uid":"72ad-816"},{"uid":"72ad-832"},{"uid":"72ad-940"},{"uid":"72ad-756"},{"uid":"72ad-944"},{"uid":"72ad-2658"},{"uid":"72ad-864"},{"uid":"72ad-768"},{"uid":"72ad-950"},{"uid":"72ad-998"},{"uid":"72ad-882"},{"uid":"72ad-948"},{"uid":"72ad-902"},{"uid":"72ad-954"},{"uid":"72ad-880"},{"uid":"72ad-2659"},{"uid":"72ad-956"},{"uid":"72ad-888"},{"uid":"72ad-890"},{"uid":"72ad-958"},{"uid":"72ad-946"},{"uid":"72ad-876"},{"uid":"72ad-764"},{"uid":"72ad-994"},{"uid":"72ad-996"},{"uid":"72ad-758"},{"uid":"72ad-766"},{"uid":"72ad-1000"},{"uid":"72ad-1002"},{"uid":"72ad-1004"},{"uid":"72ad-878"},{"uid":"72ad-1006"},{"uid":"72ad-1008"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1024"},{"uid":"72ad-1028"},{"uid":"72ad-1074"},{"uid":"72ad-1772"},{"uid":"72ad-1098"},{"uid":"72ad-1102"},{"uid":"72ad-1106"},{"uid":"72ad-1108"},{"uid":"72ad-1154"},{"uid":"72ad-1126"},{"uid":"72ad-1160"},{"uid":"72ad-1164"},{"uid":"72ad-1168"},{"uid":"72ad-1170"},{"uid":"72ad-1134"},{"uid":"72ad-1136"},{"uid":"72ad-1138"},{"uid":"72ad-1146"},{"uid":"72ad-1144"},{"uid":"72ad-1142"},{"uid":"72ad-1172"},{"uid":"72ad-1116"},{"uid":"72ad-1180"},{"uid":"72ad-1196"},{"uid":"72ad-1198"},{"uid":"72ad-1200"},{"uid":"72ad-1194"},{"uid":"72ad-1184"},{"uid":"72ad-1010"},{"uid":"72ad-1012"},{"uid":"72ad-1016"},{"uid":"72ad-1014"},{"uid":"72ad-1088"},{"uid":"72ad-1092"},{"uid":"72ad-1080"},{"uid":"72ad-1094"},{"uid":"72ad-1082"},{"uid":"72ad-1202"},{"uid":"72ad-1032"},{"uid":"72ad-1042"},{"uid":"72ad-1040"},{"uid":"72ad-1048"},{"uid":"72ad-1056"},{"uid":"72ad-1064"},{"uid":"72ad-1070"},{"uid":"72ad-1208"},{"uid":"72ad-1238"},{"uid":"72ad-1232"},{"uid":"72ad-1234"},{"uid":"72ad-1210"},{"uid":"72ad-1206"},{"uid":"72ad-1224"},{"uid":"72ad-1218"},{"uid":"72ad-1242"},{"uid":"72ad-1246"},{"uid":"72ad-1252"},{"uid":"72ad-2662"},{"uid":"72ad-2663"},{"uid":"72ad-2664"},{"uid":"72ad-1258"},{"uid":"72ad-1260"},{"uid":"72ad-1270"},{"uid":"72ad-1272"},{"uid":"72ad-1286"},{"uid":"72ad-1290"},{"uid":"72ad-1020"},{"uid":"72ad-2666"},{"uid":"72ad-1294"},{"uid":"72ad-1308"},{"uid":"72ad-1310"},{"uid":"72ad-1314"},{"uid":"72ad-1282"},{"uid":"72ad-1278"},{"uid":"72ad-1280"},{"uid":"72ad-1338"},{"uid":"72ad-1346"},{"uid":"72ad-1348"},{"uid":"72ad-1324"},{"uid":"72ad-1352"},{"uid":"72ad-1350"},{"uid":"72ad-1358"},{"uid":"72ad-1364"},{"uid":"72ad-1366"},{"uid":"72ad-1368"},{"uid":"72ad-1660"},{"uid":"72ad-1662"},{"uid":"72ad-1664"},{"uid":"72ad-1666"},{"uid":"72ad-1668"},{"uid":"72ad-1670"},{"uid":"72ad-1672"},{"uid":"72ad-1674"},{"uid":"72ad-1676"},{"uid":"72ad-1678"},{"uid":"72ad-1680"},{"uid":"72ad-1682"},{"uid":"72ad-1684"},{"uid":"72ad-1686"},{"uid":"72ad-1688"},{"uid":"72ad-1690"},{"uid":"72ad-1362"},{"uid":"72ad-1692"},{"uid":"72ad-1694"},{"uid":"72ad-1696"},{"uid":"72ad-1698"},{"uid":"72ad-1700"},{"uid":"72ad-1702"},{"uid":"72ad-1704"},{"uid":"72ad-1706"},{"uid":"72ad-1708"},{"uid":"72ad-1710"},{"uid":"72ad-1712"},{"uid":"72ad-1714"},{"uid":"72ad-1716"},{"uid":"72ad-1722"},{"uid":"72ad-1128"},{"uid":"72ad-1152"},{"uid":"72ad-1078"},{"uid":"72ad-1264"},{"uid":"72ad-1328"}]},"72ad-964":{"id":"node_modules/@pixi/ticker/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-965"},"imported":[{"uid":"72ad-566"},{"uid":"72ad-562"},{"uid":"72ad-970"}],"importedBy":[{"uid":"72ad-972"}]},"72ad-966":{"id":"node_modules/@pixi/ticker/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-967"},"imported":[],"importedBy":[{"uid":"72ad-972"},{"uid":"72ad-970"},{"uid":"72ad-974"}]},"72ad-968":{"id":"node_modules/@pixi/ticker/lib/TickerListener.mjs","moduleParts":{"dist/rapid.js":"72ad-969"},"imported":[],"importedBy":[{"uid":"72ad-970"}]},"72ad-970":{"id":"node_modules/@pixi/ticker/lib/Ticker.mjs","moduleParts":{"dist/rapid.js":"72ad-971"},"imported":[{"uid":"72ad-966"},{"uid":"72ad-968"}],"importedBy":[{"uid":"72ad-972"},{"uid":"72ad-964"},{"uid":"72ad-974"}]},"72ad-972":{"id":"node_modules/@pixi/ticker/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-973"},"imported":[{"uid":"72ad-964"},{"uid":"72ad-966"},{"uid":"72ad-970"},{"uid":"72ad-974"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-1008"}]},"72ad-974":{"id":"node_modules/@pixi/ticker/lib/TickerPlugin.mjs","moduleParts":{"dist/rapid.js":"72ad-975"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-966"},{"uid":"72ad-970"}],"importedBy":[{"uid":"72ad-972"}]},"72ad-976":{"id":"node_modules/@pixi/core/lib/autoDetectRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-977"},"imported":[{"uid":"72ad-750"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-978":{"id":"node_modules/@pixi/core/lib/fragments/default.mjs","moduleParts":{"dist/rapid.js":"72ad-979"},"imported":[],"importedBy":[{"uid":"72ad-982"}]},"72ad-980":{"id":"node_modules/@pixi/core/lib/fragments/defaultFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-981"},"imported":[],"importedBy":[{"uid":"72ad-982"}]},"72ad-982":{"id":"node_modules/@pixi/core/lib/fragments/index.mjs","moduleParts":{"dist/rapid.js":"72ad-983"},"imported":[{"uid":"72ad-978"},{"uid":"72ad-980"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-984":{"id":"node_modules/@pixi/core/lib/framebuffer/MultisampleSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-985"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-986":{"id":"node_modules/@pixi/core/lib/geometry/GLBuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-987"},"imported":[],"importedBy":[{"uid":"72ad-988"}]},"72ad-988":{"id":"node_modules/@pixi/core/lib/geometry/BufferSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-989"},"imported":[{"uid":"72ad-750"},{"uid":"72ad-986"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-990":{"id":"node_modules/@pixi/core/lib/render/ObjectRendererSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-991"},"imported":[{"uid":"72ad-750"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-992":{"id":"node_modules/@pixi/core/lib/Renderer.mjs","moduleParts":{"dist/rapid.js":"72ad-993"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-750"},{"uid":"72ad-790"},{"uid":"72ad-566"},{"uid":"72ad-562"},{"uid":"72ad-836"},{"uid":"72ad-946"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-994":{"id":"node_modules/@pixi/core/lib/textures/resources/AbstractMultiResource.mjs","moduleParts":{"dist/rapid.js":"72ad-995"},"imported":[{"uid":"72ad-768"},{"uid":"72ad-758"},{"uid":"72ad-764"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"},{"uid":"72ad-996"},{"uid":"72ad-1002"}]},"72ad-996":{"id":"node_modules/@pixi/core/lib/textures/resources/ArrayResource.mjs","moduleParts":{"dist/rapid.js":"72ad-997"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-994"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"}]},"72ad-998":{"id":"node_modules/@pixi/core/lib/textures/resources/index.mjs","moduleParts":{"dist/rapid.js":"72ad-999"},"imported":[{"uid":"72ad-996"},{"uid":"72ad-758"},{"uid":"72ad-766"},{"uid":"72ad-1000"},{"uid":"72ad-1002"},{"uid":"72ad-1004"},{"uid":"72ad-878"},{"uid":"72ad-1006"},{"uid":"72ad-1008"},{"uid":"72ad-876"},{"uid":"72ad-764"},{"uid":"72ad-994"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-1000":{"id":"node_modules/@pixi/core/lib/textures/resources/CanvasResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1001"},"imported":[{"uid":"72ad-876"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"}]},"72ad-1002":{"id":"node_modules/@pixi/core/lib/textures/resources/CubeResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1003"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-994"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"}]},"72ad-1004":{"id":"node_modules/@pixi/core/lib/textures/resources/ImageBitmapResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1005"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-566"},{"uid":"72ad-876"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"}]},"72ad-1006":{"id":"node_modules/@pixi/core/lib/textures/resources/SVGResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1007"},"imported":[{"uid":"72ad-566"},{"uid":"72ad-562"},{"uid":"72ad-876"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"}]},"72ad-1008":{"id":"node_modules/@pixi/core/lib/textures/resources/VideoResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1009"},"imported":[{"uid":"72ad-972"},{"uid":"72ad-876"}],"importedBy":[{"uid":"72ad-962"},{"uid":"72ad-998"}]},"72ad-1010":{"id":"node_modules/@pixi/display/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-1011"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1016"}],"importedBy":[{"uid":"72ad-1018"}]},"72ad-1012":{"id":"node_modules/@pixi/display/lib/Bounds.mjs","moduleParts":{"dist/rapid.js":"72ad-1013"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1018"},{"uid":"72ad-1014"}]},"72ad-1014":{"id":"node_modules/@pixi/display/lib/DisplayObject.mjs","moduleParts":{"dist/rapid.js":"72ad-1015"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1012"}],"importedBy":[{"uid":"72ad-1018"},{"uid":"72ad-1016"}]},"72ad-1016":{"id":"node_modules/@pixi/display/lib/Container.mjs","moduleParts":{"dist/rapid.js":"72ad-1017"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1014"}],"importedBy":[{"uid":"72ad-1018"},{"uid":"72ad-1010"}]},"72ad-1018":{"id":"node_modules/@pixi/display/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1019"},"imported":[{"uid":"72ad-1010"},{"uid":"72ad-1012"},{"uid":"72ad-1016"},{"uid":"72ad-1014"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1024"},{"uid":"72ad-1026"},{"uid":"72ad-1028"},{"uid":"72ad-1098"},{"uid":"72ad-1102"},{"uid":"72ad-1094"},{"uid":"72ad-1238"},{"uid":"72ad-1232"},{"uid":"72ad-1242"},{"uid":"72ad-1260"},{"uid":"72ad-1286"},{"uid":"72ad-1020"},{"uid":"72ad-1346"}]},"72ad-1020":{"id":"node_modules/@pixi/sprite/lib/Sprite.mjs","moduleParts":{"dist/rapid.js":"72ad-1021"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"}],"importedBy":[{"uid":"72ad-1022"}]},"72ad-1022":{"id":"node_modules/@pixi/sprite/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1023"},"imported":[{"uid":"72ad-1020"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1024"},{"uid":"72ad-2666"},{"uid":"72ad-1294"},{"uid":"72ad-1282"},{"uid":"72ad-1352"}]},"72ad-1024":{"id":"node_modules/@pixi/mixin-cache-as-bitmap/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1025"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1022"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1026":{"id":"node_modules/@pixi/mixin-get-child-by-name/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1027"},"imported":[{"uid":"72ad-1018"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1028":{"id":"node_modules/@pixi/mixin-get-global-position/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1029"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1030":{"id":"node_modules/@pixi/filter-alpha/lib/alpha.mjs","moduleParts":{"dist/rapid.js":"72ad-1031"},"imported":[],"importedBy":[{"uid":"72ad-1032"}]},"72ad-1032":{"id":"node_modules/@pixi/filter-alpha/lib/AlphaFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1033"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1030"}],"importedBy":[{"uid":"72ad-1034"}]},"72ad-1034":{"id":"node_modules/@pixi/filter-alpha/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1035"},"imported":[{"uid":"72ad-1032"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1074"},{"uid":"72ad-1658"}]},"72ad-1036":{"id":"node_modules/@pixi/filter-blur/lib/generateBlurFragSource.mjs","moduleParts":{"dist/rapid.js":"72ad-1037"},"imported":[],"importedBy":[{"uid":"72ad-1040"}]},"72ad-1038":{"id":"node_modules/@pixi/filter-blur/lib/generateBlurVertSource.mjs","moduleParts":{"dist/rapid.js":"72ad-1039"},"imported":[],"importedBy":[{"uid":"72ad-1040"}]},"72ad-1040":{"id":"node_modules/@pixi/filter-blur/lib/BlurFilterPass.mjs","moduleParts":{"dist/rapid.js":"72ad-1041"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1036"},{"uid":"72ad-1038"}],"importedBy":[{"uid":"72ad-1044"},{"uid":"72ad-1042"}]},"72ad-1042":{"id":"node_modules/@pixi/filter-blur/lib/BlurFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1043"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1040"}],"importedBy":[{"uid":"72ad-1044"}]},"72ad-1044":{"id":"node_modules/@pixi/filter-blur/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1045"},"imported":[{"uid":"72ad-1042"},{"uid":"72ad-1040"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1074"},{"uid":"72ad-1658"}]},"72ad-1046":{"id":"node_modules/@pixi/filter-color-matrix/lib/colorMatrix.mjs","moduleParts":{"dist/rapid.js":"72ad-1047"},"imported":[],"importedBy":[{"uid":"72ad-1048"}]},"72ad-1048":{"id":"node_modules/@pixi/filter-color-matrix/lib/ColorMatrixFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1049"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1046"}],"importedBy":[{"uid":"72ad-1050"}]},"72ad-1050":{"id":"node_modules/@pixi/filter-color-matrix/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1051"},"imported":[{"uid":"72ad-1048"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1074"}]},"72ad-1052":{"id":"node_modules/@pixi/filter-displacement/lib/displacement.mjs","moduleParts":{"dist/rapid.js":"72ad-1053"},"imported":[],"importedBy":[{"uid":"72ad-1056"}]},"72ad-1054":{"id":"node_modules/@pixi/filter-displacement/lib/displacement2.mjs","moduleParts":{"dist/rapid.js":"72ad-1055"},"imported":[],"importedBy":[{"uid":"72ad-1056"}]},"72ad-1056":{"id":"node_modules/@pixi/filter-displacement/lib/DisplacementFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1057"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1052"},{"uid":"72ad-1054"}],"importedBy":[{"uid":"72ad-1058"}]},"72ad-1058":{"id":"node_modules/@pixi/filter-displacement/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1059"},"imported":[{"uid":"72ad-1056"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1074"}]},"72ad-1060":{"id":"node_modules/@pixi/filter-fxaa/lib/fxaa.mjs","moduleParts":{"dist/rapid.js":"72ad-1061"},"imported":[],"importedBy":[{"uid":"72ad-1064"}]},"72ad-1062":{"id":"node_modules/@pixi/filter-fxaa/lib/fxaa2.mjs","moduleParts":{"dist/rapid.js":"72ad-1063"},"imported":[],"importedBy":[{"uid":"72ad-1064"}]},"72ad-1064":{"id":"node_modules/@pixi/filter-fxaa/lib/FXAAFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1065"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1060"},{"uid":"72ad-1062"}],"importedBy":[{"uid":"72ad-1066"}]},"72ad-1066":{"id":"node_modules/@pixi/filter-fxaa/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1067"},"imported":[{"uid":"72ad-1064"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1074"}]},"72ad-1068":{"id":"node_modules/@pixi/filter-noise/lib/noise.mjs","moduleParts":{"dist/rapid.js":"72ad-1069"},"imported":[],"importedBy":[{"uid":"72ad-1070"}]},"72ad-1070":{"id":"node_modules/@pixi/filter-noise/lib/NoiseFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1071"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1068"}],"importedBy":[{"uid":"72ad-1072"}]},"72ad-1072":{"id":"node_modules/@pixi/filter-noise/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1073"},"imported":[{"uid":"72ad-1070"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1074"}]},"72ad-1074":{"id":"node_modules/pixi.js/lib/filters.mjs","moduleParts":{"dist/rapid.js":"72ad-1075"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1034"},{"uid":"72ad-1044"},{"uid":"72ad-1050"},{"uid":"72ad-1058"},{"uid":"72ad-1066"},{"uid":"72ad-1072"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1076":{"id":"node_modules/pixi.js/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1077"},"imported":[{"uid":"72ad-1024"},{"uid":"72ad-1026"},{"uid":"72ad-1028"},{"uid":"72ad-1074"},{"uid":"72ad-1100"},{"uid":"72ad-1104"},{"uid":"72ad-1156"},{"uid":"72ad-1178"},{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1090"},{"uid":"72ad-1204"},{"uid":"72ad-1034"},{"uid":"72ad-1044"},{"uid":"72ad-1050"},{"uid":"72ad-1058"},{"uid":"72ad-1066"},{"uid":"72ad-1072"},{"uid":"72ad-1228"},{"uid":"72ad-1244"},{"uid":"72ad-1254"},{"uid":"72ad-1262"},{"uid":"72ad-1288"},{"uid":"72ad-1022"},{"uid":"72ad-1292"},{"uid":"72ad-1296"},{"uid":"72ad-1312"},{"uid":"72ad-1276"},{"uid":"72ad-1340"},{"uid":"72ad-1354"}],"importedBy":[{"uid":"72ad-2200"},{"uid":"72ad-1904"},{"uid":"72ad-1952"},{"uid":"72ad-1958"},{"uid":"72ad-1960"},{"uid":"72ad-1972"},{"uid":"72ad-1876"},{"uid":"72ad-1776"},{"uid":"72ad-1754"},{"uid":"72ad-1720"},{"uid":"72ad-1770"},{"uid":"72ad-1774"},{"uid":"72ad-1744"},{"uid":"72ad-1752"},{"uid":"72ad-1760"},{"uid":"72ad-1762"},{"uid":"72ad-1766"},{"uid":"72ad-1730"},{"uid":"72ad-1734"},{"uid":"72ad-1738"},{"uid":"72ad-1728"},{"uid":"72ad-1726"}]},"72ad-1078":{"id":"node_modules/@pixi/events/lib/EventTicker.mjs","moduleParts":{"dist/rapid.js":"72ad-1079"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1088"},{"uid":"72ad-1092"}]},"72ad-1080":{"id":"node_modules/@pixi/events/lib/FederatedEvent.mjs","moduleParts":{"dist/rapid.js":"72ad-1081"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1090"},{"uid":"72ad-1094"},{"uid":"72ad-1082"}]},"72ad-1082":{"id":"node_modules/@pixi/events/lib/FederatedMouseEvent.mjs","moduleParts":{"dist/rapid.js":"72ad-1083"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1080"}],"importedBy":[{"uid":"72ad-1090"},{"uid":"72ad-1088"},{"uid":"72ad-1084"},{"uid":"72ad-1086"}]},"72ad-1084":{"id":"node_modules/@pixi/events/lib/FederatedPointerEvent.mjs","moduleParts":{"dist/rapid.js":"72ad-1085"},"imported":[{"uid":"72ad-1082"}],"importedBy":[{"uid":"72ad-1090"},{"uid":"72ad-1088"},{"uid":"72ad-1092"}]},"72ad-1086":{"id":"node_modules/@pixi/events/lib/FederatedWheelEvent.mjs","moduleParts":{"dist/rapid.js":"72ad-1087"},"imported":[{"uid":"72ad-1082"}],"importedBy":[{"uid":"72ad-1090"},{"uid":"72ad-1088"},{"uid":"72ad-1092"}]},"72ad-1088":{"id":"node_modules/@pixi/events/lib/EventBoundary.mjs","moduleParts":{"dist/rapid.js":"72ad-1089"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1078"},{"uid":"72ad-1082"},{"uid":"72ad-1084"},{"uid":"72ad-1086"}],"importedBy":[{"uid":"72ad-1090"},{"uid":"72ad-1092"}]},"72ad-1090":{"id":"node_modules/@pixi/events/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1091"},"imported":[{"uid":"72ad-1088"},{"uid":"72ad-1092"},{"uid":"72ad-1080"},{"uid":"72ad-2660"},{"uid":"72ad-1094"},{"uid":"72ad-1082"},{"uid":"72ad-1084"},{"uid":"72ad-1086"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1098"}]},"72ad-1092":{"id":"node_modules/@pixi/events/lib/EventSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1093"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1088"},{"uid":"72ad-1078"},{"uid":"72ad-1084"},{"uid":"72ad-1086"}],"importedBy":[{"uid":"72ad-1090"},{"uid":"72ad-1094"}]},"72ad-1094":{"id":"node_modules/@pixi/events/lib/FederatedEventTarget.mjs","moduleParts":{"dist/rapid.js":"72ad-1095"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1092"},{"uid":"72ad-1080"}],"importedBy":[{"uid":"72ad-1090"}]},"72ad-1096":{"id":"node_modules/@pixi/accessibility/lib/accessibleTarget.mjs","moduleParts":{"dist/rapid.js":"72ad-1097"},"imported":[],"importedBy":[{"uid":"72ad-1100"},{"uid":"72ad-1098"}]},"72ad-1098":{"id":"node_modules/@pixi/accessibility/lib/AccessibilityManager.mjs","moduleParts":{"dist/rapid.js":"72ad-1099"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1090"},{"uid":"72ad-1096"}],"importedBy":[{"uid":"72ad-1100"}]},"72ad-1100":{"id":"node_modules/@pixi/accessibility/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1101"},"imported":[{"uid":"72ad-1098"},{"uid":"72ad-1096"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1102":{"id":"node_modules/@pixi/app/lib/Application.mjs","moduleParts":{"dist/rapid.js":"72ad-1103"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"}],"importedBy":[{"uid":"72ad-1104"}]},"72ad-1104":{"id":"node_modules/@pixi/app/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1105"},"imported":[{"uid":"72ad-1102"},{"uid":"72ad-1106"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1106":{"id":"node_modules/@pixi/app/lib/ResizePlugin.mjs","moduleParts":{"dist/rapid.js":"72ad-1107"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1104"}]},"72ad-1108":{"id":"node_modules/@pixi/assets/lib/AssetExtension.mjs","moduleParts":{"dist/rapid.js":"72ad-1109"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1156"}]},"72ad-1110":{"id":"node_modules/@pixi/assets/lib/BackgroundLoader.mjs","moduleParts":{"dist/rapid.js":"72ad-1111"},"imported":[],"importedBy":[{"uid":"72ad-1154"}]},"72ad-1112":{"id":"node_modules/@pixi/assets/lib/utils/checkDataUrl.mjs","moduleParts":{"dist/rapid.js":"72ad-1113"},"imported":[],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1114"},{"uid":"72ad-1134"},{"uid":"72ad-1136"},{"uid":"72ad-1138"},{"uid":"72ad-1146"},{"uid":"72ad-1144"}]},"72ad-1114":{"id":"node_modules/@pixi/assets/lib/utils/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1115"},"imported":[{"uid":"72ad-1112"},{"uid":"72ad-1116"},{"uid":"72ad-1118"},{"uid":"72ad-1120"},{"uid":"72ad-1122"},{"uid":"72ad-1124"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1126"},{"uid":"72ad-1128"}]},"72ad-1116":{"id":"node_modules/@pixi/assets/lib/utils/checkExtension.mjs","moduleParts":{"dist/rapid.js":"72ad-1117"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1114"},{"uid":"72ad-1134"},{"uid":"72ad-1136"},{"uid":"72ad-1138"},{"uid":"72ad-1146"},{"uid":"72ad-1144"}]},"72ad-1118":{"id":"node_modules/@pixi/assets/lib/utils/convertToList.mjs","moduleParts":{"dist/rapid.js":"72ad-1119"},"imported":[],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1154"},{"uid":"72ad-1114"},{"uid":"72ad-1126"},{"uid":"72ad-1128"},{"uid":"72ad-1152"}]},"72ad-1120":{"id":"node_modules/@pixi/assets/lib/utils/copySearchParams.mjs","moduleParts":{"dist/rapid.js":"72ad-1121"},"imported":[],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1114"}]},"72ad-1122":{"id":"node_modules/@pixi/assets/lib/utils/createStringVariations.mjs","moduleParts":{"dist/rapid.js":"72ad-1123"},"imported":[],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1114"},{"uid":"72ad-1152"}]},"72ad-1124":{"id":"node_modules/@pixi/assets/lib/utils/isSingleItem.mjs","moduleParts":{"dist/rapid.js":"72ad-1125"},"imported":[],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1154"},{"uid":"72ad-1114"},{"uid":"72ad-1128"},{"uid":"72ad-1152"}]},"72ad-1126":{"id":"node_modules/@pixi/assets/lib/cache/Cache.mjs","moduleParts":{"dist/rapid.js":"72ad-1127"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1114"},{"uid":"72ad-1118"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1154"},{"uid":"72ad-1158"}]},"72ad-1128":{"id":"node_modules/@pixi/assets/lib/loader/Loader.mjs","moduleParts":{"dist/rapid.js":"72ad-1129"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1114"},{"uid":"72ad-1124"},{"uid":"72ad-1118"}],"importedBy":[{"uid":"72ad-1154"}]},"72ad-1130":{"id":"node_modules/@pixi/assets/lib/loader/parsers/LoaderParser.mjs","moduleParts":{"dist/rapid.js":"72ad-1131"},"imported":[],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1134"},{"uid":"72ad-1136"},{"uid":"72ad-1138"},{"uid":"72ad-1146"},{"uid":"72ad-1144"},{"uid":"72ad-1132"}]},"72ad-1132":{"id":"node_modules/@pixi/assets/lib/loader/parsers/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1133"},"imported":[{"uid":"72ad-1130"},{"uid":"72ad-1134"},{"uid":"72ad-1136"},{"uid":"72ad-1138"},{"uid":"72ad-1148"}],"importedBy":[{"uid":"72ad-1154"},{"uid":"72ad-2654"}]},"72ad-1134":{"id":"node_modules/@pixi/assets/lib/loader/parsers/loadJson.mjs","moduleParts":{"dist/rapid.js":"72ad-1135"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1112"},{"uid":"72ad-1116"},{"uid":"72ad-1130"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1132"}]},"72ad-1136":{"id":"node_modules/@pixi/assets/lib/loader/parsers/loadTxt.mjs","moduleParts":{"dist/rapid.js":"72ad-1137"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1112"},{"uid":"72ad-1116"},{"uid":"72ad-1130"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1132"}]},"72ad-1138":{"id":"node_modules/@pixi/assets/lib/loader/parsers/loadWebFont.mjs","moduleParts":{"dist/rapid.js":"72ad-1139"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1112"},{"uid":"72ad-1116"},{"uid":"72ad-1130"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1132"}]},"72ad-1140":{"id":"node_modules/@pixi/assets/lib/loader/parsers/WorkerManager.mjs","moduleParts":{"dist/rapid.js":"72ad-1141"},"imported":[],"importedBy":[{"uid":"72ad-1144"}]},"72ad-1142":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/utils/createTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-1143"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1146"},{"uid":"72ad-1144"},{"uid":"72ad-1150"}]},"72ad-1144":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/loadTextures.mjs","moduleParts":{"dist/rapid.js":"72ad-1145"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1112"},{"uid":"72ad-1116"},{"uid":"72ad-1130"},{"uid":"72ad-1140"},{"uid":"72ad-1142"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1154"},{"uid":"72ad-1146"},{"uid":"72ad-1172"},{"uid":"72ad-1148"}]},"72ad-1146":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/loadSVG.mjs","moduleParts":{"dist/rapid.js":"72ad-1147"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1112"},{"uid":"72ad-1116"},{"uid":"72ad-1130"},{"uid":"72ad-1144"},{"uid":"72ad-1142"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1148"}]},"72ad-1148":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1149"},"imported":[{"uid":"72ad-1146"},{"uid":"72ad-1144"},{"uid":"72ad-1150"}],"importedBy":[{"uid":"72ad-1132"}]},"72ad-1150":{"id":"node_modules/@pixi/assets/lib/loader/parsers/textures/utils/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1151"},"imported":[{"uid":"72ad-1142"}],"importedBy":[{"uid":"72ad-1148"}]},"72ad-1152":{"id":"node_modules/@pixi/assets/lib/resolver/Resolver.mjs","moduleParts":{"dist/rapid.js":"72ad-1153"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1118"},{"uid":"72ad-1122"},{"uid":"72ad-1124"}],"importedBy":[{"uid":"72ad-1154"}]},"72ad-1154":{"id":"node_modules/@pixi/assets/lib/Assets.mjs","moduleParts":{"dist/rapid.js":"72ad-1155"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1110"},{"uid":"72ad-1126"},{"uid":"72ad-1128"},{"uid":"72ad-1132"},{"uid":"72ad-1152"},{"uid":"72ad-1118"},{"uid":"72ad-1124"},{"uid":"72ad-1144"}],"importedBy":[{"uid":"72ad-1156"}]},"72ad-1156":{"id":"node_modules/@pixi/assets/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1157"},"imported":[{"uid":"72ad-1108"},{"uid":"72ad-1154"},{"uid":"72ad-1158"},{"uid":"72ad-2653"},{"uid":"72ad-2654"},{"uid":"72ad-2655"},{"uid":"72ad-1114"},{"uid":"72ad-1126"},{"uid":"72ad-1160"},{"uid":"72ad-1164"},{"uid":"72ad-1168"},{"uid":"72ad-1170"},{"uid":"72ad-1130"},{"uid":"72ad-1134"},{"uid":"72ad-1136"},{"uid":"72ad-1138"},{"uid":"72ad-1146"},{"uid":"72ad-1144"},{"uid":"72ad-1142"},{"uid":"72ad-1172"},{"uid":"72ad-1112"},{"uid":"72ad-1116"},{"uid":"72ad-1118"},{"uid":"72ad-1120"},{"uid":"72ad-1122"},{"uid":"72ad-1124"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1196"},{"uid":"72ad-1198"},{"uid":"72ad-1314"},{"uid":"72ad-1348"}]},"72ad-1158":{"id":"node_modules/@pixi/assets/lib/cache/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1159"},"imported":[{"uid":"72ad-1126"},{"uid":"72ad-2673"},{"uid":"72ad-1162"}],"importedBy":[{"uid":"72ad-1156"}]},"72ad-1160":{"id":"node_modules/@pixi/assets/lib/cache/parsers/cacheTextureArray.mjs","moduleParts":{"dist/rapid.js":"72ad-1161"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1162"}]},"72ad-1162":{"id":"node_modules/@pixi/assets/lib/cache/parsers/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1163"},"imported":[{"uid":"72ad-1160"}],"importedBy":[{"uid":"72ad-1158"}]},"72ad-1164":{"id":"node_modules/@pixi/assets/lib/detections/parsers/detectAvif.mjs","moduleParts":{"dist/rapid.js":"72ad-1165"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1166"}]},"72ad-1166":{"id":"node_modules/@pixi/assets/lib/detections/parsers/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1167"},"imported":[{"uid":"72ad-1164"},{"uid":"72ad-1168"},{"uid":"72ad-1170"}],"importedBy":[{"uid":"72ad-2653"}]},"72ad-1168":{"id":"node_modules/@pixi/assets/lib/detections/parsers/detectWebp.mjs","moduleParts":{"dist/rapid.js":"72ad-1169"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1166"}]},"72ad-1170":{"id":"node_modules/@pixi/assets/lib/detections/parsers/detectDefaults.mjs","moduleParts":{"dist/rapid.js":"72ad-1171"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1166"}]},"72ad-1172":{"id":"node_modules/@pixi/assets/lib/resolver/parsers/resolveTextureUrl.mjs","moduleParts":{"dist/rapid.js":"72ad-1173"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-2654"},{"uid":"72ad-1144"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1174"}]},"72ad-1174":{"id":"node_modules/@pixi/assets/lib/resolver/parsers/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1175"},"imported":[{"uid":"72ad-1172"}],"importedBy":[{"uid":"72ad-2655"}]},"72ad-1176":{"id":"node_modules/@pixi/compressed-textures/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-1177"},"imported":[],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1190"},{"uid":"72ad-1194"},{"uid":"72ad-1188"}]},"72ad-1178":{"id":"node_modules/@pixi/compressed-textures/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1179"},"imported":[{"uid":"72ad-1176"},{"uid":"72ad-1182"},{"uid":"72ad-1192"},{"uid":"72ad-1186"},{"uid":"72ad-1180"},{"uid":"72ad-1196"},{"uid":"72ad-1198"},{"uid":"72ad-1200"},{"uid":"72ad-1190"},{"uid":"72ad-1194"},{"uid":"72ad-1184"},{"uid":"72ad-1188"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1180":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/detectCompressedTextures.mjs","moduleParts":{"dist/rapid.js":"72ad-1181"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1182"}]},"72ad-1182":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1183"},"imported":[{"uid":"72ad-2676"},{"uid":"72ad-1180"},{"uid":"72ad-1196"},{"uid":"72ad-1198"},{"uid":"72ad-1200"}],"importedBy":[{"uid":"72ad-1178"}]},"72ad-1184":{"id":"node_modules/@pixi/compressed-textures/lib/resources/BlobResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1185"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1186"},{"uid":"72ad-1188"}]},"72ad-1186":{"id":"node_modules/@pixi/compressed-textures/lib/resources/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1187"},"imported":[{"uid":"72ad-1184"},{"uid":"72ad-1188"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1190"},{"uid":"72ad-1194"}]},"72ad-1188":{"id":"node_modules/@pixi/compressed-textures/lib/resources/CompressedTextureResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1189"},"imported":[{"uid":"72ad-1176"},{"uid":"72ad-1184"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1186"},{"uid":"72ad-1190"},{"uid":"72ad-1194"}]},"72ad-1190":{"id":"node_modules/@pixi/compressed-textures/lib/parsers/parseDDS.mjs","moduleParts":{"dist/rapid.js":"72ad-1191"},"imported":[{"uid":"72ad-1176"},{"uid":"72ad-1186"},{"uid":"72ad-1188"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1192"},{"uid":"72ad-1196"}]},"72ad-1192":{"id":"node_modules/@pixi/compressed-textures/lib/parsers/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1193"},"imported":[{"uid":"72ad-1190"},{"uid":"72ad-1194"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1196"},{"uid":"72ad-1198"}]},"72ad-1194":{"id":"node_modules/@pixi/compressed-textures/lib/parsers/parseKTX.mjs","moduleParts":{"dist/rapid.js":"72ad-1195"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1176"},{"uid":"72ad-1186"},{"uid":"72ad-1188"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1192"},{"uid":"72ad-1198"}]},"72ad-1196":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/loadDDS.mjs","moduleParts":{"dist/rapid.js":"72ad-1197"},"imported":[{"uid":"72ad-1156"},{"uid":"72ad-962"},{"uid":"72ad-1192"},{"uid":"72ad-1190"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1182"}]},"72ad-1198":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/loadKTX.mjs","moduleParts":{"dist/rapid.js":"72ad-1199"},"imported":[{"uid":"72ad-1156"},{"uid":"72ad-962"},{"uid":"72ad-1192"},{"uid":"72ad-1194"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1182"}]},"72ad-1200":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/resolveCompressedTextureUrl.mjs","moduleParts":{"dist/rapid.js":"72ad-1201"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1178"},{"uid":"72ad-1182"}]},"72ad-1202":{"id":"node_modules/@pixi/extract/lib/Extract.mjs","moduleParts":{"dist/rapid.js":"72ad-1203"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1204"}]},"72ad-1204":{"id":"node_modules/@pixi/extract/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1205"},"imported":[{"uid":"72ad-1202"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1206":{"id":"node_modules/@pixi/graphics/lib/utils/buildCircle.mjs","moduleParts":{"dist/rapid.js":"72ad-1207"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"},{"uid":"72ad-1214"}]},"72ad-1208":{"id":"node_modules/@pixi/graphics/lib/utils/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1209"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1206"},{"uid":"72ad-1210"},{"uid":"72ad-1212"},{"uid":"72ad-1214"},{"uid":"72ad-1218"},{"uid":"72ad-1220"},{"uid":"72ad-1222"},{"uid":"72ad-1224"},{"uid":"72ad-1226"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1238"},{"uid":"72ad-1232"}]},"72ad-1210":{"id":"node_modules/@pixi/graphics/lib/utils/buildPoly.mjs","moduleParts":{"dist/rapid.js":"72ad-1211"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"},{"uid":"72ad-1232"}]},"72ad-1212":{"id":"node_modules/@pixi/graphics/lib/utils/buildRectangle.mjs","moduleParts":{"dist/rapid.js":"72ad-1213"},"imported":[],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"}]},"72ad-1214":{"id":"node_modules/@pixi/graphics/lib/utils/buildRoundedRectangle.mjs","moduleParts":{"dist/rapid.js":"72ad-1215"},"imported":[{"uid":"72ad-1206"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"}]},"72ad-1216":{"id":"node_modules/@pixi/graphics/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-1217"},"imported":[],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1238"},{"uid":"72ad-1236"},{"uid":"72ad-1224"},{"uid":"72ad-1218"},{"uid":"72ad-1222"},{"uid":"72ad-1226"}]},"72ad-1218":{"id":"node_modules/@pixi/graphics/lib/utils/ArcUtils.mjs","moduleParts":{"dist/rapid.js":"72ad-1219"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1216"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"},{"uid":"72ad-1238"}]},"72ad-1220":{"id":"node_modules/@pixi/graphics/lib/utils/BatchPart.mjs","moduleParts":{"dist/rapid.js":"72ad-1221"},"imported":[],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"},{"uid":"72ad-1232"}]},"72ad-1222":{"id":"node_modules/@pixi/graphics/lib/utils/BezierUtils.mjs","moduleParts":{"dist/rapid.js":"72ad-1223"},"imported":[{"uid":"72ad-1216"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"},{"uid":"72ad-1238"}]},"72ad-1224":{"id":"node_modules/@pixi/graphics/lib/utils/buildLine.mjs","moduleParts":{"dist/rapid.js":"72ad-1225"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1216"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"},{"uid":"72ad-1232"}]},"72ad-1226":{"id":"node_modules/@pixi/graphics/lib/utils/QuadraticUtils.mjs","moduleParts":{"dist/rapid.js":"72ad-1227"},"imported":[{"uid":"72ad-1216"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1208"},{"uid":"72ad-1238"}]},"72ad-1228":{"id":"node_modules/@pixi/graphics/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1229"},"imported":[{"uid":"72ad-1208"},{"uid":"72ad-1216"},{"uid":"72ad-1238"},{"uid":"72ad-1230"},{"uid":"72ad-1232"},{"uid":"72ad-1234"},{"uid":"72ad-1236"},{"uid":"72ad-1210"},{"uid":"72ad-1206"},{"uid":"72ad-1212"},{"uid":"72ad-1214"},{"uid":"72ad-1224"},{"uid":"72ad-1218"},{"uid":"72ad-1222"},{"uid":"72ad-1226"},{"uid":"72ad-1220"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1290"}]},"72ad-1230":{"id":"node_modules/@pixi/graphics/lib/GraphicsData.mjs","moduleParts":{"dist/rapid.js":"72ad-1231"},"imported":[],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1232"}]},"72ad-1232":{"id":"node_modules/@pixi/graphics/lib/GraphicsGeometry.mjs","moduleParts":{"dist/rapid.js":"72ad-1233"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1230"},{"uid":"72ad-1208"},{"uid":"72ad-1220"},{"uid":"72ad-1210"},{"uid":"72ad-1224"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1238"}]},"72ad-1234":{"id":"node_modules/@pixi/graphics/lib/styles/FillStyle.mjs","moduleParts":{"dist/rapid.js":"72ad-1235"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1238"},{"uid":"72ad-1236"}]},"72ad-1236":{"id":"node_modules/@pixi/graphics/lib/styles/LineStyle.mjs","moduleParts":{"dist/rapid.js":"72ad-1237"},"imported":[{"uid":"72ad-1216"},{"uid":"72ad-1234"}],"importedBy":[{"uid":"72ad-1228"},{"uid":"72ad-1238"}]},"72ad-1238":{"id":"node_modules/@pixi/graphics/lib/Graphics.mjs","moduleParts":{"dist/rapid.js":"72ad-1239"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1216"},{"uid":"72ad-1232"},{"uid":"72ad-1234"},{"uid":"72ad-1236"},{"uid":"72ad-1208"},{"uid":"72ad-1226"},{"uid":"72ad-1222"},{"uid":"72ad-1218"}],"importedBy":[{"uid":"72ad-1228"}]},"72ad-1240":{"id":"node_modules/@pixi/mesh/lib/MeshBatchUvs.mjs","moduleParts":{"dist/rapid.js":"72ad-1241"},"imported":[],"importedBy":[{"uid":"72ad-1244"},{"uid":"72ad-1242"}]},"72ad-1242":{"id":"node_modules/@pixi/mesh/lib/Mesh.mjs","moduleParts":{"dist/rapid.js":"72ad-1243"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1240"}],"importedBy":[{"uid":"72ad-1244"}]},"72ad-1244":{"id":"node_modules/@pixi/mesh/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1245"},"imported":[{"uid":"72ad-1242"},{"uid":"72ad-1240"},{"uid":"72ad-1246"},{"uid":"72ad-1252"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-2661"},{"uid":"72ad-1256"},{"uid":"72ad-2663"},{"uid":"72ad-2664"},{"uid":"72ad-1258"},{"uid":"72ad-1346"}]},"72ad-1246":{"id":"node_modules/@pixi/mesh/lib/MeshGeometry.mjs","moduleParts":{"dist/rapid.js":"72ad-1247"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1244"}]},"72ad-1248":{"id":"node_modules/@pixi/mesh/lib/shader/mesh.mjs","moduleParts":{"dist/rapid.js":"72ad-1249"},"imported":[],"importedBy":[{"uid":"72ad-1252"}]},"72ad-1250":{"id":"node_modules/@pixi/mesh/lib/shader/mesh2.mjs","moduleParts":{"dist/rapid.js":"72ad-1251"},"imported":[],"importedBy":[{"uid":"72ad-1252"}]},"72ad-1252":{"id":"node_modules/@pixi/mesh/lib/MeshMaterial.mjs","moduleParts":{"dist/rapid.js":"72ad-1253"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1248"},{"uid":"72ad-1250"}],"importedBy":[{"uid":"72ad-1244"}]},"72ad-1254":{"id":"node_modules/@pixi/mesh-extras/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1255"},"imported":[{"uid":"72ad-2661"},{"uid":"72ad-1256"},{"uid":"72ad-2662"},{"uid":"72ad-2663"},{"uid":"72ad-2664"},{"uid":"72ad-1258"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1256":{"id":"node_modules/@pixi/mesh-extras/lib/geometry/RopeGeometry.mjs","moduleParts":{"dist/rapid.js":"72ad-1257"},"imported":[{"uid":"72ad-1244"}],"importedBy":[{"uid":"72ad-1254"},{"uid":"72ad-1258"}]},"72ad-1258":{"id":"node_modules/@pixi/mesh-extras/lib/SimpleRope.mjs","moduleParts":{"dist/rapid.js":"72ad-1259"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1244"},{"uid":"72ad-1256"}],"importedBy":[{"uid":"72ad-1254"}]},"72ad-1260":{"id":"node_modules/@pixi/particle-container/lib/ParticleContainer.mjs","moduleParts":{"dist/rapid.js":"72ad-1261"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"}],"importedBy":[{"uid":"72ad-1262"}]},"72ad-1262":{"id":"node_modules/@pixi/particle-container/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1263"},"imported":[{"uid":"72ad-1260"},{"uid":"72ad-1270"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1264":{"id":"node_modules/@pixi/particle-container/lib/ParticleBuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-1265"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1270"}]},"72ad-1266":{"id":"node_modules/@pixi/particle-container/lib/particles.mjs","moduleParts":{"dist/rapid.js":"72ad-1267"},"imported":[],"importedBy":[{"uid":"72ad-1270"}]},"72ad-1268":{"id":"node_modules/@pixi/particle-container/lib/particles2.mjs","moduleParts":{"dist/rapid.js":"72ad-1269"},"imported":[],"importedBy":[{"uid":"72ad-1270"}]},"72ad-1270":{"id":"node_modules/@pixi/particle-container/lib/ParticleRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-1271"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1264"},{"uid":"72ad-1266"},{"uid":"72ad-1268"}],"importedBy":[{"uid":"72ad-1262"}]},"72ad-1272":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-1273"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1286"}],"importedBy":[{"uid":"72ad-1288"}]},"72ad-1274":{"id":"node_modules/@pixi/text/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-1275"},"imported":[],"importedBy":[{"uid":"72ad-1276"},{"uid":"72ad-1282"},{"uid":"72ad-1280"}]},"72ad-1276":{"id":"node_modules/@pixi/text/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1277"},"imported":[{"uid":"72ad-1274"},{"uid":"72ad-1282"},{"uid":"72ad-1278"},{"uid":"72ad-1280"}],"importedBy":[{"uid":"72ad-1076"},{"uid":"72ad-1286"},{"uid":"72ad-1338"},{"uid":"72ad-1352"},{"uid":"72ad-1350"},{"uid":"72ad-1326"}]},"72ad-1278":{"id":"node_modules/@pixi/text/lib/TextMetrics.mjs","moduleParts":{"dist/rapid.js":"72ad-1279"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1276"},{"uid":"72ad-1282"}]},"72ad-1280":{"id":"node_modules/@pixi/text/lib/TextStyle.mjs","moduleParts":{"dist/rapid.js":"72ad-1281"},"imported":[{"uid":"72ad-1274"},{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1276"},{"uid":"72ad-1282"}]},"72ad-1282":{"id":"node_modules/@pixi/text/lib/Text.mjs","moduleParts":{"dist/rapid.js":"72ad-1283"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1022"},{"uid":"72ad-1274"},{"uid":"72ad-1278"},{"uid":"72ad-1280"}],"importedBy":[{"uid":"72ad-1276"}]},"72ad-1284":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/CountLimiter.mjs","moduleParts":{"dist/rapid.js":"72ad-1285"},"imported":[],"importedBy":[{"uid":"72ad-1288"},{"uid":"72ad-1286"}]},"72ad-1286":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/BasePrepare.mjs","moduleParts":{"dist/rapid.js":"72ad-1287"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1276"},{"uid":"72ad-1284"}],"importedBy":[{"uid":"72ad-1288"},{"uid":"72ad-1272"},{"uid":"72ad-1290"}]},"72ad-1288":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1289"},"imported":[{"uid":"72ad-1272"},{"uid":"72ad-1286"},{"uid":"72ad-1284"},{"uid":"72ad-1290"},{"uid":"72ad-2665"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1290":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/Prepare.mjs","moduleParts":{"dist/rapid.js":"72ad-1291"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1228"},{"uid":"72ad-1286"}],"importedBy":[{"uid":"72ad-1288"}]},"72ad-1292":{"id":"node_modules/@pixi/sprite-animated/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1293"},"imported":[{"uid":"72ad-2666"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1294":{"id":"node_modules/@pixi/sprite-tiling/lib/TilingSprite.mjs","moduleParts":{"dist/rapid.js":"72ad-1295"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1022"}],"importedBy":[{"uid":"72ad-1296"}]},"72ad-1296":{"id":"node_modules/@pixi/sprite-tiling/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1297"},"imported":[{"uid":"72ad-1294"},{"uid":"72ad-1308"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1298":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling.mjs","moduleParts":{"dist/rapid.js":"72ad-1299"},"imported":[],"importedBy":[{"uid":"72ad-1308"}]},"72ad-1300":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling2.mjs","moduleParts":{"dist/rapid.js":"72ad-1301"},"imported":[],"importedBy":[{"uid":"72ad-1308"}]},"72ad-1302":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling-fallback.mjs","moduleParts":{"dist/rapid.js":"72ad-1303"},"imported":[],"importedBy":[{"uid":"72ad-1308"}]},"72ad-1304":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling-fallback2.mjs","moduleParts":{"dist/rapid.js":"72ad-1305"},"imported":[],"importedBy":[{"uid":"72ad-1308"}]},"72ad-1306":{"id":"node_modules/@pixi/sprite-tiling/lib/sprite-tiling-simple.mjs","moduleParts":{"dist/rapid.js":"72ad-1307"},"imported":[],"importedBy":[{"uid":"72ad-1308"}]},"72ad-1308":{"id":"node_modules/@pixi/sprite-tiling/lib/TilingSpriteRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-1309"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1298"},{"uid":"72ad-1300"},{"uid":"72ad-1302"},{"uid":"72ad-1304"},{"uid":"72ad-1306"}],"importedBy":[{"uid":"72ad-1296"}]},"72ad-1310":{"id":"node_modules/@pixi/spritesheet/lib/Spritesheet.mjs","moduleParts":{"dist/rapid.js":"72ad-1311"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1312"},{"uid":"72ad-1314"}]},"72ad-1312":{"id":"node_modules/@pixi/spritesheet/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1313"},"imported":[{"uid":"72ad-1310"},{"uid":"72ad-1314"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1314":{"id":"node_modules/@pixi/spritesheet/lib/spritesheetAsset.mjs","moduleParts":{"dist/rapid.js":"72ad-1315"},"imported":[{"uid":"72ad-1156"},{"uid":"72ad-962"},{"uid":"72ad-1310"}],"importedBy":[{"uid":"72ad-1312"}]},"72ad-1316":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapFontData.mjs","moduleParts":{"dist/rapid.js":"72ad-1317"},"imported":[],"importedBy":[{"uid":"72ad-1340"},{"uid":"72ad-1338"},{"uid":"72ad-1318"},{"uid":"72ad-1322"}]},"72ad-1318":{"id":"node_modules/@pixi/text-bitmap/lib/formats/TextFormat.mjs","moduleParts":{"dist/rapid.js":"72ad-1319"},"imported":[{"uid":"72ad-1316"}],"importedBy":[{"uid":"72ad-1340"},{"uid":"72ad-1320"},{"uid":"72ad-1348"}]},"72ad-1320":{"id":"node_modules/@pixi/text-bitmap/lib/formats/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1321"},"imported":[{"uid":"72ad-1318"},{"uid":"72ad-1322"},{"uid":"72ad-1324"}],"importedBy":[{"uid":"72ad-1340"},{"uid":"72ad-1338"},{"uid":"72ad-1348"}]},"72ad-1322":{"id":"node_modules/@pixi/text-bitmap/lib/formats/XMLFormat.mjs","moduleParts":{"dist/rapid.js":"72ad-1323"},"imported":[{"uid":"72ad-1316"}],"importedBy":[{"uid":"72ad-1340"},{"uid":"72ad-1320"},{"uid":"72ad-1324"}]},"72ad-1324":{"id":"node_modules/@pixi/text-bitmap/lib/formats/XMLStringFormat.mjs","moduleParts":{"dist/rapid.js":"72ad-1325"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1322"}],"importedBy":[{"uid":"72ad-1340"},{"uid":"72ad-1320"},{"uid":"72ad-1348"}]},"72ad-1326":{"id":"node_modules/@pixi/text-bitmap/lib/utils/generateFillStyle.mjs","moduleParts":{"dist/rapid.js":"72ad-1327"},"imported":[{"uid":"72ad-1276"}],"importedBy":[{"uid":"72ad-1330"},{"uid":"72ad-1328"}]},"72ad-1328":{"id":"node_modules/@pixi/text-bitmap/lib/utils/drawGlyph.mjs","moduleParts":{"dist/rapid.js":"72ad-1329"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1326"}],"importedBy":[{"uid":"72ad-1338"},{"uid":"72ad-1330"}]},"72ad-1330":{"id":"node_modules/@pixi/text-bitmap/lib/utils/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1331"},"imported":[{"uid":"72ad-1328"},{"uid":"72ad-1332"},{"uid":"72ad-1326"},{"uid":"72ad-1336"},{"uid":"72ad-1334"}],"importedBy":[{"uid":"72ad-1338"},{"uid":"72ad-1346"}]},"72ad-1332":{"id":"node_modules/@pixi/text-bitmap/lib/utils/extractCharCode.mjs","moduleParts":{"dist/rapid.js":"72ad-1333"},"imported":[],"importedBy":[{"uid":"72ad-1338"},{"uid":"72ad-1346"},{"uid":"72ad-1330"}]},"72ad-1334":{"id":"node_modules/@pixi/text-bitmap/lib/utils/splitTextToCharacters.mjs","moduleParts":{"dist/rapid.js":"72ad-1335"},"imported":[],"importedBy":[{"uid":"72ad-1346"},{"uid":"72ad-1330"},{"uid":"72ad-1336"}]},"72ad-1336":{"id":"node_modules/@pixi/text-bitmap/lib/utils/resolveCharacters.mjs","moduleParts":{"dist/rapid.js":"72ad-1337"},"imported":[{"uid":"72ad-1334"}],"importedBy":[{"uid":"72ad-1338"},{"uid":"72ad-1330"}]},"72ad-1338":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapFont.mjs","moduleParts":{"dist/rapid.js":"72ad-1339"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1276"},{"uid":"72ad-1316"},{"uid":"72ad-1320"},{"uid":"72ad-1330"},{"uid":"72ad-1336"},{"uid":"72ad-1328"},{"uid":"72ad-1332"}],"importedBy":[{"uid":"72ad-1340"},{"uid":"72ad-1346"},{"uid":"72ad-1348"}]},"72ad-1340":{"id":"node_modules/@pixi/text-bitmap/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1341"},"imported":[{"uid":"72ad-1338"},{"uid":"72ad-1316"},{"uid":"72ad-1346"},{"uid":"72ad-2667"},{"uid":"72ad-1320"},{"uid":"72ad-1348"},{"uid":"72ad-1318"},{"uid":"72ad-1322"},{"uid":"72ad-1324"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1342":{"id":"node_modules/@pixi/text-bitmap/lib/shader/msdf.mjs","moduleParts":{"dist/rapid.js":"72ad-1343"},"imported":[],"importedBy":[{"uid":"72ad-1346"}]},"72ad-1344":{"id":"node_modules/@pixi/text-bitmap/lib/shader/msdf2.mjs","moduleParts":{"dist/rapid.js":"72ad-1345"},"imported":[],"importedBy":[{"uid":"72ad-1346"}]},"72ad-1346":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapText.mjs","moduleParts":{"dist/rapid.js":"72ad-1347"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1018"},{"uid":"72ad-1244"},{"uid":"72ad-1338"},{"uid":"72ad-1342"},{"uid":"72ad-1344"},{"uid":"72ad-1330"},{"uid":"72ad-1334"},{"uid":"72ad-1332"}],"importedBy":[{"uid":"72ad-1340"}]},"72ad-1348":{"id":"node_modules/@pixi/text-bitmap/lib/loadBitmapFont.mjs","moduleParts":{"dist/rapid.js":"72ad-1349"},"imported":[{"uid":"72ad-1156"},{"uid":"72ad-962"},{"uid":"72ad-1338"},{"uid":"72ad-1320"},{"uid":"72ad-1318"},{"uid":"72ad-1324"}],"importedBy":[{"uid":"72ad-1340"}]},"72ad-1350":{"id":"node_modules/@pixi/text-html/lib/HTMLTextStyle.mjs","moduleParts":{"dist/rapid.js":"72ad-1351"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1276"}],"importedBy":[{"uid":"72ad-1354"},{"uid":"72ad-1352"}]},"72ad-1352":{"id":"node_modules/@pixi/text-html/lib/HTMLText.mjs","moduleParts":{"dist/rapid.js":"72ad-1353"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1022"},{"uid":"72ad-1276"},{"uid":"72ad-1350"}],"importedBy":[{"uid":"72ad-1354"}]},"72ad-1354":{"id":"node_modules/@pixi/text-html/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1355"},"imported":[{"uid":"72ad-1352"},{"uid":"72ad-1350"}],"importedBy":[{"uid":"72ad-1076"}]},"72ad-1356":{"id":"modules/pixi/PixiEvents.js","moduleParts":{"dist/rapid.js":"72ad-1357"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-414"}],"importedBy":[{"uid":"72ad-1776"}]},"72ad-1358":{"id":"node_modules/@pixi/filter-adjustment/dist/filter-adjustment.mjs","moduleParts":{"dist/rapid.js":"72ad-1359"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1360":{"id":"node_modules/pixi-filters/dist/esm/pixi-filters.mjs","moduleParts":{"dist/rapid.js":"72ad-1361"},"imported":[{"uid":"72ad-1358"},{"uid":"72ad-1364"},{"uid":"72ad-1366"},{"uid":"72ad-1368"},{"uid":"72ad-1658"},{"uid":"72ad-1660"},{"uid":"72ad-1662"},{"uid":"72ad-1664"},{"uid":"72ad-1666"},{"uid":"72ad-1668"},{"uid":"72ad-1670"},{"uid":"72ad-1672"},{"uid":"72ad-1674"},{"uid":"72ad-1676"},{"uid":"72ad-1678"},{"uid":"72ad-1680"},{"uid":"72ad-1682"},{"uid":"72ad-1684"},{"uid":"72ad-1686"},{"uid":"72ad-1688"},{"uid":"72ad-1690"},{"uid":"72ad-1362"},{"uid":"72ad-1692"},{"uid":"72ad-1694"},{"uid":"72ad-1696"},{"uid":"72ad-1698"},{"uid":"72ad-1700"},{"uid":"72ad-1702"},{"uid":"72ad-1704"},{"uid":"72ad-1706"},{"uid":"72ad-1708"},{"uid":"72ad-1710"},{"uid":"72ad-1712"},{"uid":"72ad-1714"},{"uid":"72ad-1716"}],"importedBy":[{"uid":"72ad-1720"},{"uid":"72ad-1730"},{"uid":"72ad-1734"},{"uid":"72ad-1738"}]},"72ad-1362":{"id":"node_modules/@pixi/filter-kawase-blur/dist/filter-kawase-blur.mjs","moduleParts":{"dist/rapid.js":"72ad-1363"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"},{"uid":"72ad-1364"},{"uid":"72ad-1678"}]},"72ad-1364":{"id":"node_modules/@pixi/filter-advanced-bloom/dist/filter-advanced-bloom.mjs","moduleParts":{"dist/rapid.js":"72ad-1365"},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1362"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1366":{"id":"node_modules/@pixi/filter-ascii/dist/filter-ascii.mjs","moduleParts":{"dist/rapid.js":"72ad-1367"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1368":{"id":"node_modules/@pixi/filter-bevel/dist/filter-bevel.mjs","moduleParts":{"dist/rapid.js":"72ad-1369"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1370":{"id":"node_modules/pixi-filters/node_modules/@pixi/constants/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1371"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1432"},{"uid":"72ad-1442"},{"uid":"72ad-1508"},{"uid":"72ad-1522"},{"uid":"72ad-1514"},{"uid":"72ad-1546"},{"uid":"72ad-1548"},{"uid":"72ad-1526"},{"uid":"72ad-1552"},{"uid":"72ad-1550"},{"uid":"72ad-1632"},{"uid":"72ad-1436"},{"uid":"72ad-1434"},{"uid":"72ad-1440"},{"uid":"72ad-1554"},{"uid":"72ad-1564"},{"uid":"72ad-1566"},{"uid":"72ad-1640"},{"uid":"72ad-1528"},{"uid":"72ad-1540"},{"uid":"72ad-1488"},{"uid":"72ad-1490"},{"uid":"72ad-1474"},{"uid":"72ad-1418"},{"uid":"72ad-1598"},{"uid":"72ad-1430"},{"uid":"72ad-1604"},{"uid":"72ad-1602"},{"uid":"72ad-1608"},{"uid":"72ad-1530"},{"uid":"72ad-1644"},{"uid":"72ad-1428"},{"uid":"72ad-1650"},{"uid":"72ad-1652"},{"uid":"72ad-1532"},{"uid":"72ad-1394"},{"uid":"72ad-1524"},{"uid":"72ad-1484"},{"uid":"72ad-1476"},{"uid":"72ad-1596"},{"uid":"72ad-1606"}]},"72ad-1372":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/adapter.mjs","moduleParts":{"dist/rapid.js":"72ad-1373"},"imported":[],"importedBy":[{"uid":"72ad-1374"},{"uid":"72ad-1376"}]},"72ad-1374":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1375"},"imported":[{"uid":"72ad-1372"},{"uid":"72ad-2695"},{"uid":"72ad-2696"},{"uid":"72ad-1376"},{"uid":"72ad-1378"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1382"},{"uid":"72ad-1508"},{"uid":"72ad-1522"},{"uid":"72ad-1552"},{"uid":"72ad-1554"},{"uid":"72ad-1570"},{"uid":"72ad-1572"},{"uid":"72ad-1640"},{"uid":"72ad-1474"},{"uid":"72ad-1430"},{"uid":"72ad-1536"},{"uid":"72ad-1612"},{"uid":"72ad-1652"},{"uid":"72ad-1532"},{"uid":"72ad-1654"},{"uid":"72ad-1618"},{"uid":"72ad-1380"},{"uid":"72ad-2697"},{"uid":"72ad-1388"},{"uid":"72ad-2704"},{"uid":"72ad-1410"},{"uid":"72ad-1498"},{"uid":"72ad-1500"}]},"72ad-1376":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-1377"},"imported":[{"uid":"72ad-1372"}],"importedBy":[{"uid":"72ad-1374"}]},"72ad-1378":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/utils/isMobile.mjs","moduleParts":{"dist/rapid.js":"72ad-1379"},"imported":[{"uid":"72ad-572"}],"importedBy":[{"uid":"72ad-1374"}]},"72ad-1380":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-1381"},"imported":[{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1382"},{"uid":"72ad-1388"},{"uid":"72ad-1410"}]},"72ad-1382":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1383"},"imported":[{"uid":"72ad-1380"},{"uid":"72ad-1374"},{"uid":"72ad-8"},{"uid":"72ad-10"},{"uid":"72ad-1384"},{"uid":"72ad-2697"},{"uid":"72ad-2698"},{"uid":"72ad-1388"},{"uid":"72ad-2699"},{"uid":"72ad-1394"},{"uid":"72ad-2700"},{"uid":"72ad-2701"},{"uid":"72ad-1396"},{"uid":"72ad-2702"},{"uid":"72ad-1398"},{"uid":"72ad-1400"},{"uid":"72ad-2703"},{"uid":"72ad-1402"},{"uid":"72ad-1386"},{"uid":"72ad-1404"},{"uid":"72ad-1406"},{"uid":"72ad-2704"},{"uid":"72ad-2705"},{"uid":"72ad-2706"},{"uid":"72ad-2707"},{"uid":"72ad-1408"},{"uid":"72ad-1410"},{"uid":"72ad-2708"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1508"},{"uid":"72ad-1440"},{"uid":"72ad-1574"},{"uid":"72ad-1640"},{"uid":"72ad-1540"},{"uid":"72ad-1488"},{"uid":"72ad-1430"},{"uid":"72ad-1536"},{"uid":"72ad-1608"},{"uid":"72ad-1600"},{"uid":"72ad-1530"},{"uid":"72ad-1654"},{"uid":"72ad-1618"},{"uid":"72ad-1438"}]},"72ad-1384":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/url.mjs","moduleParts":{"dist/rapid.js":"72ad-1385"},"imported":[{"uid":"72ad-22"}],"importedBy":[{"uid":"72ad-1382"},{"uid":"72ad-1408"}]},"72ad-1386":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/logging/deprecation.mjs","moduleParts":{"dist/rapid.js":"72ad-1387"},"imported":[],"importedBy":[{"uid":"72ad-1382"},{"uid":"72ad-2698"},{"uid":"72ad-2699"},{"uid":"72ad-1394"}]},"72ad-1388":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/browser/isWebGLSupported.mjs","moduleParts":{"dist/rapid.js":"72ad-1389"},"imported":[{"uid":"72ad-1380"},{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1390":{"id":"node_modules/@pixi/color/lib/Color.mjs","moduleParts":{"dist/rapid.js":"72ad-1391"},"imported":[{"uid":"72ad-588"},{"uid":"72ad-590"}],"importedBy":[{"uid":"72ad-1392"}]},"72ad-1392":{"id":"node_modules/@pixi/color/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1393"},"imported":[{"uid":"72ad-1390"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1516"},{"uid":"72ad-1508"},{"uid":"72ad-1528"},{"uid":"72ad-1580"},{"uid":"72ad-2699"},{"uid":"72ad-1394"}]},"72ad-1394":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/color/premultiply.mjs","moduleParts":{"dist/rapid.js":"72ad-1395"},"imported":[{"uid":"72ad-1392"},{"uid":"72ad-1370"},{"uid":"72ad-1386"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1396":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/getBufferType.mjs","moduleParts":{"dist/rapid.js":"72ad-1397"},"imported":[],"importedBy":[{"uid":"72ad-1382"},{"uid":"72ad-2702"}]},"72ad-1398":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/pow2.mjs","moduleParts":{"dist/rapid.js":"72ad-1399"},"imported":[],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1400":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/removeItems.mjs","moduleParts":{"dist/rapid.js":"72ad-1401"},"imported":[],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1402":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/uid.mjs","moduleParts":{"dist/rapid.js":"72ad-1403"},"imported":[],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1404":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/BoundingBox.mjs","moduleParts":{"dist/rapid.js":"72ad-1405"},"imported":[],"importedBy":[{"uid":"72ad-1382"},{"uid":"72ad-2705"}]},"72ad-1406":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/caches.mjs","moduleParts":{"dist/rapid.js":"72ad-1407"},"imported":[],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1408":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/network/determineCrossOrigin.mjs","moduleParts":{"dist/rapid.js":"72ad-1409"},"imported":[{"uid":"72ad-1384"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1410":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/network/getResolutionOfUrl.mjs","moduleParts":{"dist/rapid.js":"72ad-1411"},"imported":[{"uid":"72ad-1380"},{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-1412":{"id":"node_modules/pixi-filters/node_modules/@pixi/extensions/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1413"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1630"},{"uid":"72ad-1516"},{"uid":"72ad-1508"},{"uid":"72ad-1520"},{"uid":"72ad-1522"},{"uid":"72ad-1548"},{"uid":"72ad-1552"},{"uid":"72ad-1632"},{"uid":"72ad-1636"},{"uid":"72ad-1554"},{"uid":"72ad-1566"},{"uid":"72ad-1570"},{"uid":"72ad-1572"},{"uid":"72ad-1574"},{"uid":"72ad-1576"},{"uid":"72ad-1638"},{"uid":"72ad-1640"},{"uid":"72ad-1578"},{"uid":"72ad-1580"},{"uid":"72ad-1592"},{"uid":"72ad-1594"},{"uid":"72ad-1598"},{"uid":"72ad-1602"},{"uid":"72ad-1608"},{"uid":"72ad-1610"},{"uid":"72ad-1612"},{"uid":"72ad-1628"}]},"72ad-1414":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/ViewableBuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-1415"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"}]},"72ad-1416":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/checkMaxIfStatementsInShader.mjs","moduleParts":{"dist/rapid.js":"72ad-1417"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"},{"uid":"72ad-1464"}]},"72ad-1418":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/state/State.mjs","moduleParts":{"dist/rapid.js":"72ad-1419"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"},{"uid":"72ad-1514"},{"uid":"72ad-1598"}]},"72ad-1420":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/autoDetectResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1421"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1430"},{"uid":"72ad-1646"},{"uid":"72ad-1642"}]},"72ad-1422":{"id":"node_modules/pixi-filters/node_modules/@pixi/runner/lib/Runner.mjs","moduleParts":{"dist/rapid.js":"72ad-1423"},"imported":[],"importedBy":[{"uid":"72ad-1424"}]},"72ad-1424":{"id":"node_modules/pixi-filters/node_modules/@pixi/runner/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1425"},"imported":[{"uid":"72ad-1422"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1526"},{"uid":"72ad-1434"},{"uid":"72ad-1440"},{"uid":"72ad-1492"},{"uid":"72ad-2687"},{"uid":"72ad-1600"},{"uid":"72ad-1426"}]},"72ad-1426":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/Resource.mjs","moduleParts":{"dist/rapid.js":"72ad-1427"},"imported":[{"uid":"72ad-1424"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1430"},{"uid":"72ad-1646"},{"uid":"72ad-1530"},{"uid":"72ad-1642"},{"uid":"72ad-1428"}]},"72ad-1428":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/BufferResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1429"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1426"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1430"},{"uid":"72ad-1646"},{"uid":"72ad-1524"}]},"72ad-1430":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/BaseTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-1431"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1374"},{"uid":"72ad-1382"},{"uid":"72ad-1420"},{"uid":"72ad-1428"},{"uid":"72ad-1426"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1508"},{"uid":"72ad-1526"},{"uid":"72ad-1528"},{"uid":"72ad-1536"},{"uid":"72ad-1608"},{"uid":"72ad-1642"}]},"72ad-1432":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchDrawCall.mjs","moduleParts":{"dist/rapid.js":"72ad-1433"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"}]},"72ad-1434":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/Buffer.mjs","moduleParts":{"dist/rapid.js":"72ad-1435"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1424"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1442"},{"uid":"72ad-1440"},{"uid":"72ad-1490"},{"uid":"72ad-1544"}]},"72ad-1436":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/Attribute.mjs","moduleParts":{"dist/rapid.js":"72ad-1437"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1440"}]},"72ad-1438":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/utils/interleaveTypedArrays.mjs","moduleParts":{"dist/rapid.js":"72ad-1439"},"imported":[{"uid":"72ad-1382"}],"importedBy":[{"uid":"72ad-1440"}]},"72ad-1440":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/Geometry.mjs","moduleParts":{"dist/rapid.js":"72ad-1441"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1424"},{"uid":"72ad-1382"},{"uid":"72ad-1436"},{"uid":"72ad-1434"},{"uid":"72ad-1438"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1442"},{"uid":"72ad-1542"},{"uid":"72ad-1544"}]},"72ad-1442":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchGeometry.mjs","moduleParts":{"dist/rapid.js":"72ad-1443"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1434"},{"uid":"72ad-1440"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"}]},"72ad-1444":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-1445"},"imported":[],"importedBy":[{"uid":"72ad-1450"},{"uid":"72ad-2689"},{"uid":"72ad-2690"},{"uid":"72ad-2691"},{"uid":"72ad-1448"},{"uid":"72ad-2692"},{"uid":"72ad-1452"}]},"72ad-1446":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/Point.mjs","moduleParts":{"dist/rapid.js":"72ad-1447"},"imported":[],"importedBy":[{"uid":"72ad-1450"},{"uid":"72ad-1448"},{"uid":"72ad-1452"}]},"72ad-1448":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Rectangle.mjs","moduleParts":{"dist/rapid.js":"72ad-1449"},"imported":[{"uid":"72ad-1444"},{"uid":"72ad-1446"}],"importedBy":[{"uid":"72ad-1450"},{"uid":"72ad-2689"},{"uid":"72ad-2690"}]},"72ad-1450":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1451"},"imported":[{"uid":"72ad-2689"},{"uid":"72ad-2690"},{"uid":"72ad-2691"},{"uid":"72ad-1448"},{"uid":"72ad-2692"},{"uid":"72ad-1454"},{"uid":"72ad-2693"},{"uid":"72ad-2694"},{"uid":"72ad-1452"},{"uid":"72ad-1456"},{"uid":"72ad-1446"},{"uid":"72ad-1458"},{"uid":"72ad-1444"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1494"},{"uid":"72ad-1546"},{"uid":"72ad-1548"},{"uid":"72ad-1562"},{"uid":"72ad-1552"},{"uid":"72ad-1570"},{"uid":"72ad-1576"},{"uid":"72ad-1640"},{"uid":"72ad-1578"},{"uid":"72ad-1580"},{"uid":"72ad-1536"},{"uid":"72ad-1556"},{"uid":"72ad-1534"},{"uid":"72ad-1612"}]},"72ad-1452":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/Matrix.mjs","moduleParts":{"dist/rapid.js":"72ad-1453"},"imported":[{"uid":"72ad-1444"},{"uid":"72ad-1446"}],"importedBy":[{"uid":"72ad-1450"},{"uid":"72ad-1454"},{"uid":"72ad-1458"}]},"72ad-1454":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/groupD8.mjs","moduleParts":{"dist/rapid.js":"72ad-1455"},"imported":[{"uid":"72ad-1452"}],"importedBy":[{"uid":"72ad-1450"}]},"72ad-1456":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/ObservablePoint.mjs","moduleParts":{"dist/rapid.js":"72ad-1457"},"imported":[],"importedBy":[{"uid":"72ad-1450"},{"uid":"72ad-1458"}]},"72ad-1458":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/Transform.mjs","moduleParts":{"dist/rapid.js":"72ad-1459"},"imported":[{"uid":"72ad-1452"},{"uid":"72ad-1456"}],"importedBy":[{"uid":"72ad-1450"}]},"72ad-1460":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/defaultProgram.mjs","moduleParts":{"dist/rapid.js":"72ad-1461"},"imported":[],"importedBy":[{"uid":"72ad-1488"}]},"72ad-1462":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/defaultProgram2.mjs","moduleParts":{"dist/rapid.js":"72ad-1463"},"imported":[],"importedBy":[{"uid":"72ad-1488"}]},"72ad-1464":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1465"},"imported":[{"uid":"72ad-1416"},{"uid":"72ad-1466"},{"uid":"72ad-1468"},{"uid":"72ad-1472"},{"uid":"72ad-1476"},{"uid":"72ad-1474"},{"uid":"72ad-1478"},{"uid":"72ad-1480"},{"uid":"72ad-1482"},{"uid":"72ad-1484"},{"uid":"72ad-1470"},{"uid":"72ad-1486"}],"importedBy":[{"uid":"72ad-1488"},{"uid":"72ad-1592"},{"uid":"72ad-1590"}]},"72ad-1466":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/compileShader.mjs","moduleParts":{"dist/rapid.js":"72ad-1467"},"imported":[],"importedBy":[{"uid":"72ad-1588"},{"uid":"72ad-1464"}]},"72ad-1468":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/defaultValue.mjs","moduleParts":{"dist/rapid.js":"72ad-1469"},"imported":[],"importedBy":[{"uid":"72ad-1588"},{"uid":"72ad-1464"},{"uid":"72ad-1586"}]},"72ad-1470":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/uniformParsers.mjs","moduleParts":{"dist/rapid.js":"72ad-1471"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1590"},{"uid":"72ad-1464"},{"uid":"72ad-1472"}]},"72ad-1472":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/generateUniformsSync.mjs","moduleParts":{"dist/rapid.js":"72ad-1473"},"imported":[{"uid":"72ad-1470"}],"importedBy":[{"uid":"72ad-1592"},{"uid":"72ad-1464"}]},"72ad-1474":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getTestContext.mjs","moduleParts":{"dist/rapid.js":"72ad-1475"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1464"},{"uid":"72ad-1476"}]},"72ad-1476":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getMaxFragmentPrecision.mjs","moduleParts":{"dist/rapid.js":"72ad-1477"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1474"}],"importedBy":[{"uid":"72ad-1488"},{"uid":"72ad-1464"}]},"72ad-1478":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/logProgramError.mjs","moduleParts":{"dist/rapid.js":"72ad-1479"},"imported":[],"importedBy":[{"uid":"72ad-1588"},{"uid":"72ad-1464"}]},"72ad-1480":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/mapSize.mjs","moduleParts":{"dist/rapid.js":"72ad-1481"},"imported":[],"importedBy":[{"uid":"72ad-1590"},{"uid":"72ad-1464"},{"uid":"72ad-1584"}]},"72ad-1482":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/mapType.mjs","moduleParts":{"dist/rapid.js":"72ad-1483"},"imported":[],"importedBy":[{"uid":"72ad-1464"},{"uid":"72ad-1584"},{"uid":"72ad-1586"}]},"72ad-1484":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/setPrecision.mjs","moduleParts":{"dist/rapid.js":"72ad-1485"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1488"},{"uid":"72ad-1464"}]},"72ad-1486":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/unsafeEvalSupported.mjs","moduleParts":{"dist/rapid.js":"72ad-1487"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1592"},{"uid":"72ad-1464"}]},"72ad-1488":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/Program.mjs","moduleParts":{"dist/rapid.js":"72ad-1489"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1382"},{"uid":"72ad-1460"},{"uid":"72ad-1462"},{"uid":"72ad-1464"},{"uid":"72ad-1484"},{"uid":"72ad-1476"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1494"},{"uid":"72ad-1514"},{"uid":"72ad-1492"}]},"72ad-1490":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/UniformGroup.mjs","moduleParts":{"dist/rapid.js":"72ad-1491"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1434"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1494"},{"uid":"72ad-1548"},{"uid":"72ad-1640"},{"uid":"72ad-1492"}]},"72ad-1492":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/Shader.mjs","moduleParts":{"dist/rapid.js":"72ad-1493"},"imported":[{"uid":"72ad-1424"},{"uid":"72ad-1488"},{"uid":"72ad-1490"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1494"},{"uid":"72ad-1514"}]},"72ad-1494":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchShaderGenerator.mjs","moduleParts":{"dist/rapid.js":"72ad-1495"},"imported":[{"uid":"72ad-1450"},{"uid":"72ad-1488"},{"uid":"72ad-1492"},{"uid":"72ad-1490"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"}]},"72ad-1496":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchTextureArray.mjs","moduleParts":{"dist/rapid.js":"72ad-1497"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"}]},"72ad-1498":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/canUploadSameBuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-1499"},"imported":[{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1508"}]},"72ad-1500":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/maxRecommendedTextures.mjs","moduleParts":{"dist/rapid.js":"72ad-1501"},"imported":[{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1508"}]},"72ad-1502":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/ObjectRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-1503"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1508"},{"uid":"72ad-1520"}]},"72ad-1504":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/texture.mjs","moduleParts":{"dist/rapid.js":"72ad-1505"},"imported":[],"importedBy":[{"uid":"72ad-1508"}]},"72ad-1506":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/texture2.mjs","moduleParts":{"dist/rapid.js":"72ad-1507"},"imported":[],"importedBy":[{"uid":"72ad-1508"}]},"72ad-1508":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-1509"},"imported":[{"uid":"72ad-1392"},{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1374"},{"uid":"72ad-1382"},{"uid":"72ad-1414"},{"uid":"72ad-1416"},{"uid":"72ad-1418"},{"uid":"72ad-1430"},{"uid":"72ad-1432"},{"uid":"72ad-1442"},{"uid":"72ad-1494"},{"uid":"72ad-1496"},{"uid":"72ad-1498"},{"uid":"72ad-1500"},{"uid":"72ad-1502"},{"uid":"72ad-1504"},{"uid":"72ad-1506"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"}]},"72ad-1510":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/defaultFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1511"},"imported":[],"importedBy":[{"uid":"72ad-1514"}]},"72ad-1512":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/defaultFilter2.mjs","moduleParts":{"dist/rapid.js":"72ad-1513"},"imported":[],"importedBy":[{"uid":"72ad-1514"}]},"72ad-1514":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/Filter.mjs","moduleParts":{"dist/rapid.js":"72ad-1515"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1488"},{"uid":"72ad-1492"},{"uid":"72ad-1418"},{"uid":"72ad-1510"},{"uid":"72ad-1512"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1562"},{"uid":"72ad-1564"}]},"72ad-1516":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/background/BackgroundSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1517"},"imported":[{"uid":"72ad-1392"},{"uid":"72ad-1412"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1518"}]},"72ad-1518":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/systems.mjs","moduleParts":{"dist/rapid.js":"72ad-1519"},"imported":[{"uid":"72ad-1516"},{"uid":"72ad-1520"},{"uid":"72ad-1522"},{"uid":"72ad-1548"},{"uid":"72ad-1552"},{"uid":"72ad-1554"},{"uid":"72ad-1566"},{"uid":"72ad-1570"},{"uid":"72ad-1572"},{"uid":"72ad-1574"},{"uid":"72ad-1576"},{"uid":"72ad-1578"},{"uid":"72ad-1580"},{"uid":"72ad-1592"},{"uid":"72ad-1594"},{"uid":"72ad-1598"},{"uid":"72ad-1600"},{"uid":"72ad-1602"},{"uid":"72ad-1608"},{"uid":"72ad-1610"},{"uid":"72ad-1612"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"}]},"72ad-1520":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/batch/BatchSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1521"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1502"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1522":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/context/ContextSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1523"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1518"}]},"72ad-1524":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/DepthResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1525"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1428"}],"importedBy":[{"uid":"72ad-1526"}]},"72ad-1526":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/Framebuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-1527"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1424"},{"uid":"72ad-1430"},{"uid":"72ad-1524"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1552"},{"uid":"72ad-1528"}]},"72ad-1528":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/BaseRenderTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-1529"},"imported":[{"uid":"72ad-1392"},{"uid":"72ad-1370"},{"uid":"72ad-1526"},{"uid":"72ad-1430"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1538"},{"uid":"72ad-1540"}]},"72ad-1530":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/BaseImageResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1531"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1382"},{"uid":"72ad-1426"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"},{"uid":"72ad-1648"},{"uid":"72ad-1652"},{"uid":"72ad-1532"},{"uid":"72ad-1654"},{"uid":"72ad-1656"}]},"72ad-1532":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/ImageResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1533"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1374"},{"uid":"72ad-1530"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"},{"uid":"72ad-1536"}]},"72ad-1534":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureUvs.mjs","moduleParts":{"dist/rapid.js":"72ad-1535"},"imported":[{"uid":"72ad-1450"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1536"}]},"72ad-1536":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/Texture.mjs","moduleParts":{"dist/rapid.js":"72ad-1537"},"imported":[{"uid":"72ad-1450"},{"uid":"72ad-1374"},{"uid":"72ad-1382"},{"uid":"72ad-1430"},{"uid":"72ad-1532"},{"uid":"72ad-1534"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1538"}]},"72ad-1538":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/RenderTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-1539"},"imported":[{"uid":"72ad-1536"},{"uid":"72ad-1528"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1578"},{"uid":"72ad-1540"}]},"72ad-1540":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/RenderTexturePool.mjs","moduleParts":{"dist/rapid.js":"72ad-1541"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1382"},{"uid":"72ad-1528"},{"uid":"72ad-1538"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1548"}]},"72ad-1542":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/utils/Quad.mjs","moduleParts":{"dist/rapid.js":"72ad-1543"},"imported":[{"uid":"72ad-1440"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1548"}]},"72ad-1544":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/utils/QuadUv.mjs","moduleParts":{"dist/rapid.js":"72ad-1545"},"imported":[{"uid":"72ad-1434"},{"uid":"72ad-1440"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1548"}]},"72ad-1546":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/FilterState.mjs","moduleParts":{"dist/rapid.js":"72ad-1547"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1450"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1548"}]},"72ad-1548":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/FilterSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1549"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1450"},{"uid":"72ad-1540"},{"uid":"72ad-1490"},{"uid":"72ad-1542"},{"uid":"72ad-1544"},{"uid":"72ad-1546"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1550":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/GLFramebuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-1551"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1552"}]},"72ad-1552":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/FramebufferSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1553"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1450"},{"uid":"72ad-1374"},{"uid":"72ad-1526"},{"uid":"72ad-1550"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1554":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/GeometrySystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1555"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1556":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureMatrix.mjs","moduleParts":{"dist/rapid.js":"72ad-1557"},"imported":[{"uid":"72ad-1450"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1562"}]},"72ad-1558":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter2.mjs","moduleParts":{"dist/rapid.js":"72ad-1559"},"imported":[],"importedBy":[{"uid":"72ad-1562"}]},"72ad-1560":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/spriteMask/spriteMaskFilter3.mjs","moduleParts":{"dist/rapid.js":"72ad-1561"},"imported":[],"importedBy":[{"uid":"72ad-1562"}]},"72ad-1562":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/spriteMask/SpriteMaskFilter.mjs","moduleParts":{"dist/rapid.js":"72ad-1563"},"imported":[{"uid":"72ad-1450"},{"uid":"72ad-1556"},{"uid":"72ad-1514"},{"uid":"72ad-1558"},{"uid":"72ad-1560"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1566"}]},"72ad-1564":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/MaskData.mjs","moduleParts":{"dist/rapid.js":"72ad-1565"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1514"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1566"}]},"72ad-1566":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/MaskSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1567"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1562"},{"uid":"72ad-1564"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1568":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/AbstractMaskSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1569"},"imported":[],"importedBy":[{"uid":"72ad-1570"},{"uid":"72ad-1572"}]},"72ad-1570":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/ScissorSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1571"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1450"},{"uid":"72ad-1374"},{"uid":"72ad-1568"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1572":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/mask/StencilSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1573"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1374"},{"uid":"72ad-1568"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1574":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/plugin/PluginSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1575"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1382"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1576":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/projection/ProjectionSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1577"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1450"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1578":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/GenerateTextureSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1579"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1450"},{"uid":"72ad-1538"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1580":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/renderTexture/RenderTextureSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1581"},"imported":[{"uid":"72ad-1392"},{"uid":"72ad-1412"},{"uid":"72ad-1450"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1582":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/GLProgram.mjs","moduleParts":{"dist/rapid.js":"72ad-1583"},"imported":[],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1588"}]},"72ad-1584":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getAttributeData.mjs","moduleParts":{"dist/rapid.js":"72ad-1585"},"imported":[{"uid":"72ad-1480"},{"uid":"72ad-1482"}],"importedBy":[{"uid":"72ad-1588"}]},"72ad-1586":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/getUniformData.mjs","moduleParts":{"dist/rapid.js":"72ad-1587"},"imported":[{"uid":"72ad-1468"},{"uid":"72ad-1482"}],"importedBy":[{"uid":"72ad-1588"}]},"72ad-1588":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/generateProgram.mjs","moduleParts":{"dist/rapid.js":"72ad-1589"},"imported":[{"uid":"72ad-1582"},{"uid":"72ad-1466"},{"uid":"72ad-1468"},{"uid":"72ad-1584"},{"uid":"72ad-1586"},{"uid":"72ad-1478"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1592"}]},"72ad-1590":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/utils/generateUniformBufferSync.mjs","moduleParts":{"dist/rapid.js":"72ad-1591"},"imported":[{"uid":"72ad-1464"},{"uid":"72ad-1470"},{"uid":"72ad-1480"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1592"}]},"72ad-1592":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/shader/ShaderSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1593"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1464"},{"uid":"72ad-1588"},{"uid":"72ad-1590"},{"uid":"72ad-1486"},{"uid":"72ad-1472"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1594":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/startup/StartupSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1595"},"imported":[{"uid":"72ad-1412"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1518"}]},"72ad-1596":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/state/utils/mapWebGLBlendModesToPixi.mjs","moduleParts":{"dist/rapid.js":"72ad-1597"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1598"}]},"72ad-1598":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/state/StateSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1599"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1418"},{"uid":"72ad-1596"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1600":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/system/SystemManager.mjs","moduleParts":{"dist/rapid.js":"72ad-1601"},"imported":[{"uid":"72ad-1424"},{"uid":"72ad-1382"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1640"},{"uid":"72ad-1518"}]},"72ad-1602":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureGCSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1603"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1518"}]},"72ad-1604":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/GLTexture.mjs","moduleParts":{"dist/rapid.js":"72ad-1605"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1608"}]},"72ad-1606":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/utils/mapTypeAndFormatToInternalFormat.mjs","moduleParts":{"dist/rapid.js":"72ad-1607"},"imported":[{"uid":"72ad-1370"}],"importedBy":[{"uid":"72ad-1608"}]},"72ad-1608":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/TextureSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1609"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1382"},{"uid":"72ad-1430"},{"uid":"72ad-1604"},{"uid":"72ad-1606"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1610":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/transformFeedback/TransformFeedbackSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1611"},"imported":[{"uid":"72ad-1412"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1518"}]},"72ad-1612":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/view/ViewSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1613"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1450"},{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1614"},{"uid":"72ad-1518"}]},"72ad-1614":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-1615"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1374"},{"uid":"72ad-1382"},{"uid":"72ad-1508"},{"uid":"72ad-1514"},{"uid":"72ad-1488"},{"uid":"72ad-1518"},{"uid":"72ad-1430"},{"uid":"72ad-1522"},{"uid":"72ad-1516"},{"uid":"72ad-1612"},{"uid":"72ad-1594"},{"uid":"72ad-1602"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-1616":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1617"},"imported":[{"uid":"72ad-1614"},{"uid":"72ad-1392"},{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1450"},{"uid":"72ad-1424"},{"uid":"72ad-1374"},{"uid":"72ad-1626"},{"uid":"72ad-1382"},{"uid":"72ad-1630"},{"uid":"72ad-1516"},{"uid":"72ad-1432"},{"uid":"72ad-1442"},{"uid":"72ad-1508"},{"uid":"72ad-1494"},{"uid":"72ad-1520"},{"uid":"72ad-1496"},{"uid":"72ad-1502"},{"uid":"72ad-1522"},{"uid":"72ad-1514"},{"uid":"72ad-1546"},{"uid":"72ad-1548"},{"uid":"72ad-2683"},{"uid":"72ad-1562"},{"uid":"72ad-2684"},{"uid":"72ad-1526"},{"uid":"72ad-1552"},{"uid":"72ad-1550"},{"uid":"72ad-1632"},{"uid":"72ad-1436"},{"uid":"72ad-1434"},{"uid":"72ad-1636"},{"uid":"72ad-1440"},{"uid":"72ad-1554"},{"uid":"72ad-1414"},{"uid":"72ad-2685"},{"uid":"72ad-1564"},{"uid":"72ad-1566"},{"uid":"72ad-1570"},{"uid":"72ad-1572"},{"uid":"72ad-1574"},{"uid":"72ad-1576"},{"uid":"72ad-1638"},{"uid":"72ad-1640"},{"uid":"72ad-1528"},{"uid":"72ad-1578"},{"uid":"72ad-1538"},{"uid":"72ad-1540"},{"uid":"72ad-1580"},{"uid":"72ad-1582"},{"uid":"72ad-1488"},{"uid":"72ad-1492"},{"uid":"72ad-1592"},{"uid":"72ad-1490"},{"uid":"72ad-1416"},{"uid":"72ad-1588"},{"uid":"72ad-1590"},{"uid":"72ad-1474"},{"uid":"72ad-1470"},{"uid":"72ad-1486"},{"uid":"72ad-1594"},{"uid":"72ad-1418"},{"uid":"72ad-1598"},{"uid":"72ad-2686"},{"uid":"72ad-1518"},{"uid":"72ad-1430"},{"uid":"72ad-1604"},{"uid":"72ad-1646"},{"uid":"72ad-1536"},{"uid":"72ad-1602"},{"uid":"72ad-1556"},{"uid":"72ad-1608"},{"uid":"72ad-1534"},{"uid":"72ad-2687"},{"uid":"72ad-1610"},{"uid":"72ad-1542"},{"uid":"72ad-1544"},{"uid":"72ad-1612"},{"uid":"72ad-1600"},{"uid":"72ad-1530"},{"uid":"72ad-1426"},{"uid":"72ad-1642"},{"uid":"72ad-1644"},{"uid":"72ad-1420"},{"uid":"72ad-1428"},{"uid":"72ad-1648"},{"uid":"72ad-1650"},{"uid":"72ad-1652"},{"uid":"72ad-1532"},{"uid":"72ad-1654"},{"uid":"72ad-1656"}],"importedBy":[{"uid":"72ad-1658"}]},"72ad-1618":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/settings.mjs","moduleParts":{"dist/rapid.js":"72ad-1619"},"imported":[{"uid":"72ad-1374"},{"uid":"72ad-1382"},{"uid":"72ad-1624"}],"importedBy":[{"uid":"72ad-1626"}]},"72ad-1620":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/const.mjs","moduleParts":{"dist/rapid.js":"72ad-1621"},"imported":[],"importedBy":[{"uid":"72ad-1626"},{"uid":"72ad-1624"},{"uid":"72ad-1628"}]},"72ad-1622":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/TickerListener.mjs","moduleParts":{"dist/rapid.js":"72ad-1623"},"imported":[],"importedBy":[{"uid":"72ad-1624"}]},"72ad-1624":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/Ticker.mjs","moduleParts":{"dist/rapid.js":"72ad-1625"},"imported":[{"uid":"72ad-1620"},{"uid":"72ad-1622"}],"importedBy":[{"uid":"72ad-1626"},{"uid":"72ad-1618"},{"uid":"72ad-1628"}]},"72ad-1626":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1627"},"imported":[{"uid":"72ad-1618"},{"uid":"72ad-1620"},{"uid":"72ad-1624"},{"uid":"72ad-1628"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1656"}]},"72ad-1628":{"id":"node_modules/pixi-filters/node_modules/@pixi/ticker/lib/TickerPlugin.mjs","moduleParts":{"dist/rapid.js":"72ad-1629"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1620"},{"uid":"72ad-1624"}],"importedBy":[{"uid":"72ad-1626"}]},"72ad-1630":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/autoDetectRenderer.mjs","moduleParts":{"dist/rapid.js":"72ad-1631"},"imported":[{"uid":"72ad-1412"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-1632":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/framebuffer/MultisampleSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1633"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-1634":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/GLBuffer.mjs","moduleParts":{"dist/rapid.js":"72ad-1635"},"imported":[],"importedBy":[{"uid":"72ad-1636"}]},"72ad-1636":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/geometry/BufferSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1637"},"imported":[{"uid":"72ad-1412"},{"uid":"72ad-1634"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-1638":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/render/ObjectRendererSystem.mjs","moduleParts":{"dist/rapid.js":"72ad-1639"},"imported":[{"uid":"72ad-1412"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-1640":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/Renderer.mjs","moduleParts":{"dist/rapid.js":"72ad-1641"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1412"},{"uid":"72ad-1450"},{"uid":"72ad-1374"},{"uid":"72ad-1382"},{"uid":"72ad-1490"},{"uid":"72ad-1600"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-1642":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/AbstractMultiResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1643"},"imported":[{"uid":"72ad-1430"},{"uid":"72ad-1420"},{"uid":"72ad-1426"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"},{"uid":"72ad-1644"},{"uid":"72ad-1650"}]},"72ad-1644":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/ArrayResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1645"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1642"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"}]},"72ad-1646":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/index.mjs","moduleParts":{"dist/rapid.js":"72ad-1647"},"imported":[{"uid":"72ad-1644"},{"uid":"72ad-1420"},{"uid":"72ad-1428"},{"uid":"72ad-1648"},{"uid":"72ad-1650"},{"uid":"72ad-1652"},{"uid":"72ad-1532"},{"uid":"72ad-1654"},{"uid":"72ad-1656"},{"uid":"72ad-1530"},{"uid":"72ad-1426"},{"uid":"72ad-1642"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-1648":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/CanvasResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1649"},"imported":[{"uid":"72ad-1530"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"}]},"72ad-1650":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/CubeResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1651"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1642"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"}]},"72ad-1652":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/ImageBitmapResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1653"},"imported":[{"uid":"72ad-1370"},{"uid":"72ad-1374"},{"uid":"72ad-1530"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"}]},"72ad-1654":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/SVGResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1655"},"imported":[{"uid":"72ad-1374"},{"uid":"72ad-1382"},{"uid":"72ad-1530"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"}]},"72ad-1656":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/textures/resources/VideoResource.mjs","moduleParts":{"dist/rapid.js":"72ad-1657"},"imported":[{"uid":"72ad-1626"},{"uid":"72ad-1530"}],"importedBy":[{"uid":"72ad-1616"},{"uid":"72ad-1646"}]},"72ad-1658":{"id":"node_modules/pixi-filters/node_modules/@pixi/filter-bloom/dist/filter-bloom.mjs","moduleParts":{"dist/rapid.js":"72ad-1659"},"imported":[{"uid":"72ad-1616"},{"uid":"72ad-1034"},{"uid":"72ad-1044"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1660":{"id":"node_modules/@pixi/filter-bulge-pinch/dist/filter-bulge-pinch.mjs","moduleParts":{"dist/rapid.js":"72ad-1661"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1662":{"id":"node_modules/@pixi/filter-color-gradient/dist/filter-color-gradient.mjs","moduleParts":{"dist/rapid.js":"72ad-1663"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1664":{"id":"node_modules/@pixi/filter-color-map/dist/filter-color-map.mjs","moduleParts":{"dist/rapid.js":"72ad-1665"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1666":{"id":"node_modules/@pixi/filter-color-overlay/dist/filter-color-overlay.mjs","moduleParts":{"dist/rapid.js":"72ad-1667"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1668":{"id":"node_modules/@pixi/filter-color-replace/dist/filter-color-replace.mjs","moduleParts":{"dist/rapid.js":"72ad-1669"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1670":{"id":"node_modules/@pixi/filter-convolution/dist/filter-convolution.mjs","moduleParts":{"dist/rapid.js":"72ad-1671"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1672":{"id":"node_modules/@pixi/filter-cross-hatch/dist/filter-cross-hatch.mjs","moduleParts":{"dist/rapid.js":"72ad-1673"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1674":{"id":"node_modules/@pixi/filter-crt/dist/filter-crt.mjs","moduleParts":{"dist/rapid.js":"72ad-1675"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1676":{"id":"node_modules/@pixi/filter-dot/dist/filter-dot.mjs","moduleParts":{"dist/rapid.js":"72ad-1677"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1678":{"id":"node_modules/@pixi/filter-drop-shadow/dist/filter-drop-shadow.mjs","moduleParts":{"dist/rapid.js":"72ad-1679"},"imported":[{"uid":"72ad-1362"},{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1680":{"id":"node_modules/@pixi/filter-emboss/dist/filter-emboss.mjs","moduleParts":{"dist/rapid.js":"72ad-1681"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1682":{"id":"node_modules/@pixi/filter-glitch/dist/filter-glitch.mjs","moduleParts":{"dist/rapid.js":"72ad-1683"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1684":{"id":"node_modules/@pixi/filter-glow/dist/filter-glow.mjs","moduleParts":{"dist/rapid.js":"72ad-1685"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1686":{"id":"node_modules/@pixi/filter-godray/dist/filter-godray.mjs","moduleParts":{"dist/rapid.js":"72ad-1687"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1688":{"id":"node_modules/@pixi/filter-grayscale/dist/filter-grayscale.mjs","moduleParts":{"dist/rapid.js":"72ad-1689"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1690":{"id":"node_modules/@pixi/filter-hsl-adjustment/dist/filter-hsl-adjustment.mjs","moduleParts":{"dist/rapid.js":"72ad-1691"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1692":{"id":"node_modules/@pixi/filter-motion-blur/dist/filter-motion-blur.mjs","moduleParts":{"dist/rapid.js":"72ad-1693"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1694":{"id":"node_modules/@pixi/filter-multi-color-replace/dist/filter-multi-color-replace.mjs","moduleParts":{"dist/rapid.js":"72ad-1695"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1696":{"id":"node_modules/@pixi/filter-old-film/dist/filter-old-film.mjs","moduleParts":{"dist/rapid.js":"72ad-1697"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1698":{"id":"node_modules/@pixi/filter-outline/dist/filter-outline.mjs","moduleParts":{"dist/rapid.js":"72ad-1699"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1700":{"id":"node_modules/@pixi/filter-pixelate/dist/filter-pixelate.mjs","moduleParts":{"dist/rapid.js":"72ad-1701"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1702":{"id":"node_modules/@pixi/filter-radial-blur/dist/filter-radial-blur.mjs","moduleParts":{"dist/rapid.js":"72ad-1703"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1704":{"id":"node_modules/@pixi/filter-reflection/dist/filter-reflection.mjs","moduleParts":{"dist/rapid.js":"72ad-1705"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1706":{"id":"node_modules/@pixi/filter-rgb-split/dist/filter-rgb-split.mjs","moduleParts":{"dist/rapid.js":"72ad-1707"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1708":{"id":"node_modules/@pixi/filter-shockwave/dist/filter-shockwave.mjs","moduleParts":{"dist/rapid.js":"72ad-1709"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1710":{"id":"node_modules/@pixi/filter-simple-lightmap/dist/filter-simple-lightmap.mjs","moduleParts":{"dist/rapid.js":"72ad-1711"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1712":{"id":"node_modules/@pixi/filter-tilt-shift/dist/filter-tilt-shift.mjs","moduleParts":{"dist/rapid.js":"72ad-1713"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1714":{"id":"node_modules/@pixi/filter-twist/dist/filter-twist.mjs","moduleParts":{"dist/rapid.js":"72ad-1715"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1716":{"id":"node_modules/@pixi/filter-zoom-blur/dist/filter-zoom-blur.mjs","moduleParts":{"dist/rapid.js":"72ad-1717"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1360"}]},"72ad-1718":{"id":"modules/pixi/AbstractLayer.js","moduleParts":{"dist/rapid.js":"72ad-1719"},"imported":[],"importedBy":[{"uid":"72ad-1720"},{"uid":"72ad-1732"},{"uid":"72ad-1736"},{"uid":"72ad-1740"},{"uid":"72ad-1742"},{"uid":"72ad-1744"},{"uid":"72ad-1746"},{"uid":"72ad-1748"},{"uid":"72ad-1750"},{"uid":"72ad-1752"},{"uid":"72ad-1756"},{"uid":"72ad-1758"},{"uid":"72ad-1760"},{"uid":"72ad-1762"},{"uid":"72ad-1764"},{"uid":"72ad-1766"}]},"72ad-1720":{"id":"modules/pixi/PixiLayerBackgroundTiles.js","moduleParts":{"dist/rapid.js":"72ad-1721"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-318"},{"uid":"72ad-1360"},{"uid":"72ad-408"},{"uid":"72ad-1718"}],"importedBy":[{"uid":"72ad-1960"},{"uid":"72ad-1770"}]},"72ad-1722":{"id":"node_modules/@rapideditor/pixi-dashed-line/dist/pixi-dashed-line.mjs","moduleParts":{"dist/rapid.js":"72ad-1723"},"imported":[{"uid":"72ad-962"}],"importedBy":[{"uid":"72ad-1762"},{"uid":"72ad-1730"},{"uid":"72ad-1734"},{"uid":"72ad-1738"}]},"72ad-1724":{"id":"modules/pixi/PixiGeometry.js","moduleParts":{"dist/rapid.js":"72ad-1725"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-164"},{"uid":"72ad-58"}],"importedBy":[{"uid":"72ad-1726"}]},"72ad-1726":{"id":"modules/pixi/AbstractFeature.js","moduleParts":{"dist/rapid.js":"72ad-1727"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-1724"}],"importedBy":[{"uid":"72ad-1730"},{"uid":"72ad-1734"},{"uid":"72ad-1738"}]},"72ad-1728":{"id":"modules/pixi/helpers.js","moduleParts":{"dist/rapid.js":"72ad-1729"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-1744"},{"uid":"72ad-1730"},{"uid":"72ad-1738"}]},"72ad-1730":{"id":"modules/pixi/PixiFeaturePolygon.js","moduleParts":{"dist/rapid.js":"72ad-1731"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-1722"},{"uid":"72ad-1360"},{"uid":"72ad-408"},{"uid":"72ad-1726"},{"uid":"72ad-1728"}],"importedBy":[{"uid":"72ad-1732"},{"uid":"72ad-1752"},{"uid":"72ad-1760"},{"uid":"72ad-1766"}]},"72ad-1732":{"id":"modules/pixi/PixiLayerEditBlocks.js","moduleParts":{"dist/rapid.js":"72ad-1733"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1730"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1734":{"id":"modules/pixi/PixiFeaturePoint.js","moduleParts":{"dist/rapid.js":"72ad-1735"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-1722"},{"uid":"72ad-1360"},{"uid":"72ad-1726"}],"importedBy":[{"uid":"72ad-1736"},{"uid":"72ad-1740"},{"uid":"72ad-1742"},{"uid":"72ad-1746"},{"uid":"72ad-1748"},{"uid":"72ad-1750"},{"uid":"72ad-1752"},{"uid":"72ad-1756"},{"uid":"72ad-1758"},{"uid":"72ad-1760"},{"uid":"72ad-1764"},{"uid":"72ad-1766"}]},"72ad-1736":{"id":"modules/pixi/PixiLayerImproveOsm.js","moduleParts":{"dist/rapid.js":"72ad-1737"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1738":{"id":"modules/pixi/PixiFeatureLine.js","moduleParts":{"dist/rapid.js":"72ad-1739"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-1722"},{"uid":"72ad-1360"},{"uid":"72ad-1726"},{"uid":"72ad-1728"}],"importedBy":[{"uid":"72ad-1740"},{"uid":"72ad-1748"},{"uid":"72ad-1752"},{"uid":"72ad-1760"},{"uid":"72ad-1764"},{"uid":"72ad-1766"}]},"72ad-1740":{"id":"modules/pixi/PixiLayerKartaPhotos.js","moduleParts":{"dist/rapid.js":"72ad-1741"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1738"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1742":{"id":"modules/pixi/PixiLayerKeepRight.js","moduleParts":{"dist/rapid.js":"72ad-1743"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1744":{"id":"modules/pixi/PixiLayerLabels.js","moduleParts":{"dist/rapid.js":"72ad-1745"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-6"},{"uid":"72ad-408"},{"uid":"72ad-1718"},{"uid":"72ad-1728"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1746":{"id":"modules/pixi/PixiLayerMapillaryFeatures.js","moduleParts":{"dist/rapid.js":"72ad-1747"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1748":{"id":"modules/pixi/PixiLayerMapillaryPhotos.js","moduleParts":{"dist/rapid.js":"72ad-1749"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1738"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1750":{"id":"modules/pixi/PixiLayerMapillarySigns.js","moduleParts":{"dist/rapid.js":"72ad-1751"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1752":{"id":"modules/pixi/PixiLayerOsm.js","moduleParts":{"dist/rapid.js":"72ad-1753"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-60"},{"uid":"72ad-408"},{"uid":"72ad-1718"},{"uid":"72ad-1738"},{"uid":"72ad-1734"},{"uid":"72ad-1730"},{"uid":"72ad-1754"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1754":{"id":"modules/pixi/styles.js","moduleParts":{"dist/rapid.js":"72ad-1755"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-116"}],"importedBy":[{"uid":"72ad-1958"},{"uid":"72ad-1876"},{"uid":"72ad-1752"}]},"72ad-1756":{"id":"modules/pixi/PixiLayerOsmNotes.js","moduleParts":{"dist/rapid.js":"72ad-1757"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1758":{"id":"modules/pixi/PixiLayerOsmose.js","moduleParts":{"dist/rapid.js":"72ad-1759"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1760":{"id":"modules/pixi/PixiLayerRapid.js","moduleParts":{"dist/rapid.js":"72ad-1761"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-60"},{"uid":"72ad-1718"},{"uid":"72ad-1738"},{"uid":"72ad-1734"},{"uid":"72ad-1730"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1762":{"id":"modules/pixi/PixiLayerMapUI.js","moduleParts":{"dist/rapid.js":"72ad-1763"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-408"},{"uid":"72ad-1718"},{"uid":"72ad-1722"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1764":{"id":"modules/pixi/PixiLayerStreetsidePhotos.js","moduleParts":{"dist/rapid.js":"72ad-1765"},"imported":[{"uid":"72ad-1718"},{"uid":"72ad-1738"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1766":{"id":"modules/pixi/PixiLayerCustomData.js","moduleParts":{"dist/rapid.js":"72ad-1767"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-498"},{"uid":"72ad-148"},{"uid":"72ad-62"},{"uid":"72ad-1768"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-1730"},{"uid":"72ad-1718"},{"uid":"72ad-1738"},{"uid":"72ad-1734"}],"importedBy":[{"uid":"72ad-1770"}]},"72ad-1768":{"id":"node_modules/@tmcw/togeojson/dist/togeojson.es.mjs","moduleParts":{"dist/rapid.js":"72ad-1769"},"imported":[],"importedBy":[{"uid":"72ad-1826"},{"uid":"72ad-1766"}]},"72ad-1770":{"id":"modules/pixi/PixiScene.js","moduleParts":{"dist/rapid.js":"72ad-1771"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-562"},{"uid":"72ad-1720"},{"uid":"72ad-1732"},{"uid":"72ad-1736"},{"uid":"72ad-1740"},{"uid":"72ad-1742"},{"uid":"72ad-1744"},{"uid":"72ad-1746"},{"uid":"72ad-1748"},{"uid":"72ad-1750"},{"uid":"72ad-1752"},{"uid":"72ad-1756"},{"uid":"72ad-1758"},{"uid":"72ad-1760"},{"uid":"72ad-1762"},{"uid":"72ad-1764"},{"uid":"72ad-1766"}],"importedBy":[{"uid":"72ad-1776"}]},"72ad-1772":{"id":"node_modules/@rapideditor/pixi-texture-allocator/dist/pixi-texture-allocator.mjs","moduleParts":{"dist/rapid.js":"72ad-1773"},"imported":[{"uid":"72ad-598"},{"uid":"72ad-962"},{"uid":"72ad-790"}],"importedBy":[{"uid":"72ad-1774"}]},"72ad-1774":{"id":"modules/pixi/PixiTextures.js","moduleParts":{"dist/rapid.js":"72ad-1775"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-1772"}],"importedBy":[{"uid":"72ad-1776"}]},"72ad-1776":{"id":"modules/pixi/PixiRenderer.js","moduleParts":{"dist/rapid.js":"72ad-1777"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-562"},{"uid":"72ad-408"},{"uid":"72ad-1356"},{"uid":"72ad-1770"},{"uid":"72ad-1774"},{"uid":"72ad-418"}],"importedBy":[{"uid":"72ad-1780"}]},"72ad-1778":{"id":"modules/util/dimensions.js","moduleParts":{"dist/rapid.js":"72ad-1779"},"imported":[],"importedBy":[{"uid":"72ad-1780"},{"uid":"72ad-2122"},{"uid":"72ad-1802"},{"uid":"72ad-1980"}]},"72ad-1780":{"id":"modules/core/MapSystem.js","moduleParts":{"dist/rapid.js":"72ad-1781"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-1776"},{"uid":"72ad-652"},{"uid":"72ad-418"},{"uid":"72ad-1778"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-1782":{"id":"modules/core/Map3dSystem.js","moduleParts":{"dist/rapid.js":"72ad-1783"},"imported":[{"uid":"72ad-64"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-1784":{"id":"modules/core/PhotoSystem.js","moduleParts":{"dist/rapid.js":"72ad-1785"},"imported":[{"uid":"72ad-562"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-1786":{"id":"modules/ui/fields/check.js","moduleParts":{"dist/rapid.js":"72ad-1787"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-424"},{"uid":"72ad-114"},{"uid":"72ad-476"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1788":{"id":"modules/ui/fields/index.js","moduleParts":{"dist/rapid.js":"72ad-1789"},"imported":[{"uid":"72ad-1786"},{"uid":"72ad-1792"},{"uid":"72ad-1794"},{"uid":"72ad-1796"},{"uid":"72ad-1798"},{"uid":"72ad-1800"},{"uid":"72ad-1802"},{"uid":"72ad-1808"},{"uid":"72ad-1810"},{"uid":"72ad-1816"},{"uid":"72ad-2244"},{"uid":"72ad-1818"},{"uid":"72ad-1820"},{"uid":"72ad-1822"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-1824"},{"uid":"72ad-1814"}]},"72ad-1790":{"id":"modules/ui/combobox.js","moduleParts":{"dist/rapid.js":"72ad-1791"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1792"},{"uid":"72ad-1796"},{"uid":"72ad-1798"},{"uid":"72ad-1800"},{"uid":"72ad-1808"},{"uid":"72ad-1810"},{"uid":"72ad-1820"},{"uid":"72ad-1822"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1840"},{"uid":"72ad-1838"},{"uid":"72ad-2026"}]},"72ad-1792":{"id":"modules/ui/fields/combo.js","moduleParts":{"dist/rapid.js":"72ad-1793"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-286"},{"uid":"72ad-112"},{"uid":"72ad-740"},{"uid":"72ad-410"},{"uid":"72ad-1790"},{"uid":"72ad-422"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1794":{"id":"modules/ui/fields/input.js","moduleParts":{"dist/rapid.js":"72ad-1795"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-740"},{"uid":"72ad-416"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1796":{"id":"modules/ui/fields/access.js","moduleParts":{"dist/rapid.js":"72ad-1797"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1798":{"id":"modules/ui/fields/address.js","moduleParts":{"dist/rapid.js":"72ad-1799"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-740"},{"uid":"72ad-526"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1800":{"id":"modules/ui/fields/cycleway.js","moduleParts":{"dist/rapid.js":"72ad-1801"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1802":{"id":"modules/ui/fields/lanes.js","moduleParts":{"dist/rapid.js":"72ad-1803"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-424"},{"uid":"72ad-1778"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1804":{"id":"modules/ui/popover.js","moduleParts":{"dist/rapid.js":"72ad-1805"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-418"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1806"}]},"72ad-1806":{"id":"modules/ui/tooltip.js","moduleParts":{"dist/rapid.js":"72ad-1807"},"imported":[{"uid":"72ad-418"},{"uid":"72ad-1804"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1808"},{"uid":"72ad-2092"},{"uid":"72ad-2080"},{"uid":"72ad-2106"},{"uid":"72ad-1878"},{"uid":"72ad-2108"},{"uid":"72ad-2118"},{"uid":"72ad-2110"},{"uid":"72ad-2086"},{"uid":"72ad-2112"},{"uid":"72ad-2116"},{"uid":"72ad-1886"},{"uid":"72ad-2098"},{"uid":"72ad-1842"},{"uid":"72ad-1854"},{"uid":"72ad-1870"},{"uid":"72ad-1890"},{"uid":"72ad-1814"},{"uid":"72ad-1898"},{"uid":"72ad-1948"},{"uid":"72ad-1978"},{"uid":"72ad-1942"},{"uid":"72ad-2022"},{"uid":"72ad-2070"},{"uid":"72ad-2072"},{"uid":"72ad-2074"},{"uid":"72ad-2052"},{"uid":"72ad-2056"},{"uid":"72ad-2058"},{"uid":"72ad-2060"},{"uid":"72ad-2062"},{"uid":"72ad-2064"},{"uid":"72ad-2066"}]},"72ad-1808":{"id":"modules/ui/fields/localized.js","moduleParts":{"dist/rapid.js":"72ad-1809"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-740"},{"uid":"72ad-726"},{"uid":"72ad-1806"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1810":{"id":"modules/ui/fields/roadspeed.js","moduleParts":{"dist/rapid.js":"72ad-1811"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-740"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1812":{"id":"modules/ui/tag_reference.js","moduleParts":{"dist/rapid.js":"72ad-1813"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1878"},{"uid":"72ad-1856"},{"uid":"72ad-1814"},{"uid":"72ad-1942"}]},"72ad-1814":{"id":"modules/ui/UiField.js","moduleParts":{"dist/rapid.js":"72ad-1815"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-726"},{"uid":"72ad-1806"},{"uid":"72ad-1788"},{"uid":"72ad-1812"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1816"},{"uid":"72ad-1880"},{"uid":"72ad-1840"}]},"72ad-1816":{"id":"modules/ui/fields/radio.js","moduleParts":{"dist/rapid.js":"72ad-1817"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-1814"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1818":{"id":"modules/ui/fields/textarea.js","moduleParts":{"dist/rapid.js":"72ad-1819"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1820":{"id":"modules/ui/fields/wikidata.js","moduleParts":{"dist/rapid.js":"72ad-1821"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-442"},{"uid":"72ad-726"},{"uid":"72ad-416"},{"uid":"72ad-1790"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1822":{"id":"modules/ui/fields/wikipedia.js","moduleParts":{"dist/rapid.js":"72ad-1823"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-442"},{"uid":"72ad-726"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1788"}]},"72ad-1824":{"id":"modules/core/PresetSystem.js","moduleParts":{"dist/rapid.js":"72ad-1825"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-116"},{"uid":"72ad-490"},{"uid":"72ad-1788"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-1826":{"id":"modules/core/RapidSystem.js","moduleParts":{"dist/rapid.js":"72ad-1827"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-1768"},{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-1828":{"id":"modules/core/StorageSystem.js","moduleParts":{"dist/rapid.js":"72ad-1829"},"imported":[],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-1830":{"id":"modules/ui/account.js","moduleParts":{"dist/rapid.js":"72ad-1831"},"imported":[{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1832":{"id":"modules/ui/index.js","moduleParts":{"dist/rapid.js":"72ad-1833"},"imported":[{"uid":"72ad-1830"},{"uid":"72ad-1836"},{"uid":"72ad-1840"},{"uid":"72ad-652"},{"uid":"72ad-1790"},{"uid":"72ad-1842"},{"uid":"72ad-1854"},{"uid":"72ad-1858"},{"uid":"72ad-1860"},{"uid":"72ad-1862"},{"uid":"72ad-1866"},{"uid":"72ad-1864"},{"uid":"72ad-1868"},{"uid":"72ad-1848"},{"uid":"72ad-1870"},{"uid":"72ad-1872"},{"uid":"72ad-1890"},{"uid":"72ad-1892"},{"uid":"72ad-1814"},{"uid":"72ad-1894"},{"uid":"72ad-1838"},{"uid":"72ad-1896"},{"uid":"72ad-1898"},{"uid":"72ad-726"},{"uid":"72ad-1900"},{"uid":"72ad-1902"},{"uid":"72ad-1906"},{"uid":"72ad-1904"},{"uid":"72ad-1928"},{"uid":"72ad-1940"},{"uid":"72ad-1946"},{"uid":"72ad-1948"},{"uid":"72ad-1950"},{"uid":"72ad-1956"},{"uid":"72ad-1952"},{"uid":"72ad-730"},{"uid":"72ad-1958"},{"uid":"72ad-1960"},{"uid":"72ad-728"},{"uid":"72ad-1962"},{"uid":"72ad-1968"},{"uid":"72ad-1964"},{"uid":"72ad-1966"},{"uid":"72ad-1970"},{"uid":"72ad-1976"},{"uid":"72ad-1972"},{"uid":"72ad-1978"},{"uid":"72ad-1980"},{"uid":"72ad-1804"},{"uid":"72ad-1876"},{"uid":"72ad-1942"},{"uid":"72ad-1982"},{"uid":"72ad-2022"},{"uid":"72ad-2028"},{"uid":"72ad-2020"},{"uid":"72ad-2030"},{"uid":"72ad-2032"},{"uid":"72ad-2018"},{"uid":"72ad-2026"},{"uid":"72ad-2034"},{"uid":"72ad-2036"},{"uid":"72ad-2038"},{"uid":"72ad-1850"},{"uid":"72ad-2040"},{"uid":"72ad-2042"},{"uid":"72ad-2044"},{"uid":"72ad-2046"},{"uid":"72ad-2048"},{"uid":"72ad-2050"},{"uid":"72ad-2010"},{"uid":"72ad-1812"},{"uid":"72ad-1846"},{"uid":"72ad-1806"},{"uid":"72ad-2068"},{"uid":"72ad-2070"},{"uid":"72ad-1954"},{"uid":"72ad-1944"},{"uid":"72ad-1974"},{"uid":"72ad-2072"},{"uid":"72ad-2074"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-2122"}]},"72ad-1834":{"id":"node_modules/lodash-es/throttle.js","moduleParts":{"dist/rapid.js":"72ad-1835"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-696"}],"importedBy":[{"uid":"72ad-2126"},{"uid":"72ad-2198"},{"uid":"72ad-1836"},{"uid":"72ad-2042"},{"uid":"72ad-2050"}]},"72ad-1836":{"id":"modules/ui/attribution.js","moduleParts":{"dist/rapid.js":"72ad-1837"},"imported":[{"uid":"72ad-1834"},{"uid":"72ad-268"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1838":{"id":"modules/ui/form_fields.js","moduleParts":{"dist/rapid.js":"72ad-1839"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1880"},{"uid":"72ad-1840"}]},"72ad-1840":{"id":"modules/ui/changeset_editor.js","moduleParts":{"dist/rapid.js":"72ad-1841"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-112"},{"uid":"72ad-726"},{"uid":"72ad-1790"},{"uid":"72ad-1814"},{"uid":"72ad-1838"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1842"}]},"72ad-1842":{"id":"modules/ui/commit.js","moduleParts":{"dist/rapid.js":"72ad-1843"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-4"},{"uid":"72ad-476"},{"uid":"72ad-726"},{"uid":"72ad-1806"},{"uid":"72ad-1840"},{"uid":"72ad-1852"},{"uid":"72ad-1854"},{"uid":"72ad-1856"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2012"}]},"72ad-1844":{"id":"modules/util/jxon.js","moduleParts":{"dist/rapid.js":"72ad-1845"},"imported":[],"importedBy":[{"uid":"72ad-2198"},{"uid":"72ad-1852"},{"uid":"72ad-1860"},{"uid":"72ad-2052"}]},"72ad-1846":{"id":"modules/ui/toggle.js","moduleParts":{"dist/rapid.js":"72ad-1847"},"imported":[{"uid":"72ad-268"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1848"},{"uid":"72ad-1910"}]},"72ad-1848":{"id":"modules/ui/disclosure.js","moduleParts":{"dist/rapid.js":"72ad-1849"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-726"},{"uid":"72ad-416"},{"uid":"72ad-424"},{"uid":"72ad-1846"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1850"},{"uid":"72ad-2010"}]},"72ad-1850":{"id":"modules/ui/section.js","moduleParts":{"dist/rapid.js":"72ad-1851"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-1848"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2076"},{"uid":"72ad-2080"},{"uid":"72ad-2082"},{"uid":"72ad-1852"},{"uid":"72ad-2106"},{"uid":"72ad-1874"},{"uid":"72ad-1878"},{"uid":"72ad-2108"},{"uid":"72ad-2118"},{"uid":"72ad-2110"},{"uid":"72ad-2086"},{"uid":"72ad-2112"},{"uid":"72ad-1880"},{"uid":"72ad-2116"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1888"},{"uid":"72ad-2094"},{"uid":"72ad-2096"},{"uid":"72ad-2098"},{"uid":"72ad-2100"},{"uid":"72ad-2084"}]},"72ad-1852":{"id":"modules/ui/sections/changes.js","moduleParts":{"dist/rapid.js":"72ad-1853"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-1844"},{"uid":"72ad-462"},{"uid":"72ad-476"},{"uid":"72ad-726"},{"uid":"72ad-1850"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1842"}]},"72ad-1854":{"id":"modules/ui/commit_warnings.js","moduleParts":{"dist/rapid.js":"72ad-1855"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1842"}]},"72ad-1856":{"id":"modules/ui/sections/raw_tag_editor.js","moduleParts":{"dist/rapid.js":"72ad-1857"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-726"},{"uid":"72ad-1790"},{"uid":"72ad-1850"},{"uid":"72ad-1812"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1842"},{"uid":"72ad-1866"},{"uid":"72ad-1872"}]},"72ad-1858":{"id":"modules/ui/confirm.js","moduleParts":{"dist/rapid.js":"72ad-1859"},"imported":[{"uid":"72ad-728"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2012"},{"uid":"72ad-2078"},{"uid":"72ad-2104"}]},"72ad-1860":{"id":"modules/ui/conflicts.js","moduleParts":{"dist/rapid.js":"72ad-1861"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-1844"},{"uid":"72ad-476"},{"uid":"72ad-726"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2012"}]},"72ad-1862":{"id":"modules/ui/contributors.js","moduleParts":{"dist/rapid.js":"72ad-1863"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-268"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1864":{"id":"modules/ui/data_header.js","moduleParts":{"dist/rapid.js":"72ad-1865"},"imported":[{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1866"}]},"72ad-1866":{"id":"modules/ui/data_editor.js","moduleParts":{"dist/rapid.js":"72ad-1867"},"imported":[{"uid":"72ad-726"},{"uid":"72ad-1864"},{"uid":"72ad-1856"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2014"},{"uid":"72ad-2042"}]},"72ad-1868":{"id":"modules/ui/UiDefs.js","moduleParts":{"dist/rapid.js":"72ad-1869"},"imported":[{"uid":"72ad-498"},{"uid":"72ad-268"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1870":{"id":"modules/ui/edit_menu.js","moduleParts":{"dist/rapid.js":"72ad-1871"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-174"},{"uid":"72ad-408"},{"uid":"72ad-1806"},{"uid":"72ad-424"},{"uid":"72ad-418"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1872":{"id":"modules/ui/entity_editor.js","moduleParts":{"dist/rapid.js":"72ad-1873"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-112"},{"uid":"72ad-4"},{"uid":"72ad-442"},{"uid":"72ad-726"},{"uid":"72ad-416"},{"uid":"72ad-1874"},{"uid":"72ad-1878"},{"uid":"72ad-1880"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1888"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1946"}]},"72ad-1874":{"id":"modules/ui/sections/entity_issues.js","moduleParts":{"dist/rapid.js":"72ad-1875"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-726"},{"uid":"72ad-416"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1872"}]},"72ad-1876":{"id":"modules/ui/preset_icon.js","moduleParts":{"dist/rapid.js":"72ad-1877"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-1754"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1878"},{"uid":"72ad-1942"}]},"72ad-1878":{"id":"modules/ui/sections/feature_type.js","moduleParts":{"dist/rapid.js":"72ad-1879"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-112"},{"uid":"72ad-1806"},{"uid":"72ad-416"},{"uid":"72ad-1876"},{"uid":"72ad-1850"},{"uid":"72ad-1812"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1872"}]},"72ad-1880":{"id":"modules/ui/sections/preset_fields.js","moduleParts":{"dist/rapid.js":"72ad-1881"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-112"},{"uid":"72ad-1814"},{"uid":"72ad-1838"},{"uid":"72ad-1850"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1872"}]},"72ad-1882":{"id":"modules/ui/sections/raw_member_editor.js","moduleParts":{"dist/rapid.js":"72ad-1883"},"imported":[{"uid":"72ad-286"},{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-438"},{"uid":"72ad-460"},{"uid":"72ad-532"},{"uid":"72ad-682"},{"uid":"72ad-476"},{"uid":"72ad-726"},{"uid":"72ad-1790"},{"uid":"72ad-1850"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1872"}]},"72ad-1884":{"id":"modules/actions/delete_members.js","moduleParts":{"dist/rapid.js":"72ad-1885"},"imported":[{"uid":"72ad-460"}],"importedBy":[{"uid":"72ad-1886"}]},"72ad-1886":{"id":"modules/ui/sections/raw_membership_editor.js","moduleParts":{"dist/rapid.js":"72ad-1887"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-108"},{"uid":"72ad-432"},{"uid":"72ad-438"},{"uid":"72ad-1884"},{"uid":"72ad-682"},{"uid":"72ad-476"},{"uid":"72ad-726"},{"uid":"72ad-1790"},{"uid":"72ad-1850"},{"uid":"72ad-1806"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1872"}]},"72ad-1888":{"id":"modules/ui/sections/selection_list.js","moduleParts":{"dist/rapid.js":"72ad-1889"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-682"},{"uid":"72ad-476"},{"uid":"72ad-726"},{"uid":"72ad-1850"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-1872"}]},"72ad-1890":{"id":"modules/ui/feature_info.js","moduleParts":{"dist/rapid.js":"72ad-1891"},"imported":[{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1892":{"id":"modules/ui/feature_list.js","moduleParts":{"dist/rapid.js":"72ad-1893"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-66"},{"uid":"72ad-490"},{"uid":"72ad-682"},{"uid":"72ad-410"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2042"}]},"72ad-1894":{"id":"modules/ui/flash.js","moduleParts":{"dist/rapid.js":"72ad-1895"},"imported":[{"uid":"72ad-330"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2022"}]},"72ad-1896":{"id":"modules/ui/full_screen.js","moduleParts":{"dist/rapid.js":"72ad-1897"},"imported":[{"uid":"72ad-652"},{"uid":"72ad-414"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1898":{"id":"modules/ui/geolocate.js","moduleParts":{"dist/rapid.js":"72ad-1899"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-1806"},{"uid":"72ad-726"},{"uid":"72ad-730"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1900":{"id":"modules/ui/improveOSM_comments.js","moduleParts":{"dist/rapid.js":"72ad-1901"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1906"}]},"72ad-1902":{"id":"modules/ui/improveOSM_details.js","moduleParts":{"dist/rapid.js":"72ad-1903"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-682"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1906"}]},"72ad-1904":{"id":"modules/ui/improveOSM_header.js","moduleParts":{"dist/rapid.js":"72ad-1905"},"imported":[{"uid":"72ad-1076"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1906"}]},"72ad-1906":{"id":"modules/ui/improveOSM_editor.js","moduleParts":{"dist/rapid.js":"72ad-1907"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-1900"},{"uid":"72ad-1902"},{"uid":"72ad-1904"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2014"},{"uid":"72ad-2042"}]},"72ad-1908":{"id":"modules/ui/intro/helper.js","moduleParts":{"dist/rapid.js":"72ad-1909"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-652"}],"importedBy":[{"uid":"72ad-2092"},{"uid":"72ad-1928"},{"uid":"72ad-2028"},{"uid":"72ad-2020"},{"uid":"72ad-2018"},{"uid":"72ad-2034"},{"uid":"72ad-1912"},{"uid":"72ad-1914"},{"uid":"72ad-1916"},{"uid":"72ad-1918"},{"uid":"72ad-1920"},{"uid":"72ad-1922"},{"uid":"72ad-1924"},{"uid":"72ad-1926"}]},"72ad-1910":{"id":"modules/ui/intro/UiCurtain.js","moduleParts":{"dist/rapid.js":"72ad-1911"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-386"},{"uid":"72ad-268"},{"uid":"72ad-1846"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1912":{"id":"modules/ui/intro/welcome.js","moduleParts":{"dist/rapid.js":"72ad-1913"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-174"},{"uid":"72ad-1908"},{"uid":"72ad-424"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1914":{"id":"modules/ui/intro/navigation.js","moduleParts":{"dist/rapid.js":"72ad-1915"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-424"},{"uid":"72ad-1908"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1916":{"id":"modules/ui/intro/point.js","moduleParts":{"dist/rapid.js":"72ad-1917"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-440"},{"uid":"72ad-682"},{"uid":"72ad-424"},{"uid":"72ad-1908"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1918":{"id":"modules/ui/intro/area.js","moduleParts":{"dist/rapid.js":"72ad-1919"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-174"},{"uid":"72ad-318"},{"uid":"72ad-682"},{"uid":"72ad-424"},{"uid":"72ad-1908"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1920":{"id":"modules/ui/intro/line.js","moduleParts":{"dist/rapid.js":"72ad-1921"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-174"},{"uid":"72ad-682"},{"uid":"72ad-424"},{"uid":"72ad-1908"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1922":{"id":"modules/ui/intro/building.js","moduleParts":{"dist/rapid.js":"72ad-1923"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-174"},{"uid":"72ad-112"},{"uid":"72ad-440"},{"uid":"72ad-682"},{"uid":"72ad-416"},{"uid":"72ad-1908"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1924":{"id":"modules/ui/intro/start_editing.js","moduleParts":{"dist/rapid.js":"72ad-1925"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-1908"},{"uid":"72ad-728"},{"uid":"72ad-424"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1926":{"id":"modules/ui/intro/rapid.js","moduleParts":{"dist/rapid.js":"72ad-1927"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-682"},{"uid":"72ad-424"},{"uid":"72ad-1908"}],"importedBy":[{"uid":"72ad-1928"}]},"72ad-1928":{"id":"modules/ui/intro/intro.js","moduleParts":{"dist/rapid.js":"72ad-1929"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-1908"},{"uid":"72ad-410"},{"uid":"72ad-726"},{"uid":"72ad-1910"},{"uid":"72ad-1912"},{"uid":"72ad-1914"},{"uid":"72ad-1916"},{"uid":"72ad-1918"},{"uid":"72ad-1920"},{"uid":"72ad-1922"},{"uid":"72ad-1924"},{"uid":"72ad-1926"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2092"},{"uid":"72ad-2018"},{"uid":"72ad-2048"}]},"72ad-1930":{"id":"modules/ui/panels/AbstractUiPanel.js","moduleParts":{"dist/rapid.js":"72ad-1931"},"imported":[],"importedBy":[{"uid":"72ad-1932"},{"uid":"72ad-1934"},{"uid":"72ad-1936"},{"uid":"72ad-1938"}]},"72ad-1932":{"id":"modules/ui/panels/UiPanelBackground.js","moduleParts":{"dist/rapid.js":"72ad-1933"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-1930"}],"importedBy":[{"uid":"72ad-2230"},{"uid":"72ad-1940"}]},"72ad-1934":{"id":"modules/ui/panels/UiPanelHistory.js","moduleParts":{"dist/rapid.js":"72ad-1935"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-1930"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-2230"},{"uid":"72ad-1940"}]},"72ad-1936":{"id":"modules/ui/panels/UiPanelLocation.js","moduleParts":{"dist/rapid.js":"72ad-1937"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-268"},{"uid":"72ad-1930"}],"importedBy":[{"uid":"72ad-2230"},{"uid":"72ad-1940"}]},"72ad-1938":{"id":"modules/ui/panels/UiPanelMeasurement.js","moduleParts":{"dist/rapid.js":"72ad-1939"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-148"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-1930"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-2230"},{"uid":"72ad-1940"}]},"72ad-1940":{"id":"modules/ui/info.js","moduleParts":{"dist/rapid.js":"72ad-1941"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-1932"},{"uid":"72ad-1934"},{"uid":"72ad-1936"},{"uid":"72ad-1938"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1942":{"id":"modules/ui/preset_list.js","moduleParts":{"dist/rapid.js":"72ad-1943"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-722"},{"uid":"72ad-440"},{"uid":"72ad-656"},{"uid":"72ad-726"},{"uid":"72ad-1806"},{"uid":"72ad-1876"},{"uid":"72ad-1812"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1946"}]},"72ad-1944":{"id":"modules/ui/view_on_osm.js","moduleParts":{"dist/rapid.js":"72ad-1945"},"imported":[{"uid":"72ad-476"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1946"},{"uid":"72ad-1968"}]},"72ad-1946":{"id":"modules/ui/inspector.js","moduleParts":{"dist/rapid.js":"72ad-1947"},"imported":[{"uid":"72ad-318"},{"uid":"72ad-268"},{"uid":"72ad-1872"},{"uid":"72ad-1942"},{"uid":"72ad-1944"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2042"}]},"72ad-1948":{"id":"modules/ui/issues_info.js","moduleParts":{"dist/rapid.js":"72ad-1949"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1950":{"id":"modules/ui/keepRight_details.js","moduleParts":{"dist/rapid.js":"72ad-1951"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-682"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1956"}]},"72ad-1952":{"id":"modules/ui/keepRight_header.js","moduleParts":{"dist/rapid.js":"72ad-1953"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1956"}]},"72ad-1954":{"id":"modules/ui/view_on_keepRight.js","moduleParts":{"dist/rapid.js":"72ad-1955"},"imported":[{"uid":"72ad-726"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1956"}]},"72ad-1956":{"id":"modules/ui/keepRight_editor.js","moduleParts":{"dist/rapid.js":"72ad-1957"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-1950"},{"uid":"72ad-1952"},{"uid":"72ad-1954"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2014"},{"uid":"72ad-2042"}]},"72ad-1958":{"id":"modules/ui/map3d_viewer.js","moduleParts":{"dist/rapid.js":"72ad-1959"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-268"},{"uid":"72ad-1754"},{"uid":"72ad-652"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2080"}]},"72ad-1960":{"id":"modules/ui/map_in_map.js","moduleParts":{"dist/rapid.js":"72ad-1961"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-268"},{"uid":"72ad-406"},{"uid":"72ad-408"},{"uid":"72ad-416"},{"uid":"72ad-1720"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2080"}]},"72ad-1962":{"id":"modules/ui/note_comments.js","moduleParts":{"dist/rapid.js":"72ad-1963"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1968"}]},"72ad-1964":{"id":"modules/ui/note_header.js","moduleParts":{"dist/rapid.js":"72ad-1965"},"imported":[{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1968"}]},"72ad-1966":{"id":"modules/ui/note_report.js","moduleParts":{"dist/rapid.js":"72ad-1967"},"imported":[{"uid":"72ad-476"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1968"}]},"72ad-1968":{"id":"modules/ui/note_editor.js","moduleParts":{"dist/rapid.js":"72ad-1969"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-1962"},{"uid":"72ad-1964"},{"uid":"72ad-1966"},{"uid":"72ad-1944"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2014"},{"uid":"72ad-2042"}]},"72ad-1970":{"id":"modules/ui/osmose_details.js","moduleParts":{"dist/rapid.js":"72ad-1971"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-682"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1976"}]},"72ad-1972":{"id":"modules/ui/osmose_header.js","moduleParts":{"dist/rapid.js":"72ad-1973"},"imported":[{"uid":"72ad-1076"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1976"}]},"72ad-1974":{"id":"modules/ui/view_on_osmose.js","moduleParts":{"dist/rapid.js":"72ad-1975"},"imported":[{"uid":"72ad-726"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-1976"}]},"72ad-1976":{"id":"modules/ui/osmose_editor.js","moduleParts":{"dist/rapid.js":"72ad-1977"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-726"},{"uid":"72ad-1970"},{"uid":"72ad-1972"},{"uid":"72ad-1974"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2014"},{"uid":"72ad-2042"}]},"72ad-1978":{"id":"modules/ui/pane.js","moduleParts":{"dist/rapid.js":"72ad-1979"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2088"},{"uid":"72ad-2092"},{"uid":"72ad-2102"},{"uid":"72ad-2114"},{"uid":"72ad-2120"}]},"72ad-1980":{"id":"modules/ui/photo_viewer.js","moduleParts":{"dist/rapid.js":"72ad-1981"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-174"},{"uid":"72ad-726"},{"uid":"72ad-1778"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-1982":{"id":"modules/ui/rapid_colorpicker.js","moduleParts":{"dist/rapid.js":"72ad-1983"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2028"}]},"72ad-1984":{"id":"modules/modes/index.js","moduleParts":{"dist/rapid.js":"72ad-1985"},"imported":[{"uid":"72ad-1988"},{"uid":"72ad-1990"},{"uid":"72ad-1992"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-2000"},{"uid":"72ad-2002"},{"uid":"72ad-2012"},{"uid":"72ad-2014"},{"uid":"72ad-2016"},{"uid":"72ad-682"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-2224"},{"uid":"72ad-2022"}]},"72ad-1986":{"id":"modules/modes/AbstractMode.js","moduleParts":{"dist/rapid.js":"72ad-1987"},"imported":[],"importedBy":[{"uid":"72ad-1988"},{"uid":"72ad-1990"},{"uid":"72ad-1992"},{"uid":"72ad-1994"},{"uid":"72ad-1996"},{"uid":"72ad-1998"},{"uid":"72ad-2000"},{"uid":"72ad-2002"},{"uid":"72ad-2012"},{"uid":"72ad-2014"}]},"72ad-1988":{"id":"modules/modes/AddNoteMode.js","moduleParts":{"dist/rapid.js":"72ad-1989"},"imported":[{"uid":"72ad-1986"},{"uid":"72ad-478"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-1990":{"id":"modules/modes/AddPointMode.js","moduleParts":{"dist/rapid.js":"72ad-1991"},"imported":[{"uid":"72ad-1986"},{"uid":"72ad-108"},{"uid":"72ad-442"},{"uid":"72ad-434"},{"uid":"72ad-526"},{"uid":"72ad-682"},{"uid":"72ad-444"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-1992":{"id":"modules/modes/BrowseMode.js","moduleParts":{"dist/rapid.js":"72ad-1993"},"imported":[{"uid":"72ad-1986"},{"uid":"72ad-670"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-1994":{"id":"modules/modes/DragNodeMode.js","moduleParts":{"dist/rapid.js":"72ad-1995"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-1986"},{"uid":"72ad-434"},{"uid":"72ad-456"},{"uid":"72ad-534"},{"uid":"72ad-536"},{"uid":"72ad-526"},{"uid":"72ad-682"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-1996":{"id":"modules/modes/DrawAreaMode.js","moduleParts":{"dist/rapid.js":"72ad-1997"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-1986"},{"uid":"72ad-108"},{"uid":"72ad-434"},{"uid":"72ad-436"},{"uid":"72ad-534"},{"uid":"72ad-536"},{"uid":"72ad-526"},{"uid":"72ad-682"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-1998":{"id":"modules/modes/DrawLineMode.js","moduleParts":{"dist/rapid.js":"72ad-1999"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-1986"},{"uid":"72ad-108"},{"uid":"72ad-434"},{"uid":"72ad-436"},{"uid":"72ad-534"},{"uid":"72ad-536"},{"uid":"72ad-526"},{"uid":"72ad-682"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-2000":{"id":"modules/modes/MoveMode.js","moduleParts":{"dist/rapid.js":"72ad-2001"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-1986"},{"uid":"72ad-530"},{"uid":"72ad-536"},{"uid":"72ad-682"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-2002":{"id":"modules/modes/RotateMode.js","moduleParts":{"dist/rapid.js":"72ad-2003"},"imported":[{"uid":"72ad-164"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-1986"},{"uid":"72ad-544"},{"uid":"72ad-536"},{"uid":"72ad-682"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-2004":{"id":"node_modules/osm-community-index/lib/simplify.js","moduleParts":{"dist/rapid.js":"72ad-2005"},"imported":[{"uid":"72ad-2"}],"importedBy":[{"uid":"72ad-2006"}]},"72ad-2006":{"id":"node_modules/osm-community-index/lib/resolve_strings.js","moduleParts":{"dist/rapid.js":"72ad-2007"},"imported":[{"uid":"72ad-2004"}],"importedBy":[{"uid":"72ad-2008"}]},"72ad-2008":{"id":"node_modules/osm-community-index/index.mjs","moduleParts":{"dist/rapid.js":"72ad-2009"},"imported":[{"uid":"72ad-2006"}],"importedBy":[{"uid":"72ad-2010"}]},"72ad-2010":{"id":"modules/ui/success.js","moduleParts":{"dist/rapid.js":"72ad-2011"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-2008"},{"uid":"72ad-726"},{"uid":"72ad-1848"},{"uid":"72ad-424"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2012"}]},"72ad-2012":{"id":"modules/modes/SaveMode.js","moduleParts":{"dist/rapid.js":"72ad-2013"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-1986"},{"uid":"72ad-1842"},{"uid":"72ad-1858"},{"uid":"72ad-1860"},{"uid":"72ad-730"},{"uid":"72ad-2010"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-2014":{"id":"modules/modes/SelectMode.js","moduleParts":{"dist/rapid.js":"72ad-2015"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-148"},{"uid":"72ad-408"},{"uid":"72ad-1986"},{"uid":"72ad-476"},{"uid":"72ad-1866"},{"uid":"72ad-1906"},{"uid":"72ad-1956"},{"uid":"72ad-1968"},{"uid":"72ad-1976"},{"uid":"72ad-2022"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-2016":{"id":"modules/modes/drag_note.js","moduleParts":{"dist/rapid.js":"72ad-2017"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-536"}],"importedBy":[{"uid":"72ad-1984"}]},"72ad-2018":{"id":"modules/ui/rapid_splash.js","moduleParts":{"dist/rapid.js":"72ad-2019"},"imported":[{"uid":"72ad-1928"},{"uid":"72ad-1908"},{"uid":"72ad-728"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2020"}]},"72ad-2020":{"id":"modules/ui/rapid_first_edit_dialog.js","moduleParts":{"dist/rapid.js":"72ad-2021"},"imported":[{"uid":"72ad-1908"},{"uid":"72ad-728"},{"uid":"72ad-2018"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2022"}]},"72ad-2022":{"id":"modules/ui/rapid_feature_inspector.js","moduleParts":{"dist/rapid.js":"72ad-2023"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-110"},{"uid":"72ad-1984"},{"uid":"72ad-726"},{"uid":"72ad-1894"},{"uid":"72ad-1806"},{"uid":"72ad-2020"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2014"},{"uid":"72ad-2042"}]},"72ad-2024":{"id":"node_modules/marked/lib/marked.esm.js","moduleParts":{"dist/rapid.js":"72ad-2025"},"imported":[{"uid":"72ad-2552"}],"importedBy":[{"uid":"72ad-2200"},{"uid":"72ad-2092"},{"uid":"72ad-2078"},{"uid":"72ad-2028"},{"uid":"72ad-2026"},{"uid":"72ad-2034"}]},"72ad-2026":{"id":"modules/ui/rapid_view_manage_datasets.js","moduleParts":{"dist/rapid.js":"72ad-2027"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-2024"},{"uid":"72ad-726"},{"uid":"72ad-1790"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2028"}]},"72ad-2028":{"id":"modules/ui/rapid_feature_toggle_dialog.js","moduleParts":{"dist/rapid.js":"72ad-2029"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-2024"},{"uid":"72ad-1908"},{"uid":"72ad-726"},{"uid":"72ad-728"},{"uid":"72ad-1982"},{"uid":"72ad-2026"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2066"}]},"72ad-2030":{"id":"modules/ui/rapid_poweruser_features_dialog.js","moduleParts":{"dist/rapid.js":"72ad-2031"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-728"}],"importedBy":[{"uid":"72ad-1832"},{"uid":"72ad-2066"}]},"72ad-2032":{"id":"modules/ui/rapid_service_license.js","moduleParts":{"dist/rapid.js":"72ad-2033"},"imported":[],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2034":{"id":"modules/ui/rapid_whatsnew.js","moduleParts":{"dist/rapid.js":"72ad-2035"},"imported":[{"uid":"72ad-1908"},{"uid":"72ad-728"},{"uid":"72ad-2024"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2036":{"id":"modules/ui/restore.js","moduleParts":{"dist/rapid.js":"72ad-2037"},"imported":[{"uid":"72ad-728"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2038":{"id":"modules/ui/scale.js","moduleParts":{"dist/rapid.js":"72ad-2039"},"imported":[{"uid":"72ad-408"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2040":{"id":"modules/ui/shortcuts.js","moduleParts":{"dist/rapid.js":"72ad-2041"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-112"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-728"},{"uid":"72ad-414"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2042":{"id":"modules/ui/sidebar.js","moduleParts":{"dist/rapid.js":"72ad-2043"},"imported":[{"uid":"72ad-318"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-1834"},{"uid":"72ad-416"},{"uid":"72ad-476"},{"uid":"72ad-1866"},{"uid":"72ad-1892"},{"uid":"72ad-1946"},{"uid":"72ad-1906"},{"uid":"72ad-1956"},{"uid":"72ad-1976"},{"uid":"72ad-1968"},{"uid":"72ad-2022"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2044":{"id":"modules/ui/source_switch.js","moduleParts":{"dist/rapid.js":"72ad-2045"},"imported":[{"uid":"72ad-268"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2046":{"id":"modules/ui/spinner.js","moduleParts":{"dist/rapid.js":"72ad-2047"},"imported":[],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2048":{"id":"modules/ui/splash.js","moduleParts":{"dist/rapid.js":"72ad-2049"},"imported":[{"uid":"72ad-1928"},{"uid":"72ad-728"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2050":{"id":"modules/ui/status.js","moduleParts":{"dist/rapid.js":"72ad-2051"},"imported":[{"uid":"72ad-1834"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2052":{"id":"modules/ui/tools/download_osc.js","moduleParts":{"dist/rapid.js":"72ad-2053"},"imported":[{"uid":"72ad-1844"},{"uid":"72ad-476"},{"uid":"72ad-110"},{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-2054"}]},"72ad-2054":{"id":"modules/ui/tools/index.js","moduleParts":{"dist/rapid.js":"72ad-2055"},"imported":[{"uid":"72ad-2052"},{"uid":"72ad-2056"},{"uid":"72ad-2058"},{"uid":"72ad-2060"},{"uid":"72ad-2062"},{"uid":"72ad-2064"},{"uid":"72ad-2066"}],"importedBy":[{"uid":"72ad-2068"}]},"72ad-2056":{"id":"modules/ui/tools/modes.js","moduleParts":{"dist/rapid.js":"72ad-2057"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-2054"}]},"72ad-2058":{"id":"modules/ui/tools/notes.js","moduleParts":{"dist/rapid.js":"72ad-2059"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-2054"}]},"72ad-2060":{"id":"modules/ui/tools/save.js","moduleParts":{"dist/rapid.js":"72ad-2061"},"imported":[{"uid":"72ad-318"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-2054"}]},"72ad-2062":{"id":"modules/ui/tools/sidebar_toggle.js","moduleParts":{"dist/rapid.js":"72ad-2063"},"imported":[{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-2054"}]},"72ad-2064":{"id":"modules/ui/tools/undo_redo.js","moduleParts":{"dist/rapid.js":"72ad-2065"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-2054"}]},"72ad-2066":{"id":"modules/ui/tools/rapid_features.js","moduleParts":{"dist/rapid.js":"72ad-2067"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-174"},{"uid":"72ad-1806"},{"uid":"72ad-652"},{"uid":"72ad-2028"},{"uid":"72ad-2030"}],"importedBy":[{"uid":"72ad-2054"}]},"72ad-2068":{"id":"modules/ui/top_toolbar.js","moduleParts":{"dist/rapid.js":"72ad-2069"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-2054"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2070":{"id":"modules/ui/version.js","moduleParts":{"dist/rapid.js":"72ad-2071"},"imported":[{"uid":"72ad-726"},{"uid":"72ad-1806"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2072":{"id":"modules/ui/zoom.js","moduleParts":{"dist/rapid.js":"72ad-2073"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-1806"},{"uid":"72ad-422"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2074":{"id":"modules/ui/zoom_to_selection.js","moduleParts":{"dist/rapid.js":"72ad-2075"},"imported":[{"uid":"72ad-1806"},{"uid":"72ad-726"}],"importedBy":[{"uid":"72ad-1832"}]},"72ad-2076":{"id":"modules/ui/sections/background_display_options.js","moduleParts":{"dist/rapid.js":"72ad-2077"},"imported":[{"uid":"72ad-726"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2088"}]},"72ad-2078":{"id":"modules/ui/settings/custom_background.js","moduleParts":{"dist/rapid.js":"72ad-2079"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-2024"},{"uid":"72ad-1858"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2234"},{"uid":"72ad-2080"}]},"72ad-2080":{"id":"modules/ui/sections/background_list.js","moduleParts":{"dist/rapid.js":"72ad-2081"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-124"},{"uid":"72ad-268"},{"uid":"72ad-386"},{"uid":"72ad-1806"},{"uid":"72ad-490"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-2078"},{"uid":"72ad-1960"},{"uid":"72ad-1958"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2088"}]},"72ad-2082":{"id":"modules/ui/sections/background_offset.js","moduleParts":{"dist/rapid.js":"72ad-2083"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-726"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2088"}]},"72ad-2084":{"id":"modules/ui/sections/grid_display_options.js","moduleParts":{"dist/rapid.js":"72ad-2085"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2088"}]},"72ad-2086":{"id":"modules/ui/sections/overlay_list.js","moduleParts":{"dist/rapid.js":"72ad-2087"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-124"},{"uid":"72ad-268"},{"uid":"72ad-1806"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2088"}]},"72ad-2088":{"id":"modules/ui/panes/background.js","moduleParts":{"dist/rapid.js":"72ad-2089"},"imported":[{"uid":"72ad-1978"},{"uid":"72ad-2076"},{"uid":"72ad-2080"},{"uid":"72ad-2082"},{"uid":"72ad-2084"},{"uid":"72ad-2086"}],"importedBy":[{"uid":"72ad-2090"}]},"72ad-2090":{"id":"modules/ui/panes/index.js","moduleParts":{"dist/rapid.js":"72ad-2091"},"imported":[{"uid":"72ad-2088"},{"uid":"72ad-2092"},{"uid":"72ad-2102"},{"uid":"72ad-2114"},{"uid":"72ad-2120"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-2122"}]},"72ad-2092":{"id":"modules/ui/panes/help.js","moduleParts":{"dist/rapid.js":"72ad-2093"},"imported":[{"uid":"72ad-2024"},{"uid":"72ad-726"},{"uid":"72ad-1928"},{"uid":"72ad-1978"},{"uid":"72ad-1806"},{"uid":"72ad-1908"}],"importedBy":[{"uid":"72ad-2090"}]},"72ad-2094":{"id":"modules/ui/sections/validation_issues.js","moduleParts":{"dist/rapid.js":"72ad-2095"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-536"},{"uid":"72ad-726"},{"uid":"72ad-416"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2102"}]},"72ad-2096":{"id":"modules/ui/sections/validation_options.js","moduleParts":{"dist/rapid.js":"72ad-2097"},"imported":[{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2102"}]},"72ad-2098":{"id":"modules/ui/sections/validation_rules.js","moduleParts":{"dist/rapid.js":"72ad-2099"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-416"},{"uid":"72ad-1806"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2102"}]},"72ad-2100":{"id":"modules/ui/sections/validation_status.js","moduleParts":{"dist/rapid.js":"72ad-2101"},"imported":[{"uid":"72ad-722"},{"uid":"72ad-726"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2102"}]},"72ad-2102":{"id":"modules/ui/panes/issues.js","moduleParts":{"dist/rapid.js":"72ad-2103"},"imported":[{"uid":"72ad-1978"},{"uid":"72ad-2094"},{"uid":"72ad-2096"},{"uid":"72ad-2098"},{"uid":"72ad-2100"}],"importedBy":[{"uid":"72ad-2090"}]},"72ad-2104":{"id":"modules/ui/settings/custom_data.js","moduleParts":{"dist/rapid.js":"72ad-2105"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-1858"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2234"},{"uid":"72ad-2106"}]},"72ad-2106":{"id":"modules/ui/sections/data_layers.js","moduleParts":{"dist/rapid.js":"72ad-2107"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-1806"},{"uid":"72ad-726"},{"uid":"72ad-652"},{"uid":"72ad-1850"},{"uid":"72ad-2104"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2114"}]},"72ad-2108":{"id":"modules/ui/sections/map_features.js","moduleParts":{"dist/rapid.js":"72ad-2109"},"imported":[{"uid":"72ad-1806"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2114"}]},"72ad-2110":{"id":"modules/ui/sections/map_style_options.js","moduleParts":{"dist/rapid.js":"72ad-2111"},"imported":[{"uid":"72ad-1806"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2114"}]},"72ad-2112":{"id":"modules/ui/sections/photo_overlays.js","moduleParts":{"dist/rapid.js":"72ad-2113"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-1806"},{"uid":"72ad-1850"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2114"}]},"72ad-2114":{"id":"modules/ui/panes/map_data.js","moduleParts":{"dist/rapid.js":"72ad-2115"},"imported":[{"uid":"72ad-1978"},{"uid":"72ad-2106"},{"uid":"72ad-2108"},{"uid":"72ad-2110"},{"uid":"72ad-2112"}],"importedBy":[{"uid":"72ad-2090"}]},"72ad-2116":{"id":"modules/ui/sections/privacy.js","moduleParts":{"dist/rapid.js":"72ad-2117"},"imported":[{"uid":"72ad-1806"},{"uid":"72ad-726"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2120"}]},"72ad-2118":{"id":"modules/ui/sections/map_interaction_options.js","moduleParts":{"dist/rapid.js":"72ad-2119"},"imported":[{"uid":"72ad-1806"},{"uid":"72ad-1850"}],"importedBy":[{"uid":"72ad-2232"},{"uid":"72ad-2120"}]},"72ad-2120":{"id":"modules/ui/panes/preferences.js","moduleParts":{"dist/rapid.js":"72ad-2121"},"imported":[{"uid":"72ad-1978"},{"uid":"72ad-2116"},{"uid":"72ad-2118"}],"importedBy":[{"uid":"72ad-2090"}]},"72ad-2122":{"id":"modules/core/UiSystem.js","moduleParts":{"dist/rapid.js":"72ad-2123"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-414"},{"uid":"72ad-1778"},{"uid":"72ad-1832"},{"uid":"72ad-2090"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-2124":{"id":"modules/core/UploaderSystem.js","moduleParts":{"dist/rapid.js":"72ad-2125"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-112"},{"uid":"72ad-462"},{"uid":"72ad-520"},{"uid":"72ad-536"},{"uid":"72ad-542"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-2126":{"id":"modules/core/UrlHashSystem.js","moduleParts":{"dist/rapid.js":"72ad-2127"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-112"},{"uid":"72ad-1834"},{"uid":"72ad-682"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-2128":{"id":"modules/validations/index.js","moduleParts":{"dist/rapid.js":"72ad-2129"},"imported":[{"uid":"72ad-2130"},{"uid":"72ad-2132"},{"uid":"72ad-2134"},{"uid":"72ad-2136"},{"uid":"72ad-2138"},{"uid":"72ad-2140"},{"uid":"72ad-2142"},{"uid":"72ad-2144"},{"uid":"72ad-2146"},{"uid":"72ad-2148"},{"uid":"72ad-2150"},{"uid":"72ad-2152"},{"uid":"72ad-2154"},{"uid":"72ad-2156"},{"uid":"72ad-2158"},{"uid":"72ad-2160"},{"uid":"72ad-2162"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-2164"}]},"72ad-2130":{"id":"modules/validations/almost_junction.js","moduleParts":{"dist/rapid.js":"72ad-2131"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-434"},{"uid":"72ad-442"},{"uid":"72ad-472"},{"uid":"72ad-526"},{"uid":"72ad-116"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2132":{"id":"modules/validations/close_nodes.js","moduleParts":{"dist/rapid.js":"72ad-2133"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-472"},{"uid":"72ad-490"},{"uid":"72ad-116"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2134":{"id":"modules/validations/crossing_ways.js","moduleParts":{"dist/rapid.js":"72ad-2135"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-434"},{"uid":"72ad-442"},{"uid":"72ad-472"},{"uid":"72ad-484"},{"uid":"72ad-682"},{"uid":"72ad-444"},{"uid":"72ad-116"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2136":{"id":"modules/validations/disconnected_way.js","moduleParts":{"dist/rapid.js":"72ad-2137"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-656"},{"uid":"72ad-116"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2138":{"id":"modules/validations/duplicate_way_segments.js","moduleParts":{"dist/rapid.js":"72ad-2139"},"imported":[{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2140":{"id":"modules/validations/invalid_format.js","moduleParts":{"dist/rapid.js":"72ad-2141"},"imported":[{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2142":{"id":"modules/validations/help_request.js","moduleParts":{"dist/rapid.js":"72ad-2143"},"imported":[{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2144":{"id":"modules/validations/impossible_oneway.js","moduleParts":{"dist/rapid.js":"72ad-2145"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-114"},{"uid":"72ad-116"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2146":{"id":"modules/validations/incompatible_source.js","moduleParts":{"dist/rapid.js":"72ad-2147"},"imported":[{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2148":{"id":"modules/validations/mismatched_geometry.js","moduleParts":{"dist/rapid.js":"72ad-2149"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-4"},{"uid":"72ad-436"},{"uid":"72ad-442"},{"uid":"72ad-472"},{"uid":"72ad-466"},{"uid":"72ad-682"},{"uid":"72ad-430"},{"uid":"72ad-116"},{"uid":"72ad-526"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2150":{"id":"modules/validations/missing_role.js","moduleParts":{"dist/rapid.js":"72ad-2151"},"imported":[{"uid":"72ad-438"},{"uid":"72ad-460"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2152":{"id":"modules/validations/missing_tag.js","moduleParts":{"dist/rapid.js":"72ad-2153"},"imported":[{"uid":"72ad-656"},{"uid":"72ad-116"},{"uid":"72ad-430"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2154":{"id":"modules/validations/outdated_tags.js","moduleParts":{"dist/rapid.js":"72ad-2155"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-440"},{"uid":"72ad-442"},{"uid":"72ad-556"},{"uid":"72ad-430"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2156":{"id":"modules/validations/private_data.js","moduleParts":{"dist/rapid.js":"72ad-2157"},"imported":[{"uid":"72ad-112"},{"uid":"72ad-442"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2158":{"id":"modules/validations/y_shaped_connection.js","moduleParts":{"dist/rapid.js":"72ad-2159"},"imported":[{"uid":"72ad-408"},{"uid":"72ad-644"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2160":{"id":"modules/validations/suspicious_name.js","moduleParts":{"dist/rapid.js":"72ad-2161"},"imported":[{"uid":"72ad-442"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2162":{"id":"modules/validations/unsquare_way.js","moduleParts":{"dist/rapid.js":"72ad-2163"},"imported":[{"uid":"72ad-538"},{"uid":"72ad-528"},{"uid":"72ad-490"}],"importedBy":[{"uid":"72ad-2128"}]},"72ad-2164":{"id":"modules/core/ValidationSystem.js","moduleParts":{"dist/rapid.js":"72ad-2165"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-492"},{"uid":"72ad-682"},{"uid":"72ad-2128"}],"importedBy":[{"uid":"72ad-694"},{"uid":"72ad-2224"}]},"72ad-2166":{"id":"modules/services/index.js","moduleParts":{"dist/rapid.js":"72ad-2167"},"imported":[{"uid":"72ad-2168"},{"uid":"72ad-2170"},{"uid":"72ad-2172"},{"uid":"72ad-2174"},{"uid":"72ad-2176"},{"uid":"72ad-2178"},{"uid":"72ad-2180"},{"uid":"72ad-2194"},{"uid":"72ad-2198"},{"uid":"72ad-2200"},{"uid":"72ad-2202"},{"uid":"72ad-2204"},{"uid":"72ad-2208"},{"uid":"72ad-2210"},{"uid":"72ad-2220"},{"uid":"72ad-2222"}],"importedBy":[{"uid":"72ad-106"},{"uid":"72ad-2224"}]},"72ad-2168":{"id":"modules/services/EsriService.js","moduleParts":{"dist/rapid.js":"72ad-2169"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-490"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2170":{"id":"modules/services/ImproveOsmService.js","moduleParts":{"dist/rapid.js":"72ad-2171"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-6"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2172":{"id":"modules/services/KartaviewService.js","moduleParts":{"dist/rapid.js":"72ad-2173"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-406"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-6"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2174":{"id":"modules/services/KeepRightService.js","moduleParts":{"dist/rapid.js":"72ad-2175"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-6"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2176":{"id":"modules/services/MapillaryService.js","moduleParts":{"dist/rapid.js":"72ad-2177"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-76"},{"uid":"72ad-80"},{"uid":"72ad-6"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2178":{"id":"modules/services/MapWithAIService.js","moduleParts":{"dist/rapid.js":"72ad-2179"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-408"},{"uid":"72ad-490"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2180":{"id":"modules/services/NominatimService.js","moduleParts":{"dist/rapid.js":"72ad-2181"},"imported":[{"uid":"72ad-498"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-6"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2182":{"id":"node_modules/name-suggestion-index/lib/matcher.js","moduleParts":{"dist/rapid.js":"72ad-2183"},"imported":[{"uid":"72ad-30"},{"uid":"72ad-2184"},{"uid":"72ad-2186"},{"uid":"72ad-2188"},{"uid":"72ad-2190"}],"importedBy":[{"uid":"72ad-2192"}]},"72ad-2184":{"id":"node_modules/name-suggestion-index/lib/simplify.js","moduleParts":{"dist/rapid.js":"72ad-2185"},"imported":[{"uid":"72ad-2"}],"importedBy":[{"uid":"72ad-2192"},{"uid":"72ad-2182"},{"uid":"72ad-2551"}]},"72ad-2186":{"id":"node_modules/name-suggestion-index/config/matchGroups.json","moduleParts":{"dist/rapid.js":"72ad-2187"},"imported":[],"importedBy":[{"uid":"72ad-2182"}]},"72ad-2188":{"id":"node_modules/name-suggestion-index/config/genericWords.json","moduleParts":{"dist/rapid.js":"72ad-2189"},"imported":[],"importedBy":[{"uid":"72ad-2182"}]},"72ad-2190":{"id":"node_modules/name-suggestion-index/config/trees.json","moduleParts":{"dist/rapid.js":"72ad-2191"},"imported":[],"importedBy":[{"uid":"72ad-2182"}]},"72ad-2192":{"id":"node_modules/name-suggestion-index/index.mjs","moduleParts":{"dist/rapid.js":"72ad-2193"},"imported":[{"uid":"72ad-2182"},{"uid":"72ad-2184"},{"uid":"72ad-2551"}],"importedBy":[{"uid":"72ad-2194"}]},"72ad-2194":{"id":"modules/services/NsiService.js","moduleParts":{"dist/rapid.js":"72ad-2195"},"imported":[{"uid":"72ad-2192"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2196":{"id":"node_modules/osm-auth/src/osm-auth.mjs","moduleParts":{"dist/rapid.js":"72ad-2197"},"imported":[{"uid":"72ad-104"}],"importedBy":[{"uid":"72ad-2198"}]},"72ad-2198":{"id":"modules/services/OsmService.js","moduleParts":{"dist/rapid.js":"72ad-2199"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-1834"},{"uid":"72ad-2196"},{"uid":"72ad-6"},{"uid":"72ad-1844"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2200":{"id":"modules/services/OsmoseService.js","moduleParts":{"dist/rapid.js":"72ad-2201"},"imported":[{"uid":"72ad-1076"},{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-2024"},{"uid":"72ad-6"},{"uid":"72ad-476"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2202":{"id":"modules/services/OsmWikibaseService.js","moduleParts":{"dist/rapid.js":"72ad-2203"},"imported":[{"uid":"72ad-498"},{"uid":"72ad-112"},{"uid":"72ad-722"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2204":{"id":"modules/services/StreetsideService.js","moduleParts":{"dist/rapid.js":"72ad-2205"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-498"},{"uid":"72ad-268"},{"uid":"72ad-330"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-6"},{"uid":"72ad-2206"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2206":{"id":"modules/util/jsonp_request.js","moduleParts":{"dist/rapid.js":"72ad-2207"},"imported":[{"uid":"72ad-268"}],"importedBy":[{"uid":"72ad-2204"}]},"72ad-2208":{"id":"modules/services/TaginfoService.js","moduleParts":{"dist/rapid.js":"72ad-2209"},"imported":[{"uid":"72ad-498"},{"uid":"72ad-112"},{"uid":"72ad-722"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2210":{"id":"modules/services/VectorTileService.js","moduleParts":{"dist/rapid.js":"72ad-2211"},"imported":[{"uid":"72ad-562"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-4"},{"uid":"72ad-2218"},{"uid":"72ad-62"},{"uid":"72ad-50"},{"uid":"72ad-80"},{"uid":"72ad-76"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2212":{"id":"node_modules/@turf/helpers/dist/es/index.js","moduleParts":{"dist/rapid.js":"72ad-2213"},"imported":[],"importedBy":[{"uid":"72ad-2218"},{"uid":"72ad-2214"}]},"72ad-2214":{"id":"node_modules/@turf/invariant/dist/es/index.js","moduleParts":{"dist/rapid.js":"72ad-2215"},"imported":[{"uid":"72ad-2212"}],"importedBy":[{"uid":"72ad-2218"}]},"72ad-2216":{"id":"node_modules/@turf/bbox-clip/dist/es/lib/lineclip.js","moduleParts":{"dist/rapid.js":"72ad-2217"},"imported":[],"importedBy":[{"uid":"72ad-2218"}]},"72ad-2218":{"id":"node_modules/@turf/bbox-clip/dist/es/index.js","moduleParts":{"dist/rapid.js":"72ad-2219"},"imported":[{"uid":"72ad-2212"},{"uid":"72ad-2214"},{"uid":"72ad-2216"}],"importedBy":[{"uid":"72ad-2210"}]},"72ad-2220":{"id":"modules/services/WikidataService.js","moduleParts":{"dist/rapid.js":"72ad-2221"},"imported":[{"uid":"72ad-498"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2222":{"id":"modules/services/WikipediaService.js","moduleParts":{"dist/rapid.js":"72ad-2223"},"imported":[{"uid":"72ad-498"},{"uid":"72ad-112"}],"importedBy":[{"uid":"72ad-2166"}]},"72ad-2224":{"id":"modules/core/context.js","moduleParts":{"dist/rapid.js":"72ad-2225"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-268"},{"uid":"72ad-408"},{"uid":"72ad-112"},{"uid":"72ad-722"},{"uid":"72ad-724"},{"uid":"72ad-732"},{"uid":"72ad-734"},{"uid":"72ad-736"},{"uid":"72ad-738"},{"uid":"72ad-744"},{"uid":"72ad-1780"},{"uid":"72ad-1782"},{"uid":"72ad-1784"},{"uid":"72ad-1824"},{"uid":"72ad-1826"},{"uid":"72ad-1828"},{"uid":"72ad-2122"},{"uid":"72ad-2124"},{"uid":"72ad-2126"},{"uid":"72ad-2164"},{"uid":"72ad-560"},{"uid":"72ad-1984"},{"uid":"72ad-2166"},{"uid":"72ad-682"},{"uid":"72ad-416"}],"importedBy":[{"uid":"72ad-694"}]},"72ad-2226":{"id":"modules/svg/tag_classes.js","moduleParts":{"dist/rapid.js":"72ad-2227"},"imported":[{"uid":"72ad-268"},{"uid":"72ad-116"}],"importedBy":[{"uid":"72ad-2228"}]},"72ad-2228":{"id":"modules/svg/index.js","moduleParts":{"dist/rapid.js":"72ad-2229"},"imported":[{"uid":"72ad-2226"}],"importedBy":[{"uid":"72ad-106"}]},"72ad-2230":{"id":"modules/ui/panels/index.js","moduleParts":{"dist/rapid.js":"72ad-2231"},"imported":[{"uid":"72ad-1932"},{"uid":"72ad-1934"},{"uid":"72ad-1936"},{"uid":"72ad-1938"}],"importedBy":[{"uid":"72ad-106"}]},"72ad-2232":{"id":"modules/ui/sections/index.js","moduleParts":{"dist/rapid.js":"72ad-2233"},"imported":[{"uid":"72ad-2076"},{"uid":"72ad-2080"},{"uid":"72ad-2082"},{"uid":"72ad-1852"},{"uid":"72ad-2106"},{"uid":"72ad-1874"},{"uid":"72ad-1878"},{"uid":"72ad-2108"},{"uid":"72ad-2118"},{"uid":"72ad-2110"},{"uid":"72ad-2086"},{"uid":"72ad-2112"},{"uid":"72ad-1880"},{"uid":"72ad-2116"},{"uid":"72ad-1882"},{"uid":"72ad-1886"},{"uid":"72ad-1856"},{"uid":"72ad-1888"},{"uid":"72ad-2094"},{"uid":"72ad-2096"},{"uid":"72ad-2098"},{"uid":"72ad-2100"}],"importedBy":[{"uid":"72ad-106"}]},"72ad-2234":{"id":"modules/ui/settings/index.js","moduleParts":{"dist/rapid.js":"72ad-2235"},"imported":[{"uid":"72ad-2078"},{"uid":"72ad-2104"}],"importedBy":[{"uid":"72ad-106"}]},"72ad-2236":{"id":"node_modules/d3/src/index.js","moduleParts":{"dist/rapid.js":"72ad-2237"},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2245"},{"uid":"72ad-2240"},{"uid":"72ad-2246"},{"uid":"72ad-292"},{"uid":"72ad-2247"},{"uid":"72ad-2248"},{"uid":"72ad-174"},{"uid":"72ad-286"},{"uid":"72ad-2249"},{"uid":"72ad-386"},{"uid":"72ad-498"},{"uid":"72ad-2250"},{"uid":"72ad-2251"},{"uid":"72ad-148"},{"uid":"72ad-2252"},{"uid":"72ad-318"},{"uid":"72ad-2253"},{"uid":"72ad-164"},{"uid":"72ad-2254"},{"uid":"72ad-2255"},{"uid":"72ad-2256"},{"uid":"72ad-2257"},{"uid":"72ad-268"},{"uid":"72ad-2258"},{"uid":"72ad-2259"},{"uid":"72ad-2260"},{"uid":"72ad-330"},{"uid":"72ad-394"},{"uid":"72ad-406"}],"importedBy":[{"uid":"72ad-106"}]},"72ad-2238":{"id":"node_modules/d3-brush/src/brush.js","moduleParts":{"dist/rapid.js":"72ad-2239"},"imported":[{"uid":"72ad-174"},{"uid":"72ad-286"},{"uid":"72ad-318"},{"uid":"72ad-268"},{"uid":"72ad-394"},{"uid":"72ad-2557"},{"uid":"72ad-2558"},{"uid":"72ad-2559"}],"importedBy":[{"uid":"72ad-2240"}]},"72ad-2240":{"id":"node_modules/d3-brush/src/index.js","moduleParts":{"dist/rapid.js":"72ad-2241"},"imported":[{"uid":"72ad-2238"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2242":{"id":"modules/main.js","moduleParts":{"dist/rapid.js":"72ad-2243"},"imported":[{"uid":"72ad-106"}],"importedBy":[],"isEntry":true},"72ad-2244":{"id":"modules/ui/fields/restrictions.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1788"}]},"72ad-2245":{"id":"node_modules/d3-axis/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2309"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2246":{"id":"node_modules/d3-chord/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2310"},{"uid":"72ad-2311"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2247":{"id":"node_modules/d3-contour/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2314"},{"uid":"72ad-2315"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2248":{"id":"node_modules/d3-delaunay/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2316"},{"uid":"72ad-2317"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2249":{"id":"node_modules/d3-dsv/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2318"},{"uid":"72ad-2319"},{"uid":"72ad-2320"},{"uid":"72ad-2321"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2332"}]},"72ad-2250":{"id":"node_modules/d3-force/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2334"},{"uid":"72ad-2335"},{"uid":"72ad-2336"},{"uid":"72ad-2337"},{"uid":"72ad-2338"},{"uid":"72ad-2339"},{"uid":"72ad-2340"},{"uid":"72ad-2341"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2251":{"id":"node_modules/d3-format/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2342"},{"uid":"72ad-2343"},{"uid":"72ad-2344"},{"uid":"72ad-2345"},{"uid":"72ad-2346"},{"uid":"72ad-2347"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2424"},{"uid":"72ad-2437"}]},"72ad-2252":{"id":"node_modules/d3-hierarchy/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2375"},{"uid":"72ad-2376"},{"uid":"72ad-2377"},{"uid":"72ad-2378"},{"uid":"72ad-2379"},{"uid":"72ad-2380"},{"uid":"72ad-2381"},{"uid":"72ad-2382"},{"uid":"72ad-2383"},{"uid":"72ad-2384"},{"uid":"72ad-2385"},{"uid":"72ad-2386"},{"uid":"72ad-2387"},{"uid":"72ad-2388"},{"uid":"72ad-2389"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2253":{"id":"node_modules/d3-path/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2399"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2311"},{"uid":"72ad-2643"}]},"72ad-2254":{"id":"node_modules/d3-quadtree/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2402"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2335"},{"uid":"72ad-2337"}]},"72ad-2255":{"id":"node_modules/d3-random/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2403"},{"uid":"72ad-2404"},{"uid":"72ad-2405"},{"uid":"72ad-2406"},{"uid":"72ad-2407"},{"uid":"72ad-2408"},{"uid":"72ad-2409"},{"uid":"72ad-2410"},{"uid":"72ad-2411"},{"uid":"72ad-2412"},{"uid":"72ad-2413"},{"uid":"72ad-2414"},{"uid":"72ad-2415"},{"uid":"72ad-2416"},{"uid":"72ad-2417"},{"uid":"72ad-2418"},{"uid":"72ad-2419"},{"uid":"72ad-2420"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2256":{"id":"node_modules/d3-scale/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2421"},{"uid":"72ad-2422"},{"uid":"72ad-2423"},{"uid":"72ad-2424"},{"uid":"72ad-2425"},{"uid":"72ad-2426"},{"uid":"72ad-2427"},{"uid":"72ad-2428"},{"uid":"72ad-2429"},{"uid":"72ad-2430"},{"uid":"72ad-2431"},{"uid":"72ad-2432"},{"uid":"72ad-2433"},{"uid":"72ad-2434"},{"uid":"72ad-2435"},{"uid":"72ad-2436"},{"uid":"72ad-2437"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2257":{"id":"node_modules/d3-scale-chromatic/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2438"},{"uid":"72ad-2439"},{"uid":"72ad-2440"},{"uid":"72ad-2441"},{"uid":"72ad-2442"},{"uid":"72ad-2443"},{"uid":"72ad-2444"},{"uid":"72ad-2445"},{"uid":"72ad-2446"},{"uid":"72ad-2447"},{"uid":"72ad-2448"},{"uid":"72ad-2449"},{"uid":"72ad-2450"},{"uid":"72ad-2451"},{"uid":"72ad-2452"},{"uid":"72ad-2453"},{"uid":"72ad-2454"},{"uid":"72ad-2455"},{"uid":"72ad-2456"},{"uid":"72ad-2457"},{"uid":"72ad-2458"},{"uid":"72ad-2459"},{"uid":"72ad-2460"},{"uid":"72ad-2461"},{"uid":"72ad-2462"},{"uid":"72ad-2463"},{"uid":"72ad-2464"},{"uid":"72ad-2465"},{"uid":"72ad-2466"},{"uid":"72ad-2467"},{"uid":"72ad-2468"},{"uid":"72ad-2469"},{"uid":"72ad-2470"},{"uid":"72ad-2471"},{"uid":"72ad-2472"},{"uid":"72ad-2473"},{"uid":"72ad-2474"},{"uid":"72ad-2475"},{"uid":"72ad-2476"},{"uid":"72ad-2477"},{"uid":"72ad-2478"},{"uid":"72ad-2479"},{"uid":"72ad-2480"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2258":{"id":"node_modules/d3-shape/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2484"},{"uid":"72ad-2485"},{"uid":"72ad-2486"},{"uid":"72ad-2487"},{"uid":"72ad-2488"},{"uid":"72ad-2489"},{"uid":"72ad-2490"},{"uid":"72ad-2491"},{"uid":"72ad-2492"},{"uid":"72ad-2493"},{"uid":"72ad-2494"},{"uid":"72ad-2495"},{"uid":"72ad-2496"},{"uid":"72ad-2497"},{"uid":"72ad-2498"},{"uid":"72ad-2499"},{"uid":"72ad-2500"},{"uid":"72ad-2501"},{"uid":"72ad-2502"},{"uid":"72ad-2503"},{"uid":"72ad-2504"},{"uid":"72ad-2505"},{"uid":"72ad-2506"},{"uid":"72ad-2507"},{"uid":"72ad-2508"},{"uid":"72ad-2509"},{"uid":"72ad-2510"},{"uid":"72ad-2511"},{"uid":"72ad-2512"},{"uid":"72ad-2513"},{"uid":"72ad-2514"},{"uid":"72ad-2515"},{"uid":"72ad-2516"},{"uid":"72ad-2517"},{"uid":"72ad-2518"},{"uid":"72ad-2519"},{"uid":"72ad-2520"},{"uid":"72ad-2521"},{"uid":"72ad-2522"},{"uid":"72ad-2523"},{"uid":"72ad-2524"},{"uid":"72ad-2525"},{"uid":"72ad-2526"},{"uid":"72ad-2527"},{"uid":"72ad-2528"},{"uid":"72ad-2529"},{"uid":"72ad-2530"},{"uid":"72ad-2531"},{"uid":"72ad-2532"},{"uid":"72ad-2533"}],"importedBy":[{"uid":"72ad-2236"}]},"72ad-2259":{"id":"node_modules/d3-time/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2534"},{"uid":"72ad-2535"},{"uid":"72ad-2536"},{"uid":"72ad-2537"},{"uid":"72ad-2538"},{"uid":"72ad-2539"},{"uid":"72ad-2540"},{"uid":"72ad-2541"},{"uid":"72ad-2542"},{"uid":"72ad-2543"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2432"},{"uid":"72ad-2433"},{"uid":"72ad-2545"}]},"72ad-2260":{"id":"node_modules/d3-time-format/src/index.js","moduleParts":{},"imported":[{"uid":"72ad-2544"},{"uid":"72ad-2545"},{"uid":"72ad-2546"},{"uid":"72ad-2547"}],"importedBy":[{"uid":"72ad-2236"},{"uid":"72ad-2432"},{"uid":"72ad-2433"}]},"72ad-2261":{"id":"node_modules/d3-array/src/bisect.js","moduleParts":{},"imported":[{"uid":"72ad-118"},{"uid":"72ad-2262"},{"uid":"72ad-122"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2271"}]},"72ad-2262":{"id":"node_modules/d3-array/src/bisector.js","moduleParts":{},"imported":[{"uid":"72ad-118"},{"uid":"72ad-120"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2261"}]},"72ad-2263":{"id":"node_modules/d3-array/src/blur.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2264":{"id":"node_modules/d3-array/src/count.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2272"},{"uid":"72ad-2273"},{"uid":"72ad-2274"}]},"72ad-2265":{"id":"node_modules/d3-array/src/cross.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2266":{"id":"node_modules/d3-array/src/cumsum.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2267":{"id":"node_modules/d3-array/src/deviation.js","moduleParts":{},"imported":[{"uid":"72ad-2294"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2273"}]},"72ad-2268":{"id":"node_modules/d3-array/src/extent.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2271"}]},"72ad-2269":{"id":"node_modules/d3-array/src/group.js","moduleParts":{},"imported":[{"uid":"72ad-2308"},{"uid":"72ad-2553"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2270"}]},"72ad-2270":{"id":"node_modules/d3-array/src/groupSort.js","moduleParts":{},"imported":[{"uid":"72ad-118"},{"uid":"72ad-2269"},{"uid":"72ad-128"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2271":{"id":"node_modules/d3-array/src/bin.js","moduleParts":{},"imported":[{"uid":"72ad-2554"},{"uid":"72ad-2261"},{"uid":"72ad-2555"},{"uid":"72ad-2268"},{"uid":"72ad-2553"},{"uid":"72ad-2280"},{"uid":"72ad-2292"},{"uid":"72ad-2274"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2272":{"id":"node_modules/d3-array/src/threshold/freedmanDiaconis.js","moduleParts":{},"imported":[{"uid":"72ad-2264"},{"uid":"72ad-136"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2273":{"id":"node_modules/d3-array/src/threshold/scott.js","moduleParts":{},"imported":[{"uid":"72ad-2264"},{"uid":"72ad-2267"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2274":{"id":"node_modules/d3-array/src/threshold/sturges.js","moduleParts":{},"imported":[{"uid":"72ad-2264"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2271"}]},"72ad-2275":{"id":"node_modules/d3-array/src/maxIndex.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-136"},{"uid":"72ad-2288"}]},"72ad-2276":{"id":"node_modules/d3-array/src/mean.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2277":{"id":"node_modules/d3-array/src/merge.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2278":{"id":"node_modules/d3-array/src/minIndex.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-136"},{"uid":"72ad-2286"}]},"72ad-2279":{"id":"node_modules/d3-array/src/mode.js","moduleParts":{},"imported":[{"uid":"72ad-2308"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2280":{"id":"node_modules/d3-array/src/nice.js","moduleParts":{},"imported":[{"uid":"72ad-2292"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2271"}]},"72ad-2281":{"id":"node_modules/d3-array/src/pairs.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2282":{"id":"node_modules/d3-array/src/permute.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-128"}]},"72ad-2283":{"id":"node_modules/d3-array/src/range.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2284":{"id":"node_modules/d3-array/src/rank.js","moduleParts":{},"imported":[{"uid":"72ad-118"},{"uid":"72ad-128"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2285":{"id":"node_modules/d3-array/src/least.js","moduleParts":{},"imported":[{"uid":"72ad-118"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2286":{"id":"node_modules/d3-array/src/leastIndex.js","moduleParts":{},"imported":[{"uid":"72ad-118"},{"uid":"72ad-2278"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2289"}]},"72ad-2287":{"id":"node_modules/d3-array/src/greatest.js","moduleParts":{},"imported":[{"uid":"72ad-118"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-136"}]},"72ad-2288":{"id":"node_modules/d3-array/src/greatestIndex.js","moduleParts":{},"imported":[{"uid":"72ad-118"},{"uid":"72ad-2275"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2289":{"id":"node_modules/d3-array/src/scan.js","moduleParts":{},"imported":[{"uid":"72ad-2286"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2290":{"id":"node_modules/d3-array/src/shuffle.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2291":{"id":"node_modules/d3-array/src/sum.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2292":{"id":"node_modules/d3-array/src/ticks.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2271"},{"uid":"72ad-2280"}]},"72ad-2293":{"id":"node_modules/d3-array/src/transpose.js","moduleParts":{},"imported":[{"uid":"72ad-132"}],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2295"}]},"72ad-2294":{"id":"node_modules/d3-array/src/variance.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2267"}]},"72ad-2295":{"id":"node_modules/d3-array/src/zip.js","moduleParts":{},"imported":[{"uid":"72ad-2293"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2296":{"id":"node_modules/d3-array/src/every.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2297":{"id":"node_modules/d3-array/src/some.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2298":{"id":"node_modules/d3-array/src/filter.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2299":{"id":"node_modules/d3-array/src/map.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2300":{"id":"node_modules/d3-array/src/reduce.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2301":{"id":"node_modules/d3-array/src/reverse.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"}]},"72ad-2302":{"id":"node_modules/d3-array/src/difference.js","moduleParts":{},"imported":[{"uid":"72ad-2308"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2303":{"id":"node_modules/d3-array/src/disjoint.js","moduleParts":{},"imported":[{"uid":"72ad-2308"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2304":{"id":"node_modules/d3-array/src/intersection.js","moduleParts":{},"imported":[{"uid":"72ad-2308"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2305":{"id":"node_modules/d3-array/src/subset.js","moduleParts":{},"imported":[{"uid":"72ad-2306"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2306":{"id":"node_modules/d3-array/src/superset.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2305"}]},"72ad-2307":{"id":"node_modules/d3-array/src/union.js","moduleParts":{},"imported":[{"uid":"72ad-2308"}],"importedBy":[{"uid":"72ad-124"}]},"72ad-2308":{"id":"node_modules/internmap/src/index.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-124"},{"uid":"72ad-2269"},{"uid":"72ad-2279"},{"uid":"72ad-2302"},{"uid":"72ad-2303"},{"uid":"72ad-2304"},{"uid":"72ad-2307"}]},"72ad-2309":{"id":"node_modules/d3-axis/src/axis.js","moduleParts":{},"imported":[{"uid":"72ad-2556"}],"importedBy":[{"uid":"72ad-2245"}]},"72ad-2310":{"id":"node_modules/d3-chord/src/chord.js","moduleParts":{},"imported":[{"uid":"72ad-2560"}],"importedBy":[{"uid":"72ad-2246"}]},"72ad-2311":{"id":"node_modules/d3-chord/src/ribbon.js","moduleParts":{},"imported":[{"uid":"72ad-2253"},{"uid":"72ad-2561"},{"uid":"72ad-2562"},{"uid":"72ad-2560"}],"importedBy":[{"uid":"72ad-2246"}]},"72ad-2312":{"id":"node_modules/d3-color/src/lab.js","moduleParts":{},"imported":[{"uid":"72ad-288"},{"uid":"72ad-290"},{"uid":"72ad-2563"}],"importedBy":[{"uid":"72ad-292"}]},"72ad-2313":{"id":"node_modules/d3-color/src/cubehelix.js","moduleParts":{},"imported":[{"uid":"72ad-288"},{"uid":"72ad-290"},{"uid":"72ad-2563"}],"importedBy":[{"uid":"72ad-292"}]},"72ad-2314":{"id":"node_modules/d3-contour/src/contours.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2564"},{"uid":"72ad-2565"},{"uid":"72ad-2566"},{"uid":"72ad-2567"},{"uid":"72ad-2568"},{"uid":"72ad-2569"}],"importedBy":[{"uid":"72ad-2247"},{"uid":"72ad-2315"}]},"72ad-2315":{"id":"node_modules/d3-contour/src/density.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2564"},{"uid":"72ad-2567"},{"uid":"72ad-2314"}],"importedBy":[{"uid":"72ad-2247"}]},"72ad-2316":{"id":"node_modules/d3-delaunay/src/delaunay.js","moduleParts":{},"imported":[{"uid":"72ad-2570"},{"uid":"72ad-2571"},{"uid":"72ad-2572"},{"uid":"72ad-2317"}],"importedBy":[{"uid":"72ad-2248"}]},"72ad-2317":{"id":"node_modules/d3-delaunay/src/voronoi.js","moduleParts":{},"imported":[{"uid":"72ad-2571"},{"uid":"72ad-2572"}],"importedBy":[{"uid":"72ad-2248"},{"uid":"72ad-2316"}]},"72ad-2318":{"id":"node_modules/d3-dsv/src/dsv.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2249"},{"uid":"72ad-2319"},{"uid":"72ad-2320"}]},"72ad-2319":{"id":"node_modules/d3-dsv/src/csv.js","moduleParts":{},"imported":[{"uid":"72ad-2318"}],"importedBy":[{"uid":"72ad-2249"}]},"72ad-2320":{"id":"node_modules/d3-dsv/src/tsv.js","moduleParts":{},"imported":[{"uid":"72ad-2318"}],"importedBy":[{"uid":"72ad-2249"}]},"72ad-2321":{"id":"node_modules/d3-dsv/src/autoType.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2249"}]},"72ad-2322":{"id":"node_modules/d3-ease/src/quad.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-2323":{"id":"node_modules/d3-ease/src/poly.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-2324":{"id":"node_modules/d3-ease/src/sin.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-2325":{"id":"node_modules/d3-ease/src/exp.js","moduleParts":{},"imported":[{"uid":"72ad-2573"}],"importedBy":[{"uid":"72ad-386"}]},"72ad-2326":{"id":"node_modules/d3-ease/src/circle.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-2327":{"id":"node_modules/d3-ease/src/bounce.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-2328":{"id":"node_modules/d3-ease/src/back.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-386"}]},"72ad-2329":{"id":"node_modules/d3-ease/src/elastic.js","moduleParts":{},"imported":[{"uid":"72ad-2573"}],"importedBy":[{"uid":"72ad-386"}]},"72ad-2330":{"id":"node_modules/d3-fetch/src/blob.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-498"}]},"72ad-2331":{"id":"node_modules/d3-fetch/src/buffer.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-498"}]},"72ad-2332":{"id":"node_modules/d3-fetch/src/dsv.js","moduleParts":{},"imported":[{"uid":"72ad-2249"},{"uid":"72ad-494"}],"importedBy":[{"uid":"72ad-498"}]},"72ad-2333":{"id":"node_modules/d3-fetch/src/image.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-498"}]},"72ad-2334":{"id":"node_modules/d3-force/src/center.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2250"}]},"72ad-2335":{"id":"node_modules/d3-force/src/collide.js","moduleParts":{},"imported":[{"uid":"72ad-2254"},{"uid":"72ad-2574"},{"uid":"72ad-2575"}],"importedBy":[{"uid":"72ad-2250"}]},"72ad-2336":{"id":"node_modules/d3-force/src/link.js","moduleParts":{},"imported":[{"uid":"72ad-2574"},{"uid":"72ad-2575"}],"importedBy":[{"uid":"72ad-2250"}]},"72ad-2337":{"id":"node_modules/d3-force/src/manyBody.js","moduleParts":{},"imported":[{"uid":"72ad-2254"},{"uid":"72ad-2574"},{"uid":"72ad-2575"},{"uid":"72ad-2339"}],"importedBy":[{"uid":"72ad-2250"}]},"72ad-2338":{"id":"node_modules/d3-force/src/radial.js","moduleParts":{},"imported":[{"uid":"72ad-2574"}],"importedBy":[{"uid":"72ad-2250"}]},"72ad-2339":{"id":"node_modules/d3-force/src/simulation.js","moduleParts":{},"imported":[{"uid":"72ad-174"},{"uid":"72ad-330"},{"uid":"72ad-2576"}],"importedBy":[{"uid":"72ad-2250"},{"uid":"72ad-2337"}]},"72ad-2340":{"id":"node_modules/d3-force/src/x.js","moduleParts":{},"imported":[{"uid":"72ad-2574"}],"importedBy":[{"uid":"72ad-2250"}]},"72ad-2341":{"id":"node_modules/d3-force/src/y.js","moduleParts":{},"imported":[{"uid":"72ad-2574"}],"importedBy":[{"uid":"72ad-2250"}]},"72ad-2342":{"id":"node_modules/d3-format/src/defaultLocale.js","moduleParts":{},"imported":[{"uid":"72ad-2343"}],"importedBy":[{"uid":"72ad-2251"}]},"72ad-2343":{"id":"node_modules/d3-format/src/locale.js","moduleParts":{},"imported":[{"uid":"72ad-2577"},{"uid":"72ad-2578"},{"uid":"72ad-2579"},{"uid":"72ad-2344"},{"uid":"72ad-2580"},{"uid":"72ad-2581"},{"uid":"72ad-2582"},{"uid":"72ad-2583"}],"importedBy":[{"uid":"72ad-2251"},{"uid":"72ad-2342"}]},"72ad-2344":{"id":"node_modules/d3-format/src/formatSpecifier.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2251"},{"uid":"72ad-2343"}]},"72ad-2345":{"id":"node_modules/d3-format/src/precisionFixed.js","moduleParts":{},"imported":[{"uid":"72ad-2577"}],"importedBy":[{"uid":"72ad-2251"}]},"72ad-2346":{"id":"node_modules/d3-format/src/precisionPrefix.js","moduleParts":{},"imported":[{"uid":"72ad-2577"}],"importedBy":[{"uid":"72ad-2251"}]},"72ad-2347":{"id":"node_modules/d3-format/src/precisionRound.js","moduleParts":{},"imported":[{"uid":"72ad-2577"}],"importedBy":[{"uid":"72ad-2251"}]},"72ad-2348":{"id":"node_modules/d3-geo/src/circle.js","moduleParts":{},"imported":[{"uid":"72ad-150"},{"uid":"72ad-2584"},{"uid":"72ad-140"},{"uid":"72ad-2374"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2350"}]},"72ad-2349":{"id":"node_modules/d3-geo/src/clip/antimeridian.js","moduleParts":{},"imported":[{"uid":"72ad-2585"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2369"}]},"72ad-2350":{"id":"node_modules/d3-geo/src/clip/circle.js","moduleParts":{},"imported":[{"uid":"72ad-150"},{"uid":"72ad-2348"},{"uid":"72ad-140"},{"uid":"72ad-2586"},{"uid":"72ad-2585"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2369"}]},"72ad-2351":{"id":"node_modules/d3-geo/src/clip/extent.js","moduleParts":{},"imported":[{"uid":"72ad-2352"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2352":{"id":"node_modules/d3-geo/src/clip/rectangle.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2587"},{"uid":"72ad-2588"},{"uid":"72ad-2589"},{"uid":"72ad-124"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2351"},{"uid":"72ad-2368"},{"uid":"72ad-2369"}]},"72ad-2353":{"id":"node_modules/d3-geo/src/contains.js","moduleParts":{},"imported":[{"uid":"72ad-2590"},{"uid":"72ad-2354"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2354":{"id":"node_modules/d3-geo/src/distance.js","moduleParts":{},"imported":[{"uid":"72ad-156"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2353"}]},"72ad-2355":{"id":"node_modules/d3-geo/src/graticule.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2356":{"id":"node_modules/d3-geo/src/interpolate.js","moduleParts":{},"imported":[{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2357":{"id":"node_modules/d3-geo/src/path/index.js","moduleParts":{},"imported":[{"uid":"72ad-2591"},{"uid":"72ad-144"},{"uid":"72ad-2592"},{"uid":"72ad-2593"},{"uid":"72ad-2594"},{"uid":"72ad-2595"},{"uid":"72ad-2596"},{"uid":"72ad-2597"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2358":{"id":"node_modules/d3-geo/src/projection/albers.js","moduleParts":{},"imported":[{"uid":"72ad-2363"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2359"}]},"72ad-2359":{"id":"node_modules/d3-geo/src/projection/albersUsa.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2358"},{"uid":"72ad-2363"},{"uid":"72ad-2598"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2360":{"id":"node_modules/d3-geo/src/projection/azimuthalEqualArea.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2599"},{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2361":{"id":"node_modules/d3-geo/src/projection/azimuthalEquidistant.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2599"},{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2362":{"id":"node_modules/d3-geo/src/projection/conicConformal.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2600"},{"uid":"72ad-160"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2363":{"id":"node_modules/d3-geo/src/projection/conicEqualArea.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2600"},{"uid":"72ad-2601"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2358"},{"uid":"72ad-2359"}]},"72ad-2364":{"id":"node_modules/d3-geo/src/projection/conicEquidistant.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2600"},{"uid":"72ad-2366"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2365":{"id":"node_modules/d3-geo/src/projection/equalEarth.js","moduleParts":{},"imported":[{"uid":"72ad-2369"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2366":{"id":"node_modules/d3-geo/src/projection/equirectangular.js","moduleParts":{},"imported":[{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2364"}]},"72ad-2367":{"id":"node_modules/d3-geo/src/projection/gnomonic.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2599"},{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2368":{"id":"node_modules/d3-geo/src/projection/identity.js","moduleParts":{},"imported":[{"uid":"72ad-2352"},{"uid":"72ad-2591"},{"uid":"72ad-158"},{"uid":"72ad-2598"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2369":{"id":"node_modules/d3-geo/src/projection/index.js","moduleParts":{},"imported":[{"uid":"72ad-2349"},{"uid":"72ad-2350"},{"uid":"72ad-2352"},{"uid":"72ad-2602"},{"uid":"72ad-2591"},{"uid":"72ad-140"},{"uid":"72ad-2374"},{"uid":"72ad-158"},{"uid":"72ad-2598"},{"uid":"72ad-2603"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2360"},{"uid":"72ad-2361"},{"uid":"72ad-2365"},{"uid":"72ad-2366"},{"uid":"72ad-2367"},{"uid":"72ad-160"},{"uid":"72ad-2370"},{"uid":"72ad-2371"},{"uid":"72ad-2372"},{"uid":"72ad-2600"}]},"72ad-2370":{"id":"node_modules/d3-geo/src/projection/naturalEarth1.js","moduleParts":{},"imported":[{"uid":"72ad-2369"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2371":{"id":"node_modules/d3-geo/src/projection/orthographic.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2599"},{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2372":{"id":"node_modules/d3-geo/src/projection/stereographic.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2599"},{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2373":{"id":"node_modules/d3-geo/src/projection/transverseMercator.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-160"}],"importedBy":[{"uid":"72ad-148"}]},"72ad-2374":{"id":"node_modules/d3-geo/src/rotation.js","moduleParts":{},"imported":[{"uid":"72ad-2602"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-148"},{"uid":"72ad-2348"},{"uid":"72ad-2369"},{"uid":"72ad-160"}]},"72ad-2375":{"id":"node_modules/d3-hierarchy/src/cluster.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2376":{"id":"node_modules/d3-hierarchy/src/hierarchy/index.js","moduleParts":{},"imported":[{"uid":"72ad-2604"},{"uid":"72ad-2605"},{"uid":"72ad-2606"},{"uid":"72ad-2607"},{"uid":"72ad-2608"},{"uid":"72ad-2609"},{"uid":"72ad-2610"},{"uid":"72ad-2611"},{"uid":"72ad-2612"},{"uid":"72ad-2613"},{"uid":"72ad-2614"},{"uid":"72ad-2615"},{"uid":"72ad-2616"}],"importedBy":[{"uid":"72ad-2252"},{"uid":"72ad-2381"},{"uid":"72ad-2382"}]},"72ad-2377":{"id":"node_modules/d3-hierarchy/src/pack/index.js","moduleParts":{},"imported":[{"uid":"72ad-2617"},{"uid":"72ad-2618"},{"uid":"72ad-2619"},{"uid":"72ad-2378"}],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2378":{"id":"node_modules/d3-hierarchy/src/pack/siblings.js","moduleParts":{},"imported":[{"uid":"72ad-2620"},{"uid":"72ad-2619"},{"uid":"72ad-2379"}],"importedBy":[{"uid":"72ad-2252"},{"uid":"72ad-2377"}]},"72ad-2379":{"id":"node_modules/d3-hierarchy/src/pack/enclose.js","moduleParts":{},"imported":[{"uid":"72ad-2620"},{"uid":"72ad-2619"}],"importedBy":[{"uid":"72ad-2252"},{"uid":"72ad-2378"}]},"72ad-2380":{"id":"node_modules/d3-hierarchy/src/partition.js","moduleParts":{},"imported":[{"uid":"72ad-2621"},{"uid":"72ad-2385"}],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2381":{"id":"node_modules/d3-hierarchy/src/stratify.js","moduleParts":{},"imported":[{"uid":"72ad-2617"},{"uid":"72ad-2376"}],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2382":{"id":"node_modules/d3-hierarchy/src/tree.js","moduleParts":{},"imported":[{"uid":"72ad-2376"}],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2383":{"id":"node_modules/d3-hierarchy/src/treemap/index.js","moduleParts":{},"imported":[{"uid":"72ad-2621"},{"uid":"72ad-2388"},{"uid":"72ad-2617"},{"uid":"72ad-2618"}],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2384":{"id":"node_modules/d3-hierarchy/src/treemap/binary.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2385":{"id":"node_modules/d3-hierarchy/src/treemap/dice.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2252"},{"uid":"72ad-2380"},{"uid":"72ad-2387"},{"uid":"72ad-2388"},{"uid":"72ad-2389"}]},"72ad-2386":{"id":"node_modules/d3-hierarchy/src/treemap/slice.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2252"},{"uid":"72ad-2387"},{"uid":"72ad-2388"},{"uid":"72ad-2389"}]},"72ad-2387":{"id":"node_modules/d3-hierarchy/src/treemap/sliceDice.js","moduleParts":{},"imported":[{"uid":"72ad-2385"},{"uid":"72ad-2386"}],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2388":{"id":"node_modules/d3-hierarchy/src/treemap/squarify.js","moduleParts":{},"imported":[{"uid":"72ad-2385"},{"uid":"72ad-2386"}],"importedBy":[{"uid":"72ad-2252"},{"uid":"72ad-2383"},{"uid":"72ad-2389"}]},"72ad-2389":{"id":"node_modules/d3-hierarchy/src/treemap/resquarify.js","moduleParts":{},"imported":[{"uid":"72ad-2385"},{"uid":"72ad-2386"},{"uid":"72ad-2388"}],"importedBy":[{"uid":"72ad-2252"}]},"72ad-2390":{"id":"node_modules/d3-interpolate/src/discrete.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-318"}]},"72ad-2391":{"id":"node_modules/d3-interpolate/src/hue.js","moduleParts":{},"imported":[{"uid":"72ad-300"}],"importedBy":[{"uid":"72ad-318"}]},"72ad-2392":{"id":"node_modules/d3-interpolate/src/round.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-318"}]},"72ad-2393":{"id":"node_modules/d3-interpolate/src/hsl.js","moduleParts":{},"imported":[{"uid":"72ad-292"},{"uid":"72ad-300"}],"importedBy":[{"uid":"72ad-318"}]},"72ad-2394":{"id":"node_modules/d3-interpolate/src/lab.js","moduleParts":{},"imported":[{"uid":"72ad-292"},{"uid":"72ad-300"}],"importedBy":[{"uid":"72ad-318"}]},"72ad-2395":{"id":"node_modules/d3-interpolate/src/hcl.js","moduleParts":{},"imported":[{"uid":"72ad-292"},{"uid":"72ad-300"}],"importedBy":[{"uid":"72ad-318"}]},"72ad-2396":{"id":"node_modules/d3-interpolate/src/cubehelix.js","moduleParts":{},"imported":[{"uid":"72ad-292"},{"uid":"72ad-300"}],"importedBy":[{"uid":"72ad-318"}]},"72ad-2397":{"id":"node_modules/d3-interpolate/src/piecewise.js","moduleParts":{},"imported":[{"uid":"72ad-316"}],"importedBy":[{"uid":"72ad-318"}]},"72ad-2398":{"id":"node_modules/d3-interpolate/src/quantize.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-318"}]},"72ad-2399":{"id":"node_modules/d3-path/src/path.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2253"}]},"72ad-2400":{"id":"node_modules/d3-polygon/src/contains.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-164"}]},"72ad-2401":{"id":"node_modules/d3-polygon/src/length.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-164"}]},"72ad-2402":{"id":"node_modules/d3-quadtree/src/quadtree.js","moduleParts":{},"imported":[{"uid":"72ad-2622"},{"uid":"72ad-2623"},{"uid":"72ad-2624"},{"uid":"72ad-2625"},{"uid":"72ad-2626"},{"uid":"72ad-2627"},{"uid":"72ad-2628"},{"uid":"72ad-2629"},{"uid":"72ad-2630"},{"uid":"72ad-2631"},{"uid":"72ad-2632"},{"uid":"72ad-2633"}],"importedBy":[{"uid":"72ad-2254"}]},"72ad-2403":{"id":"node_modules/d3-random/src/uniform.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2404":{"id":"node_modules/d3-random/src/int.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2405":{"id":"node_modules/d3-random/src/normal.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"},{"uid":"72ad-2406"},{"uid":"72ad-2414"}]},"72ad-2406":{"id":"node_modules/d3-random/src/logNormal.js","moduleParts":{},"imported":[{"uid":"72ad-2634"},{"uid":"72ad-2405"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2407":{"id":"node_modules/d3-random/src/bates.js","moduleParts":{},"imported":[{"uid":"72ad-2634"},{"uid":"72ad-2408"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2408":{"id":"node_modules/d3-random/src/irwinHall.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"},{"uid":"72ad-2407"}]},"72ad-2409":{"id":"node_modules/d3-random/src/exponential.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2410":{"id":"node_modules/d3-random/src/pareto.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2411":{"id":"node_modules/d3-random/src/bernoulli.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2412":{"id":"node_modules/d3-random/src/geometric.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"},{"uid":"72ad-2413"}]},"72ad-2413":{"id":"node_modules/d3-random/src/binomial.js","moduleParts":{},"imported":[{"uid":"72ad-2634"},{"uid":"72ad-2415"},{"uid":"72ad-2412"}],"importedBy":[{"uid":"72ad-2255"},{"uid":"72ad-2419"}]},"72ad-2414":{"id":"node_modules/d3-random/src/gamma.js","moduleParts":{},"imported":[{"uid":"72ad-2634"},{"uid":"72ad-2405"}],"importedBy":[{"uid":"72ad-2255"},{"uid":"72ad-2415"},{"uid":"72ad-2419"}]},"72ad-2415":{"id":"node_modules/d3-random/src/beta.js","moduleParts":{},"imported":[{"uid":"72ad-2634"},{"uid":"72ad-2414"}],"importedBy":[{"uid":"72ad-2255"},{"uid":"72ad-2413"}]},"72ad-2416":{"id":"node_modules/d3-random/src/weibull.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2417":{"id":"node_modules/d3-random/src/cauchy.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2418":{"id":"node_modules/d3-random/src/logistic.js","moduleParts":{},"imported":[{"uid":"72ad-2634"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2419":{"id":"node_modules/d3-random/src/poisson.js","moduleParts":{},"imported":[{"uid":"72ad-2634"},{"uid":"72ad-2413"},{"uid":"72ad-2414"}],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2420":{"id":"node_modules/d3-random/src/lcg.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2255"}]},"72ad-2421":{"id":"node_modules/d3-scale/src/band.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2635"},{"uid":"72ad-2426"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2422":{"id":"node_modules/d3-scale/src/identity.js","moduleParts":{},"imported":[{"uid":"72ad-2423"},{"uid":"72ad-2636"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2423":{"id":"node_modules/d3-scale/src/linear.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2637"},{"uid":"72ad-2635"},{"uid":"72ad-2437"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2422"},{"uid":"72ad-2425"},{"uid":"72ad-2427"},{"uid":"72ad-2428"},{"uid":"72ad-2430"},{"uid":"72ad-2434"},{"uid":"72ad-2436"}]},"72ad-2424":{"id":"node_modules/d3-scale/src/log.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2251"},{"uid":"72ad-2638"},{"uid":"72ad-2637"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2434"},{"uid":"72ad-2436"}]},"72ad-2425":{"id":"node_modules/d3-scale/src/symlog.js","moduleParts":{},"imported":[{"uid":"72ad-2423"},{"uid":"72ad-2637"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2434"},{"uid":"72ad-2436"}]},"72ad-2426":{"id":"node_modules/d3-scale/src/ordinal.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2421"}]},"72ad-2427":{"id":"node_modules/d3-scale/src/pow.js","moduleParts":{},"imported":[{"uid":"72ad-2423"},{"uid":"72ad-2637"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2434"},{"uid":"72ad-2436"}]},"72ad-2428":{"id":"node_modules/d3-scale/src/radial.js","moduleParts":{},"imported":[{"uid":"72ad-2637"},{"uid":"72ad-2635"},{"uid":"72ad-2423"},{"uid":"72ad-2636"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2429":{"id":"node_modules/d3-scale/src/quantile.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2430":{"id":"node_modules/d3-scale/src/quantize.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2423"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2431":{"id":"node_modules/d3-scale/src/threshold.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2432":{"id":"node_modules/d3-scale/src/time.js","moduleParts":{},"imported":[{"uid":"72ad-2259"},{"uid":"72ad-2260"},{"uid":"72ad-2637"},{"uid":"72ad-2635"},{"uid":"72ad-2638"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2433"}]},"72ad-2433":{"id":"node_modules/d3-scale/src/utcTime.js","moduleParts":{},"imported":[{"uid":"72ad-2259"},{"uid":"72ad-2260"},{"uid":"72ad-2432"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2434":{"id":"node_modules/d3-scale/src/sequential.js","moduleParts":{},"imported":[{"uid":"72ad-318"},{"uid":"72ad-2637"},{"uid":"72ad-2635"},{"uid":"72ad-2423"},{"uid":"72ad-2424"},{"uid":"72ad-2425"},{"uid":"72ad-2427"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2436"}]},"72ad-2435":{"id":"node_modules/d3-scale/src/sequentialQuantile.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2637"},{"uid":"72ad-2635"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2436":{"id":"node_modules/d3-scale/src/diverging.js","moduleParts":{},"imported":[{"uid":"72ad-318"},{"uid":"72ad-2637"},{"uid":"72ad-2635"},{"uid":"72ad-2423"},{"uid":"72ad-2424"},{"uid":"72ad-2434"},{"uid":"72ad-2425"},{"uid":"72ad-2427"}],"importedBy":[{"uid":"72ad-2256"}]},"72ad-2437":{"id":"node_modules/d3-scale/src/tickFormat.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2251"}],"importedBy":[{"uid":"72ad-2256"},{"uid":"72ad-2423"}]},"72ad-2438":{"id":"node_modules/d3-scale-chromatic/src/categorical/category10.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2439":{"id":"node_modules/d3-scale-chromatic/src/categorical/Accent.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2440":{"id":"node_modules/d3-scale-chromatic/src/categorical/Dark2.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2441":{"id":"node_modules/d3-scale-chromatic/src/categorical/Paired.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2442":{"id":"node_modules/d3-scale-chromatic/src/categorical/Pastel1.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2443":{"id":"node_modules/d3-scale-chromatic/src/categorical/Pastel2.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2444":{"id":"node_modules/d3-scale-chromatic/src/categorical/Set1.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2445":{"id":"node_modules/d3-scale-chromatic/src/categorical/Set2.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2446":{"id":"node_modules/d3-scale-chromatic/src/categorical/Set3.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2447":{"id":"node_modules/d3-scale-chromatic/src/categorical/Tableau10.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2448":{"id":"node_modules/d3-scale-chromatic/src/diverging/BrBG.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2449":{"id":"node_modules/d3-scale-chromatic/src/diverging/PRGn.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2450":{"id":"node_modules/d3-scale-chromatic/src/diverging/PiYG.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2451":{"id":"node_modules/d3-scale-chromatic/src/diverging/PuOr.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2452":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdBu.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2453":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdGy.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2454":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdYlBu.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2455":{"id":"node_modules/d3-scale-chromatic/src/diverging/RdYlGn.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2456":{"id":"node_modules/d3-scale-chromatic/src/diverging/Spectral.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2457":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/BuGn.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2458":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/BuPu.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2459":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/GnBu.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2460":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/OrRd.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2461":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/PuBuGn.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2462":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/PuBu.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2463":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/PuRd.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2464":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/RdPu.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2465":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlGnBu.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2466":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlGn.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2467":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlOrBr.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2468":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/YlOrRd.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2469":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Blues.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2470":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Greens.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2471":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Greys.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2472":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Purples.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2473":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Reds.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2474":{"id":"node_modules/d3-scale-chromatic/src/sequential-single/Oranges.js","moduleParts":{},"imported":[{"uid":"72ad-2639"},{"uid":"72ad-2640"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2475":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/cividis.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2476":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/cubehelix.js","moduleParts":{},"imported":[{"uid":"72ad-292"},{"uid":"72ad-318"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2477":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/rainbow.js","moduleParts":{},"imported":[{"uid":"72ad-292"},{"uid":"72ad-318"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2478":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/sinebow.js","moduleParts":{},"imported":[{"uid":"72ad-292"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2479":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/turbo.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2480":{"id":"node_modules/d3-scale-chromatic/src/sequential-multi/viridis.js","moduleParts":{},"imported":[{"uid":"72ad-2639"}],"importedBy":[{"uid":"72ad-2257"}]},"72ad-2481":{"id":"node_modules/d3-selection/src/create.js","moduleParts":{},"imported":[{"uid":"72ad-180"},{"uid":"72ad-266"}],"importedBy":[{"uid":"72ad-268"}]},"72ad-2482":{"id":"node_modules/d3-selection/src/local.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-268"}]},"72ad-2483":{"id":"node_modules/d3-selection/src/pointers.js","moduleParts":{},"imported":[{"uid":"72ad-272"},{"uid":"72ad-270"}],"importedBy":[{"uid":"72ad-268"}]},"72ad-2484":{"id":"node_modules/d3-shape/src/arc.js","moduleParts":{},"imported":[{"uid":"72ad-2641"},{"uid":"72ad-2642"},{"uid":"72ad-2643"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2485":{"id":"node_modules/d3-shape/src/area.js","moduleParts":{},"imported":[{"uid":"72ad-2644"},{"uid":"72ad-2641"},{"uid":"72ad-2518"},{"uid":"72ad-2486"},{"uid":"72ad-2643"},{"uid":"72ad-2645"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2488"}]},"72ad-2486":{"id":"node_modules/d3-shape/src/line.js","moduleParts":{},"imported":[{"uid":"72ad-2644"},{"uid":"72ad-2641"},{"uid":"72ad-2518"},{"uid":"72ad-2643"},{"uid":"72ad-2645"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2485"},{"uid":"72ad-2489"}]},"72ad-2487":{"id":"node_modules/d3-shape/src/pie.js","moduleParts":{},"imported":[{"uid":"72ad-2644"},{"uid":"72ad-2641"},{"uid":"72ad-2646"},{"uid":"72ad-2647"},{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2488":{"id":"node_modules/d3-shape/src/areaRadial.js","moduleParts":{},"imported":[{"uid":"72ad-2648"},{"uid":"72ad-2485"},{"uid":"72ad-2489"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2489":{"id":"node_modules/d3-shape/src/lineRadial.js","moduleParts":{},"imported":[{"uid":"72ad-2648"},{"uid":"72ad-2486"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2488"}]},"72ad-2490":{"id":"node_modules/d3-shape/src/pointRadial.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2509"}]},"72ad-2491":{"id":"node_modules/d3-shape/src/link.js","moduleParts":{},"imported":[{"uid":"72ad-2644"},{"uid":"72ad-2641"},{"uid":"72ad-2509"},{"uid":"72ad-2643"},{"uid":"72ad-2645"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2492":{"id":"node_modules/d3-shape/src/symbol.js","moduleParts":{},"imported":[{"uid":"72ad-2641"},{"uid":"72ad-2643"},{"uid":"72ad-2493"},{"uid":"72ad-2494"},{"uid":"72ad-2495"},{"uid":"72ad-2496"},{"uid":"72ad-2497"},{"uid":"72ad-2498"},{"uid":"72ad-2499"},{"uid":"72ad-2500"},{"uid":"72ad-2501"},{"uid":"72ad-2502"},{"uid":"72ad-2503"},{"uid":"72ad-2504"},{"uid":"72ad-2505"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2493":{"id":"node_modules/d3-shape/src/symbol/asterisk.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2494":{"id":"node_modules/d3-shape/src/symbol/circle.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2495":{"id":"node_modules/d3-shape/src/symbol/cross.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2496":{"id":"node_modules/d3-shape/src/symbol/diamond.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2497":{"id":"node_modules/d3-shape/src/symbol/diamond2.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2498":{"id":"node_modules/d3-shape/src/symbol/plus.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2499":{"id":"node_modules/d3-shape/src/symbol/square.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2500":{"id":"node_modules/d3-shape/src/symbol/square2.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2501":{"id":"node_modules/d3-shape/src/symbol/star.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2502":{"id":"node_modules/d3-shape/src/symbol/triangle.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2503":{"id":"node_modules/d3-shape/src/symbol/triangle2.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2504":{"id":"node_modules/d3-shape/src/symbol/wye.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2505":{"id":"node_modules/d3-shape/src/symbol/times.js","moduleParts":{},"imported":[{"uid":"72ad-2642"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2492"}]},"72ad-2506":{"id":"node_modules/d3-shape/src/curve/basisClosed.js","moduleParts":{},"imported":[{"uid":"72ad-2649"},{"uid":"72ad-2508"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2507":{"id":"node_modules/d3-shape/src/curve/basisOpen.js","moduleParts":{},"imported":[{"uid":"72ad-2508"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2508":{"id":"node_modules/d3-shape/src/curve/basis.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2506"},{"uid":"72ad-2507"},{"uid":"72ad-2510"}]},"72ad-2509":{"id":"node_modules/d3-shape/src/curve/bump.js","moduleParts":{},"imported":[{"uid":"72ad-2490"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2491"}]},"72ad-2510":{"id":"node_modules/d3-shape/src/curve/bundle.js","moduleParts":{},"imported":[{"uid":"72ad-2508"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2511":{"id":"node_modules/d3-shape/src/curve/cardinalClosed.js","moduleParts":{},"imported":[{"uid":"72ad-2649"},{"uid":"72ad-2513"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2514"}]},"72ad-2512":{"id":"node_modules/d3-shape/src/curve/cardinalOpen.js","moduleParts":{},"imported":[{"uid":"72ad-2513"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2515"}]},"72ad-2513":{"id":"node_modules/d3-shape/src/curve/cardinal.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2511"},{"uid":"72ad-2512"},{"uid":"72ad-2516"}]},"72ad-2514":{"id":"node_modules/d3-shape/src/curve/catmullRomClosed.js","moduleParts":{},"imported":[{"uid":"72ad-2511"},{"uid":"72ad-2649"},{"uid":"72ad-2516"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2515":{"id":"node_modules/d3-shape/src/curve/catmullRomOpen.js","moduleParts":{},"imported":[{"uid":"72ad-2512"},{"uid":"72ad-2516"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2516":{"id":"node_modules/d3-shape/src/curve/catmullRom.js","moduleParts":{},"imported":[{"uid":"72ad-2642"},{"uid":"72ad-2513"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2514"},{"uid":"72ad-2515"}]},"72ad-2517":{"id":"node_modules/d3-shape/src/curve/linearClosed.js","moduleParts":{},"imported":[{"uid":"72ad-2649"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2518":{"id":"node_modules/d3-shape/src/curve/linear.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2485"},{"uid":"72ad-2486"},{"uid":"72ad-2648"}]},"72ad-2519":{"id":"node_modules/d3-shape/src/curve/monotone.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2520":{"id":"node_modules/d3-shape/src/curve/natural.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2521":{"id":"node_modules/d3-shape/src/curve/step.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2522":{"id":"node_modules/d3-shape/src/stack.js","moduleParts":{},"imported":[{"uid":"72ad-2644"},{"uid":"72ad-2641"},{"uid":"72ad-2525"},{"uid":"72ad-2532"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2523":{"id":"node_modules/d3-shape/src/offset/expand.js","moduleParts":{},"imported":[{"uid":"72ad-2525"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2524":{"id":"node_modules/d3-shape/src/offset/diverging.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2525":{"id":"node_modules/d3-shape/src/offset/none.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2522"},{"uid":"72ad-2523"},{"uid":"72ad-2526"},{"uid":"72ad-2527"}]},"72ad-2526":{"id":"node_modules/d3-shape/src/offset/silhouette.js","moduleParts":{},"imported":[{"uid":"72ad-2525"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2527":{"id":"node_modules/d3-shape/src/offset/wiggle.js","moduleParts":{},"imported":[{"uid":"72ad-2525"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2528":{"id":"node_modules/d3-shape/src/order/appearance.js","moduleParts":{},"imported":[{"uid":"72ad-2532"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2531"}]},"72ad-2529":{"id":"node_modules/d3-shape/src/order/ascending.js","moduleParts":{},"imported":[{"uid":"72ad-2532"}],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2530"},{"uid":"72ad-2531"}]},"72ad-2530":{"id":"node_modules/d3-shape/src/order/descending.js","moduleParts":{},"imported":[{"uid":"72ad-2529"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2531":{"id":"node_modules/d3-shape/src/order/insideOut.js","moduleParts":{},"imported":[{"uid":"72ad-2528"},{"uid":"72ad-2529"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2532":{"id":"node_modules/d3-shape/src/order/none.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2258"},{"uid":"72ad-2522"},{"uid":"72ad-2528"},{"uid":"72ad-2529"},{"uid":"72ad-2533"}]},"72ad-2533":{"id":"node_modules/d3-shape/src/order/reverse.js","moduleParts":{},"imported":[{"uid":"72ad-2532"}],"importedBy":[{"uid":"72ad-2258"}]},"72ad-2534":{"id":"node_modules/d3-time/src/interval.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2535"},{"uid":"72ad-2536"},{"uid":"72ad-2537"},{"uid":"72ad-2538"},{"uid":"72ad-2539"},{"uid":"72ad-2540"},{"uid":"72ad-2541"},{"uid":"72ad-2542"}]},"72ad-2535":{"id":"node_modules/d3-time/src/millisecond.js","moduleParts":{},"imported":[{"uid":"72ad-2534"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2536":{"id":"node_modules/d3-time/src/second.js","moduleParts":{},"imported":[{"uid":"72ad-2534"},{"uid":"72ad-2650"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2537":{"id":"node_modules/d3-time/src/minute.js","moduleParts":{},"imported":[{"uid":"72ad-2534"},{"uid":"72ad-2650"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2538":{"id":"node_modules/d3-time/src/hour.js","moduleParts":{},"imported":[{"uid":"72ad-2534"},{"uid":"72ad-2650"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2539":{"id":"node_modules/d3-time/src/day.js","moduleParts":{},"imported":[{"uid":"72ad-2534"},{"uid":"72ad-2650"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2540":{"id":"node_modules/d3-time/src/week.js","moduleParts":{},"imported":[{"uid":"72ad-2534"},{"uid":"72ad-2650"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2541":{"id":"node_modules/d3-time/src/month.js","moduleParts":{},"imported":[{"uid":"72ad-2534"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2542":{"id":"node_modules/d3-time/src/year.js","moduleParts":{},"imported":[{"uid":"72ad-2534"}],"importedBy":[{"uid":"72ad-2259"},{"uid":"72ad-2543"}]},"72ad-2543":{"id":"node_modules/d3-time/src/ticks.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-2650"},{"uid":"72ad-2535"},{"uid":"72ad-2536"},{"uid":"72ad-2537"},{"uid":"72ad-2538"},{"uid":"72ad-2539"},{"uid":"72ad-2540"},{"uid":"72ad-2541"},{"uid":"72ad-2542"}],"importedBy":[{"uid":"72ad-2259"}]},"72ad-2544":{"id":"node_modules/d3-time-format/src/defaultLocale.js","moduleParts":{},"imported":[{"uid":"72ad-2545"}],"importedBy":[{"uid":"72ad-2260"},{"uid":"72ad-2546"},{"uid":"72ad-2547"}]},"72ad-2545":{"id":"node_modules/d3-time-format/src/locale.js","moduleParts":{},"imported":[{"uid":"72ad-2259"}],"importedBy":[{"uid":"72ad-2260"},{"uid":"72ad-2544"}]},"72ad-2546":{"id":"node_modules/d3-time-format/src/isoFormat.js","moduleParts":{},"imported":[{"uid":"72ad-2544"}],"importedBy":[{"uid":"72ad-2260"},{"uid":"72ad-2547"}]},"72ad-2547":{"id":"node_modules/d3-time-format/src/isoParse.js","moduleParts":{},"imported":[{"uid":"72ad-2546"},{"uid":"72ad-2544"}],"importedBy":[{"uid":"72ad-2260"}]},"72ad-2548":{"id":"node_modules/d3-timer/src/interval.js","moduleParts":{},"imported":[{"uid":"72ad-328"}],"importedBy":[{"uid":"72ad-330"}]},"72ad-2549":{"id":"node_modules/d3-transition/src/active.js","moduleParts":{},"imported":[{"uid":"72ad-382"},{"uid":"72ad-334"}],"importedBy":[{"uid":"72ad-394"}]},"72ad-2550":{"id":"node_modules/@pixi/utils/lib/types/index.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-562"}]},"72ad-2551":{"id":"node_modules/name-suggestion-index/lib/stemmer.js","moduleParts":{},"imported":[{"uid":"72ad-2184"}],"importedBy":[{"uid":"72ad-2192"}]},"72ad-2552":{"id":"<runtime>","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2024"}]},"72ad-2553":{"id":"node_modules/d3-array/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2269"},{"uid":"72ad-2271"}]},"72ad-2554":{"id":"node_modules/d3-array/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2271"}]},"72ad-2555":{"id":"node_modules/d3-array/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2271"}]},"72ad-2556":{"id":"node_modules/d3-axis/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2309"}]},"72ad-2557":{"id":"node_modules/d3-brush/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2238"}]},"72ad-2558":{"id":"node_modules/d3-brush/src/event.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2238"}]},"72ad-2559":{"id":"node_modules/d3-brush/src/noevent.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2238"}]},"72ad-2560":{"id":"node_modules/d3-chord/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2310"},{"uid":"72ad-2311"}]},"72ad-2561":{"id":"node_modules/d3-chord/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2311"}]},"72ad-2562":{"id":"node_modules/d3-chord/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2311"}]},"72ad-2563":{"id":"node_modules/d3-color/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2312"},{"uid":"72ad-2313"}]},"72ad-2564":{"id":"node_modules/d3-contour/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2314"},{"uid":"72ad-2315"}]},"72ad-2565":{"id":"node_modules/d3-contour/src/ascending.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2314"}]},"72ad-2566":{"id":"node_modules/d3-contour/src/area.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2314"}]},"72ad-2567":{"id":"node_modules/d3-contour/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2314"},{"uid":"72ad-2315"}]},"72ad-2568":{"id":"node_modules/d3-contour/src/contains.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2314"}]},"72ad-2569":{"id":"node_modules/d3-contour/src/noop.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2314"}]},"72ad-2570":{"id":"node_modules/delaunator/index.js","moduleParts":{},"imported":[{"uid":"72ad-2668"}],"importedBy":[{"uid":"72ad-2316"}]},"72ad-2571":{"id":"node_modules/d3-delaunay/src/path.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2316"},{"uid":"72ad-2317"}]},"72ad-2572":{"id":"node_modules/d3-delaunay/src/polygon.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2316"},{"uid":"72ad-2317"}]},"72ad-2573":{"id":"node_modules/d3-ease/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2325"},{"uid":"72ad-2329"}]},"72ad-2574":{"id":"node_modules/d3-force/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2335"},{"uid":"72ad-2336"},{"uid":"72ad-2337"},{"uid":"72ad-2338"},{"uid":"72ad-2340"},{"uid":"72ad-2341"}]},"72ad-2575":{"id":"node_modules/d3-force/src/jiggle.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2335"},{"uid":"72ad-2336"},{"uid":"72ad-2337"}]},"72ad-2576":{"id":"node_modules/d3-force/src/lcg.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2339"}]},"72ad-2577":{"id":"node_modules/d3-format/src/exponent.js","moduleParts":{},"imported":[{"uid":"72ad-2669"}],"importedBy":[{"uid":"72ad-2343"},{"uid":"72ad-2345"},{"uid":"72ad-2346"},{"uid":"72ad-2347"}]},"72ad-2578":{"id":"node_modules/d3-format/src/formatGroup.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2343"}]},"72ad-2579":{"id":"node_modules/d3-format/src/formatNumerals.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2343"}]},"72ad-2580":{"id":"node_modules/d3-format/src/formatTrim.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2343"}]},"72ad-2581":{"id":"node_modules/d3-format/src/formatTypes.js","moduleParts":{},"imported":[{"uid":"72ad-2669"},{"uid":"72ad-2582"},{"uid":"72ad-2670"}],"importedBy":[{"uid":"72ad-2343"}]},"72ad-2582":{"id":"node_modules/d3-format/src/formatPrefixAuto.js","moduleParts":{},"imported":[{"uid":"72ad-2669"}],"importedBy":[{"uid":"72ad-2343"},{"uid":"72ad-2581"}]},"72ad-2583":{"id":"node_modules/d3-format/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2343"}]},"72ad-2584":{"id":"node_modules/d3-geo/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2348"}]},"72ad-2585":{"id":"node_modules/d3-geo/src/clip/index.js","moduleParts":{},"imported":[{"uid":"72ad-2587"},{"uid":"72ad-2589"},{"uid":"72ad-140"},{"uid":"72ad-2590"},{"uid":"72ad-124"}],"importedBy":[{"uid":"72ad-2349"},{"uid":"72ad-2350"}]},"72ad-2586":{"id":"node_modules/d3-geo/src/pointEqual.js","moduleParts":{},"imported":[{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-2350"},{"uid":"72ad-2589"}]},"72ad-2587":{"id":"node_modules/d3-geo/src/clip/buffer.js","moduleParts":{},"imported":[{"uid":"72ad-142"}],"importedBy":[{"uid":"72ad-2352"},{"uid":"72ad-2585"}]},"72ad-2588":{"id":"node_modules/d3-geo/src/clip/line.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2352"}]},"72ad-2589":{"id":"node_modules/d3-geo/src/clip/rejoin.js","moduleParts":{},"imported":[{"uid":"72ad-2586"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-2352"},{"uid":"72ad-2585"}]},"72ad-2590":{"id":"node_modules/d3-geo/src/polygonContains.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-150"},{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-2353"},{"uid":"72ad-2585"}]},"72ad-2591":{"id":"node_modules/d3-geo/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2357"},{"uid":"72ad-2368"},{"uid":"72ad-2369"}]},"72ad-2592":{"id":"node_modules/d3-geo/src/path/area.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-140"},{"uid":"72ad-142"}],"importedBy":[{"uid":"72ad-2357"}]},"72ad-2593":{"id":"node_modules/d3-geo/src/path/bounds.js","moduleParts":{},"imported":[{"uid":"72ad-142"}],"importedBy":[{"uid":"72ad-2357"},{"uid":"72ad-2598"}]},"72ad-2594":{"id":"node_modules/d3-geo/src/path/centroid.js","moduleParts":{},"imported":[{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-2357"}]},"72ad-2595":{"id":"node_modules/d3-geo/src/path/context.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-142"}],"importedBy":[{"uid":"72ad-2357"}]},"72ad-2596":{"id":"node_modules/d3-geo/src/path/measure.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-140"},{"uid":"72ad-142"}],"importedBy":[{"uid":"72ad-2357"}]},"72ad-2597":{"id":"node_modules/d3-geo/src/path/string.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2357"}]},"72ad-2598":{"id":"node_modules/d3-geo/src/projection/fit.js","moduleParts":{},"imported":[{"uid":"72ad-144"},{"uid":"72ad-2593"}],"importedBy":[{"uid":"72ad-2359"},{"uid":"72ad-2368"},{"uid":"72ad-2369"}]},"72ad-2599":{"id":"node_modules/d3-geo/src/projection/azimuthal.js","moduleParts":{},"imported":[{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-2360"},{"uid":"72ad-2361"},{"uid":"72ad-2367"},{"uid":"72ad-2371"},{"uid":"72ad-2372"}]},"72ad-2600":{"id":"node_modules/d3-geo/src/projection/conic.js","moduleParts":{},"imported":[{"uid":"72ad-140"},{"uid":"72ad-2369"}],"importedBy":[{"uid":"72ad-2362"},{"uid":"72ad-2363"},{"uid":"72ad-2364"}]},"72ad-2601":{"id":"node_modules/d3-geo/src/projection/cylindricalEqualArea.js","moduleParts":{},"imported":[{"uid":"72ad-140"}],"importedBy":[{"uid":"72ad-2363"}]},"72ad-2602":{"id":"node_modules/d3-geo/src/compose.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2369"},{"uid":"72ad-2374"}]},"72ad-2603":{"id":"node_modules/d3-geo/src/projection/resample.js","moduleParts":{},"imported":[{"uid":"72ad-150"},{"uid":"72ad-140"},{"uid":"72ad-158"}],"importedBy":[{"uid":"72ad-2369"}]},"72ad-2604":{"id":"node_modules/d3-hierarchy/src/hierarchy/count.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2605":{"id":"node_modules/d3-hierarchy/src/hierarchy/each.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2606":{"id":"node_modules/d3-hierarchy/src/hierarchy/eachBefore.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2607":{"id":"node_modules/d3-hierarchy/src/hierarchy/eachAfter.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2608":{"id":"node_modules/d3-hierarchy/src/hierarchy/find.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2609":{"id":"node_modules/d3-hierarchy/src/hierarchy/sum.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2610":{"id":"node_modules/d3-hierarchy/src/hierarchy/sort.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2611":{"id":"node_modules/d3-hierarchy/src/hierarchy/path.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2612":{"id":"node_modules/d3-hierarchy/src/hierarchy/ancestors.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2613":{"id":"node_modules/d3-hierarchy/src/hierarchy/descendants.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2614":{"id":"node_modules/d3-hierarchy/src/hierarchy/leaves.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2615":{"id":"node_modules/d3-hierarchy/src/hierarchy/links.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2616":{"id":"node_modules/d3-hierarchy/src/hierarchy/iterator.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2376"}]},"72ad-2617":{"id":"node_modules/d3-hierarchy/src/accessors.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2377"},{"uid":"72ad-2381"},{"uid":"72ad-2383"}]},"72ad-2618":{"id":"node_modules/d3-hierarchy/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2377"},{"uid":"72ad-2383"}]},"72ad-2619":{"id":"node_modules/d3-hierarchy/src/lcg.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2377"},{"uid":"72ad-2378"},{"uid":"72ad-2379"}]},"72ad-2620":{"id":"node_modules/d3-hierarchy/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2378"},{"uid":"72ad-2379"}]},"72ad-2621":{"id":"node_modules/d3-hierarchy/src/treemap/round.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2380"},{"uid":"72ad-2383"}]},"72ad-2622":{"id":"node_modules/d3-quadtree/src/add.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2623":{"id":"node_modules/d3-quadtree/src/cover.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2624":{"id":"node_modules/d3-quadtree/src/data.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2625":{"id":"node_modules/d3-quadtree/src/extent.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2626":{"id":"node_modules/d3-quadtree/src/find.js","moduleParts":{},"imported":[{"uid":"72ad-2671"}],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2627":{"id":"node_modules/d3-quadtree/src/remove.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2628":{"id":"node_modules/d3-quadtree/src/root.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2629":{"id":"node_modules/d3-quadtree/src/size.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2630":{"id":"node_modules/d3-quadtree/src/visit.js","moduleParts":{},"imported":[{"uid":"72ad-2671"}],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2631":{"id":"node_modules/d3-quadtree/src/visitAfter.js","moduleParts":{},"imported":[{"uid":"72ad-2671"}],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2632":{"id":"node_modules/d3-quadtree/src/x.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2633":{"id":"node_modules/d3-quadtree/src/y.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2402"}]},"72ad-2634":{"id":"node_modules/d3-random/src/defaultSource.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2403"},{"uid":"72ad-2404"},{"uid":"72ad-2405"},{"uid":"72ad-2406"},{"uid":"72ad-2407"},{"uid":"72ad-2408"},{"uid":"72ad-2409"},{"uid":"72ad-2410"},{"uid":"72ad-2411"},{"uid":"72ad-2412"},{"uid":"72ad-2413"},{"uid":"72ad-2414"},{"uid":"72ad-2415"},{"uid":"72ad-2416"},{"uid":"72ad-2417"},{"uid":"72ad-2418"},{"uid":"72ad-2419"}]},"72ad-2635":{"id":"node_modules/d3-scale/src/init.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2421"},{"uid":"72ad-2423"},{"uid":"72ad-2424"},{"uid":"72ad-2425"},{"uid":"72ad-2426"},{"uid":"72ad-2427"},{"uid":"72ad-2428"},{"uid":"72ad-2429"},{"uid":"72ad-2430"},{"uid":"72ad-2431"},{"uid":"72ad-2432"},{"uid":"72ad-2433"},{"uid":"72ad-2434"},{"uid":"72ad-2435"},{"uid":"72ad-2436"}]},"72ad-2636":{"id":"node_modules/d3-scale/src/number.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2422"},{"uid":"72ad-2428"},{"uid":"72ad-2637"}]},"72ad-2637":{"id":"node_modules/d3-scale/src/continuous.js","moduleParts":{},"imported":[{"uid":"72ad-124"},{"uid":"72ad-318"},{"uid":"72ad-2672"},{"uid":"72ad-2636"}],"importedBy":[{"uid":"72ad-2423"},{"uid":"72ad-2424"},{"uid":"72ad-2425"},{"uid":"72ad-2427"},{"uid":"72ad-2428"},{"uid":"72ad-2432"},{"uid":"72ad-2434"},{"uid":"72ad-2435"},{"uid":"72ad-2436"}]},"72ad-2638":{"id":"node_modules/d3-scale/src/nice.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2424"},{"uid":"72ad-2432"}]},"72ad-2639":{"id":"node_modules/d3-scale-chromatic/src/colors.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2438"},{"uid":"72ad-2439"},{"uid":"72ad-2440"},{"uid":"72ad-2441"},{"uid":"72ad-2442"},{"uid":"72ad-2443"},{"uid":"72ad-2444"},{"uid":"72ad-2445"},{"uid":"72ad-2446"},{"uid":"72ad-2447"},{"uid":"72ad-2448"},{"uid":"72ad-2449"},{"uid":"72ad-2450"},{"uid":"72ad-2451"},{"uid":"72ad-2452"},{"uid":"72ad-2453"},{"uid":"72ad-2454"},{"uid":"72ad-2455"},{"uid":"72ad-2456"},{"uid":"72ad-2457"},{"uid":"72ad-2458"},{"uid":"72ad-2459"},{"uid":"72ad-2460"},{"uid":"72ad-2461"},{"uid":"72ad-2462"},{"uid":"72ad-2463"},{"uid":"72ad-2464"},{"uid":"72ad-2465"},{"uid":"72ad-2466"},{"uid":"72ad-2467"},{"uid":"72ad-2468"},{"uid":"72ad-2469"},{"uid":"72ad-2470"},{"uid":"72ad-2471"},{"uid":"72ad-2472"},{"uid":"72ad-2473"},{"uid":"72ad-2474"},{"uid":"72ad-2480"}]},"72ad-2640":{"id":"node_modules/d3-scale-chromatic/src/ramp.js","moduleParts":{},"imported":[{"uid":"72ad-318"}],"importedBy":[{"uid":"72ad-2448"},{"uid":"72ad-2449"},{"uid":"72ad-2450"},{"uid":"72ad-2451"},{"uid":"72ad-2452"},{"uid":"72ad-2453"},{"uid":"72ad-2454"},{"uid":"72ad-2455"},{"uid":"72ad-2456"},{"uid":"72ad-2457"},{"uid":"72ad-2458"},{"uid":"72ad-2459"},{"uid":"72ad-2460"},{"uid":"72ad-2461"},{"uid":"72ad-2462"},{"uid":"72ad-2463"},{"uid":"72ad-2464"},{"uid":"72ad-2465"},{"uid":"72ad-2466"},{"uid":"72ad-2467"},{"uid":"72ad-2468"},{"uid":"72ad-2469"},{"uid":"72ad-2470"},{"uid":"72ad-2471"},{"uid":"72ad-2472"},{"uid":"72ad-2473"},{"uid":"72ad-2474"}]},"72ad-2641":{"id":"node_modules/d3-shape/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2484"},{"uid":"72ad-2485"},{"uid":"72ad-2486"},{"uid":"72ad-2487"},{"uid":"72ad-2491"},{"uid":"72ad-2492"},{"uid":"72ad-2522"}]},"72ad-2642":{"id":"node_modules/d3-shape/src/math.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2484"},{"uid":"72ad-2487"},{"uid":"72ad-2493"},{"uid":"72ad-2494"},{"uid":"72ad-2495"},{"uid":"72ad-2496"},{"uid":"72ad-2497"},{"uid":"72ad-2498"},{"uid":"72ad-2499"},{"uid":"72ad-2500"},{"uid":"72ad-2501"},{"uid":"72ad-2502"},{"uid":"72ad-2503"},{"uid":"72ad-2504"},{"uid":"72ad-2505"},{"uid":"72ad-2516"}]},"72ad-2643":{"id":"node_modules/d3-shape/src/path.js","moduleParts":{},"imported":[{"uid":"72ad-2253"}],"importedBy":[{"uid":"72ad-2484"},{"uid":"72ad-2485"},{"uid":"72ad-2486"},{"uid":"72ad-2491"},{"uid":"72ad-2492"}]},"72ad-2644":{"id":"node_modules/d3-shape/src/array.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2485"},{"uid":"72ad-2486"},{"uid":"72ad-2487"},{"uid":"72ad-2491"},{"uid":"72ad-2522"}]},"72ad-2645":{"id":"node_modules/d3-shape/src/point.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2485"},{"uid":"72ad-2486"},{"uid":"72ad-2491"}]},"72ad-2646":{"id":"node_modules/d3-shape/src/descending.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2487"}]},"72ad-2647":{"id":"node_modules/d3-shape/src/identity.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2487"}]},"72ad-2648":{"id":"node_modules/d3-shape/src/curve/radial.js","moduleParts":{},"imported":[{"uid":"72ad-2518"}],"importedBy":[{"uid":"72ad-2488"},{"uid":"72ad-2489"}]},"72ad-2649":{"id":"node_modules/d3-shape/src/noop.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2506"},{"uid":"72ad-2511"},{"uid":"72ad-2514"},{"uid":"72ad-2517"}]},"72ad-2650":{"id":"node_modules/d3-time/src/duration.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2536"},{"uid":"72ad-2537"},{"uid":"72ad-2538"},{"uid":"72ad-2539"},{"uid":"72ad-2540"},{"uid":"72ad-2543"}]},"72ad-2651":{"id":"node_modules/@pixi/settings/lib/ICanvas.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-566"}]},"72ad-2652":{"id":"node_modules/@pixi/settings/lib/ICanvasRenderingContext2D.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-566"}]},"72ad-2653":{"id":"node_modules/@pixi/assets/lib/detections/index.mjs","moduleParts":{},"imported":[{"uid":"72ad-1166"}],"importedBy":[{"uid":"72ad-1156"}]},"72ad-2654":{"id":"node_modules/@pixi/assets/lib/loader/index.mjs","moduleParts":{},"imported":[{"uid":"72ad-1132"},{"uid":"72ad-2674"}],"importedBy":[{"uid":"72ad-1156"},{"uid":"72ad-1172"}]},"72ad-2655":{"id":"node_modules/@pixi/assets/lib/resolver/index.mjs","moduleParts":{},"imported":[{"uid":"72ad-1174"},{"uid":"72ad-2675"}],"importedBy":[{"uid":"72ad-1156"}]},"72ad-2656":{"id":"node_modules/@pixi/core/lib/filters/IFilterTarget.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-962"}]},"72ad-2657":{"id":"node_modules/@pixi/core/lib/IRenderer.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-962"}]},"72ad-2658":{"id":"node_modules/@pixi/core/lib/system/ISystem.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-962"}]},"72ad-2659":{"id":"node_modules/@pixi/core/lib/transformFeedback/TransformFeedback.mjs","moduleParts":{},"imported":[{"uid":"72ad-762"}],"importedBy":[{"uid":"72ad-962"}]},"72ad-2660":{"id":"node_modules/@pixi/events/lib/FederatedEventMap.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1090"}]},"72ad-2661":{"id":"node_modules/@pixi/mesh-extras/lib/geometry/PlaneGeometry.mjs","moduleParts":{},"imported":[{"uid":"72ad-1244"}],"importedBy":[{"uid":"72ad-1254"},{"uid":"72ad-2664"}]},"72ad-2662":{"id":"node_modules/@pixi/mesh-extras/lib/NineSlicePlane.mjs","moduleParts":{},"imported":[{"uid":"72ad-962"},{"uid":"72ad-2664"}],"importedBy":[{"uid":"72ad-1254"}]},"72ad-2663":{"id":"node_modules/@pixi/mesh-extras/lib/SimpleMesh.mjs","moduleParts":{},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1244"}],"importedBy":[{"uid":"72ad-1254"}]},"72ad-2664":{"id":"node_modules/@pixi/mesh-extras/lib/SimplePlane.mjs","moduleParts":{},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1244"},{"uid":"72ad-2661"}],"importedBy":[{"uid":"72ad-1254"},{"uid":"72ad-2662"}]},"72ad-2665":{"id":"node_modules/pixi.js/node_modules/@pixi/prepare/lib/TimeLimiter.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1288"}]},"72ad-2666":{"id":"node_modules/@pixi/sprite-animated/lib/AnimatedSprite.mjs","moduleParts":{},"imported":[{"uid":"72ad-962"},{"uid":"72ad-1022"}],"importedBy":[{"uid":"72ad-1292"}]},"72ad-2667":{"id":"node_modules/@pixi/text-bitmap/lib/BitmapTextStyle.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1340"}]},"72ad-2668":{"id":"node_modules/robust-predicates/index.js","moduleParts":{},"imported":[{"uid":"72ad-2679"},{"uid":"72ad-2680"},{"uid":"72ad-2681"},{"uid":"72ad-2682"}],"importedBy":[{"uid":"72ad-2570"}]},"72ad-2669":{"id":"node_modules/d3-format/src/formatDecimal.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2577"},{"uid":"72ad-2581"},{"uid":"72ad-2582"},{"uid":"72ad-2670"}]},"72ad-2670":{"id":"node_modules/d3-format/src/formatRounded.js","moduleParts":{},"imported":[{"uid":"72ad-2669"}],"importedBy":[{"uid":"72ad-2581"}]},"72ad-2671":{"id":"node_modules/d3-quadtree/src/quad.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2626"},{"uid":"72ad-2630"},{"uid":"72ad-2631"}]},"72ad-2672":{"id":"node_modules/d3-scale/src/constant.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2637"}]},"72ad-2673":{"id":"node_modules/@pixi/assets/lib/cache/CacheParser.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1158"}]},"72ad-2674":{"id":"node_modules/@pixi/assets/lib/loader/types.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2654"}]},"72ad-2675":{"id":"node_modules/@pixi/assets/lib/resolver/types.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2655"}]},"72ad-2676":{"id":"node_modules/@pixi/compressed-textures/lib/loaders/compressedTextureExtensions.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1182"}]},"72ad-2677":{"id":"node_modules/@pixi/math/lib/IPoint.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-790"}]},"72ad-2678":{"id":"node_modules/@pixi/math/lib/IPointData.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-790"}]},"72ad-2679":{"id":"node_modules/robust-predicates/esm/orient2d.js","moduleParts":{},"imported":[{"uid":"72ad-2688"}],"importedBy":[{"uid":"72ad-2668"}]},"72ad-2680":{"id":"node_modules/robust-predicates/esm/orient3d.js","moduleParts":{},"imported":[{"uid":"72ad-2688"}],"importedBy":[{"uid":"72ad-2668"}]},"72ad-2681":{"id":"node_modules/robust-predicates/esm/incircle.js","moduleParts":{},"imported":[{"uid":"72ad-2688"}],"importedBy":[{"uid":"72ad-2668"}]},"72ad-2682":{"id":"node_modules/robust-predicates/esm/insphere.js","moduleParts":{},"imported":[{"uid":"72ad-2688"}],"importedBy":[{"uid":"72ad-2668"}]},"72ad-2683":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/filters/IFilterTarget.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1616"}]},"72ad-2684":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/fragments/index.mjs","moduleParts":{},"imported":[{"uid":"72ad-2709"},{"uid":"72ad-2710"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-2685":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/IRenderer.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1616"}]},"72ad-2686":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/system/ISystem.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1616"}]},"72ad-2687":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/transformFeedback/TransformFeedback.mjs","moduleParts":{},"imported":[{"uid":"72ad-1424"}],"importedBy":[{"uid":"72ad-1616"}]},"72ad-2688":{"id":"node_modules/robust-predicates/esm/util.js","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2679"},{"uid":"72ad-2680"},{"uid":"72ad-2681"},{"uid":"72ad-2682"}]},"72ad-2689":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Circle.mjs","moduleParts":{},"imported":[{"uid":"72ad-1444"},{"uid":"72ad-1448"}],"importedBy":[{"uid":"72ad-1450"}]},"72ad-2690":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Ellipse.mjs","moduleParts":{},"imported":[{"uid":"72ad-1444"},{"uid":"72ad-1448"}],"importedBy":[{"uid":"72ad-1450"}]},"72ad-2691":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/Polygon.mjs","moduleParts":{},"imported":[{"uid":"72ad-1444"}],"importedBy":[{"uid":"72ad-1450"}]},"72ad-2692":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/shapes/RoundedRectangle.mjs","moduleParts":{},"imported":[{"uid":"72ad-1444"}],"importedBy":[{"uid":"72ad-1450"}]},"72ad-2693":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/IPoint.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1450"}]},"72ad-2694":{"id":"node_modules/pixi-filters/node_modules/@pixi/math/lib/IPointData.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1450"}]},"72ad-2695":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/ICanvas.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1374"}]},"72ad-2696":{"id":"node_modules/pixi-filters/node_modules/@pixi/settings/lib/ICanvasRenderingContext2D.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1374"}]},"72ad-2697":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/path.mjs","moduleParts":{},"imported":[{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2698":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/browser/hello.mjs","moduleParts":{},"imported":[{"uid":"72ad-1386"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2699":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/color/hex.mjs","moduleParts":{},"imported":[{"uid":"72ad-1392"},{"uid":"72ad-1386"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2700":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/const.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1382"},{"uid":"72ad-2707"}]},"72ad-2701":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/createIndicesForQuads.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2702":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/interleaveTypedArrays.mjs","moduleParts":{},"imported":[{"uid":"72ad-1396"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2703":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/data/sign.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2704":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/CanvasRenderTarget.mjs","moduleParts":{},"imported":[{"uid":"72ad-1374"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2705":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/getCanvasBoundingBox.mjs","moduleParts":{},"imported":[{"uid":"72ad-1404"}],"importedBy":[{"uid":"72ad-1382"},{"uid":"72ad-2706"}]},"72ad-2706":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/media/trimCanvas.mjs","moduleParts":{},"imported":[{"uid":"72ad-2705"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2707":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/network/decomposeDataUri.mjs","moduleParts":{},"imported":[{"uid":"72ad-2700"}],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2708":{"id":"node_modules/pixi-filters/node_modules/@pixi/utils/lib/types/index.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-1382"}]},"72ad-2709":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/fragments/default.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2684"}]},"72ad-2710":{"id":"node_modules/pixi-filters/node_modules/@pixi/core/lib/fragments/defaultFilter.mjs","moduleParts":{},"imported":[],"importedBy":[{"uid":"72ad-2684"}]}},"env":{},"options":{"gzip":false,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;
diff --git a/index.html b/index.html
index abb59177a4..cb0f83a636 100644
--- a/index.html
+++ b/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();
         }
diff --git a/karma.conf.cjs b/karma.conf.cjs
index 7151f534bd..65dcb75f5e 100644
--- a/karma.conf.cjs
+++ b/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
diff --git a/modules/Context.js b/modules/Context.js
new file mode 100644
index 0000000000..8edefa0fe6
--- /dev/null
+++ b/modules/Context.js
@@ -0,0 +1,646 @@
+import { EventEmitter } from '@pixi/utils';
+import { select as d3_select } from 'd3-selection';
+import { Projection, geoScaleToZoom } from '@rapid-sdk/math';
+import { utilStringQs, utilUnicodeCharsTruncated } from '@rapid-sdk/util';
+import debounce from 'lodash-es/debounce';
+
+import { behaviors } from './behaviors';
+import { modes } from './modes';
+import { services } from './services';
+import { systems } from './core';
+
+import { utilKeybinding } from './util';
+
+const MINZOOM = 15;
+const TILESIZE = 256;
+
+
+/**
+ * `Context` contains all the global application state for Rapid
+ *  and contains references to all the core components.
+ *
+ * Events available:
+ *   'modechange'   Fires when changing modes - receives the new mode
+ */
+export class Context extends EventEmitter {
+
+  /**
+   * @constructor
+   */
+  constructor() {
+    super();
+
+    this.version = '2.0.3';
+    this.privacyVersion = '20201202';
+
+    // `this.initialHashParams` is older, try to use `this.urlHashSystem()` instead
+    this.initialHashParams = window.location.hash ? utilStringQs(window.location.hash) : {};
+    this.defaultChangesetComment = this.initialHashParams.comment;
+    this.defaultChangesetSource = this.initialHashParams.source;
+    this.defaultChangesetHashtags = this.initialHashParams.hashtags;
+
+    this.maxCharsForTagKey = 255;
+    this.maxCharsForTagValue = 255;
+    this.maxCharsForRelationRole = 255;
+
+    // Assets
+    this.assetPath = '';
+    this.assetMap = {};
+
+    // Projection
+    this.projection = new Projection();
+
+    // "Systems" are the core components of Rapid.
+    this.systems = systems.instantiated;  // Map (systemID -> System)
+    this._dataLoaderSystem = null;
+    this._editSystem = null;
+    this._filterSystem = null;
+    this._imagerySystem = null;
+    this._localizationSystem = null;
+    this._locationSystem = null;
+    this._mapSystem = null;
+    this._map3dSystem = null;
+    this._photoSystem = null;
+    this._presetSystem = null;
+    this._rapidSystem = null;
+    this._storageSystem = null;
+    this._uiSystem = null;
+    this._uploaderSystem = null;
+    this._urlHashSystem = null;
+    this._validationSystem = null;
+
+    // "Modes" are editing tasks that the user are allowed to perform.
+    // Each mode is exclusive, i.e only one mode can be active at a time.
+    this.modes = modes.instantiated;  // Map (modeID -> Mode)
+    this._currMode = null;
+
+    // "Behaviors" are bundles of event handlers that we can
+    // enable and disable depending on what the user is doing.
+    this.behaviors = behaviors.instantiated;  // Map (behaviorID -> Behavior)
+
+    // "Services" are components that get data from other places
+    this.services = services.instantiated;  // Map (serviceID -> Service)
+
+
+    // User interface and keybinding
+    // AFAICT `lastPointerType` is just used to localize the intro? for now - instead get this from pixi?
+    // this.lastPointerType = () => _uiSystem.lastPointerType;
+    this.lastPointerType = 'mouse';
+    this._keybinding = utilKeybinding('context');
+    d3_select(document).call(this._keybinding);
+
+    // Connection
+    this._preauth = null;
+    this._apiConnections = null;
+    this._prelocale = null;
+
+    // Copy/Paste
+    this._copyGraph = null;
+    this._copyIDs = [];
+    this._copyLoc = null;
+
+    // Debug
+    this._debugFlags = {
+      tile: false,        // tile boundaries
+      label: false,       // label placement
+      imagery: false,     // imagery bounding polygons
+      target: false,      // touch targets
+      downloaded: false   // downloaded data from osm
+    };
+
+    // Container
+    this._container = d3_select(null);
+    this._embed = null;
+
+    // true/false whether we are in the intro walkthrough
+    this.inIntro = false;
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this.save = this.save.bind(this);
+
+    // Debounce save, since it's a synchronous localStorage write,
+    // and history changes can happen frequently (e.g. when dragging).
+    this.debouncedSave = debounce(this.save, 350);
+  }
+
+
+  /**
+   * init
+   * Call one time to start up Rapid
+   */
+  init() {
+    const withDebouncedSave = (fn) => {
+      return (...args) => {
+        const result = fn.apply(this._editSystem, args);
+        this.debouncedSave();
+        return result;
+      };
+    };
+
+
+    // Instantiate all the core classes
+    // These are dynamic and should be safe to instantiate in any order.
+    for (const [systemID, System] of systems.available) {
+      const mode = new System(this);
+      systems.instantiated.set(systemID, mode);
+    }
+
+    // Connect the wires
+    this._dataLoaderSystem = this.systems.get('data');
+    this._editSystem = this.systems.get('edits');
+    this._filterSystem = this.systems.get('filters');
+    this._imagerySystem = this.systems.get('imagery');
+    this._localizationSystem = this.systems.get('l10n');
+    this._locationSystem = this.systems.get('locations');
+    this._mapSystem = this.systems.get('map');
+    this._map3dSystem = this.systems.get('map3d');
+    this._photoSystem = this.systems.get('photos');
+    this._presetSystem = this.systems.get('presets');
+    this._rapidSystem = this.systems.get('rapid');
+    this._storageSystem = this.systems.get('storage');
+    this._uiSystem = this.systems.get('ui');
+    this._uploaderSystem = this.systems.get('uploader');
+    this._urlHashSystem = this.systems.get('urlhash');
+    this._validationSystem = this.systems.get('validator');
+
+    // EditSystem
+    this.graph = this._editSystem.graph;
+    this.hasEntity = (id) => this._editSystem.graph().hasEntity(id);
+    this.entity = (id) => this._editSystem.graph().entity(id);
+    this.pauseChangeDispatch = this._editSystem.pauseChangeDispatch;
+    this.resumeChangeDispatch = this._editSystem.resumeChangeDispatch;
+    this.perform = withDebouncedSave(this._editSystem.perform);
+    this.replace = withDebouncedSave(this._editSystem.replace);
+    this.pop = withDebouncedSave(this._editSystem.pop);
+    this.overwrite = withDebouncedSave(this._editSystem.overwrite);
+    this.undo = withDebouncedSave(this._editSystem.undo);
+    this.redo = withDebouncedSave(this._editSystem.redo);
+
+    // LocalizationSystem
+    this.t = this._localizationSystem.t;
+    this.tHtml = this._localizationSystem.tHtml;
+    this.tAppend = this._localizationSystem.tAppend;
+
+    // FilterSystem
+    this.hasHiddenConnections = (entityID) => {
+      const graph = this._editSystem.graph();
+      const entity = graph.entity(entityID);
+      return this._filterSystem.hasHiddenConnections(entity, graph);
+    };
+
+    // MapSystem
+    this.deferredRedraw = this._mapSystem.deferredRedraw;
+    this.immediateRedraw = this._mapSystem.immediateRedraw;
+    this.scene = () => this._mapSystem.scene;
+    this.surface = () => this._mapSystem.surface;
+    this.surfaceRect = () => this._mapSystem.surface.node().getBoundingClientRect();
+    this.editable = () => {
+      const mode = this._currMode;
+      if (!mode || mode.id === 'save') return false;      // don't allow editing during save
+      return true;  // this._mapSystem.editableDataEnabled();  // todo: disallow editing if OSM layer is off
+    };
+
+    for (const [modeID, Mode] of modes.available) {
+      const mode = new Mode(this);
+      modes.instantiated.set(modeID, mode);
+    }
+
+    for (const [behaviorID, Behavior] of behaviors.available) {
+      const behavior = new Behavior(this);
+      behaviors.instantiated.set(behaviorID, behavior);
+    }
+
+    if (!window.mocha) {
+      for (const [serviceID, Service] of services.available) {
+        const service = new Service(this);
+        services.instantiated.set(serviceID, service);
+      }
+    }
+
+
+    // Initialize core systems
+    // Call .init() functions to start setting everything up.
+    // At this step all core object are instantiated and they may access context.
+    // They may start listening to events, but they should not call each other.
+    // The order of .init() may matter here if dependents make calls to each other.
+    // The UI is the final thing that gets initialized.
+    this._storageSystem.init();
+    this._dataLoaderSystem.init();
+
+    if (this.initialHashParams.presets) {
+      const presetIDs = this.initialHashParams.presets.split(',').map(s => s.trim()).filter(Boolean);
+      this._presetSystem.addablePresetIDs = new Set(presetIDs);
+    }
+    let overrideLocale =  this.initialHashParams.locale ?? this._prelocale;
+    if (overrideLocale) {
+      this._localizationSystem.preferredLocaleCodes = overrideLocale;
+    }
+
+    // kick off some async work
+    this._localizationSystem.initAsync();
+    this._presetSystem.initAsync();
+
+    for (const service of this.services.values()) {
+      service.init();
+    }
+
+    // Setup the connection if we have preauth credentials to use
+    const osm = this.services.get('osm');
+    if (osm && this._preauth) {
+      osm.switch(this._preauth);
+    }
+
+    this._uiSystem.init();
+    this._editSystem.init();
+    this._filterSystem.init();
+    this._imagerySystem.init();
+    this._locationSystem.init();
+    this._mapSystem.init();       // watch out - init doesn't actually create the renderer :(
+    this._rapidSystem.init();
+    this._uploaderSystem.init();
+    this._validationSystem.init();
+
+    // If the container isn't available, e.g. when testing, don't load the UI
+    if (!this._container.empty()) {
+      this._uiSystem.ensureLoaded()
+        .then(() => {
+          this._map3dSystem.init();
+          this._photoSystem.init();
+          this._urlHashSystem.init();  // tries to adjust map transform
+        });
+    }
+
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    this.debouncedSave.cancel();
+
+    for (const service of this.services.values()) {
+      service.reset();
+    }
+
+    for (const system of this.systems.values()) {
+      system.reset();
+    }
+
+    // don't leave stale state in the inspector
+    this._container.select('.inspector-wrap *').remove();
+  }
+
+
+  // accessors
+  dataLoaderSystem()    { return this._dataLoaderSystem; }
+  editSystem()          { return this._editSystem; }
+  history()             { return this._editSystem; }       // legacy name
+  filterSystem()        { return this._filterSystem; }
+  imagerySystem()       { return this._imagerySystem; }
+  localizationSystem()  { return this._localizationSystem; }
+  locationSystem()      { return this._locationSystem; }
+  mapSystem()           { return this._mapSystem; }
+  map3dSystem()         { return this._map3dSystem; }
+  photoSystem()         { return this._photoSystem; }
+  presetSystem()        { return this._presetSystem; }
+  rapidSystem()         { return this._rapidSystem; }
+  storageSystem()       { return this._storageSystem; }
+  uiSystem()            { return this._uiSystem; }
+  ui()                  { return this._uiSystem; }         // legacy name
+  uploaderSystem()      { return this._uploaderSystem; }
+  urlHashSystem()       { return this._urlHashSystem; }
+  validationSystem()    { return this._validationSystem; }
+
+  // not a system yet, but should be one
+  keybinding()          { return this._keybinding; }
+
+
+  /* Connection */
+  get preauth()         { return this._preauth; }
+  set preauth(options)  { this._preauth = Object.assign({}, options); }   // copy and remember for init time
+
+  /* connection options for source switcher (optional) */
+  get apiConnections()     { return this._apiConnections; }
+  set apiConnections(arr)  { this._apiConnections = arr; }
+
+  // A String or Array of locale codes to prefer over the browser's settings
+  get locale()     { return this._prelocale; }
+  set locale(val)  { this._prelocale = val; }    // remember for init time
+
+
+  _afterLoad(cid, callback) {
+    return (err, result) => {
+      const osm = this.services.get('osm');
+      if (err) {
+        // 400 Bad Request, 401 Unauthorized, 403 Forbidden..
+        if (err.status === 400 || err.status === 401 || err.status === 403) {
+          osm?.logout();
+        }
+        if (typeof callback === 'function') {
+          callback(err);
+        }
+        return;
+
+      } else if (osm?.connectionID !== cid) {
+        if (typeof callback === 'function') {
+          callback({ message: 'Connection Switched', status: -1 });
+        }
+        return;
+
+      } else {
+        this._editSystem.merge(result.data, result.seenIDs);
+        if (typeof callback === 'function') {
+          callback(err, result);
+        }
+        return;
+      }
+    };
+  }
+
+
+  loadTiles(projection, callback) {
+    const osm = this.services.get('osm');
+    if (!osm) return;
+
+    const z = geoScaleToZoom(projection.scale(), TILESIZE);
+    if (z < MINZOOM) return;  // this would fire off too many API requests
+
+    if (this.editable()) {
+      const cid = osm.connectionID;
+      osm.loadTiles(projection, this._afterLoad(cid, callback));
+    }
+  }
+
+
+  loadTileAtLoc(loc, callback) {
+    const osm = this.services.get('osm');
+    if (!osm) return;
+
+    if (this.editable()) {
+      const cid = osm.connectionID;
+      osm.loadTileAtLoc(loc, this._afterLoad(cid, callback));
+    }
+  }
+
+
+  // Download the full entity and its parent relations. The callback may be called multiple times.
+  loadEntity(entityID, callback) {
+    const osm = this.services.get('osm');
+    if (!osm) return;
+
+    const cid = osm.connectionID;
+    osm.loadEntity(entityID, this._afterLoad(cid, callback));
+    osm.loadEntityRelations(entityID, this._afterLoad(cid, callback));
+  }
+
+
+  zoomToEntity(entityID, zoomTo) {
+    const entity = this.hasEntity(entityID);
+
+    if (entity) {   // have it already
+      this.enter('select-osm', { selectedIDs: [entityID] });
+      if (zoomTo !== false) {
+        this._mapSystem.zoomTo(entity);
+      }
+
+    } else {   // need to load it first
+      this.loadEntity(entityID, (err, result) => {
+        if (err) return;
+        const loadedEntity = result.data.find(e => e.id === entityID);
+        if (!loadedEntity) return;
+
+        this.enter('select-osm', { selectedIDs: [entityID] });
+        if (zoomTo !== false) {
+          this._mapSystem.zoomTo(loadedEntity);
+        }
+      });
+    }
+  }
+
+
+  // String length limits in Unicode characters, not JavaScript UTF-16 code units
+  _cleanOsmString(val, maxChars) {
+    // be lenient with input
+    if (val === undefined || val === null) {
+      val = '';
+    } else {
+      val = val.toString();
+    }
+
+    // remove whitespace
+    val = val.trim();
+
+    // use the canonical form of the string
+    if (val.normalize) val = val.normalize('NFC');
+
+    // trim to the number of allowed characters
+    return utilUnicodeCharsTruncated(val, maxChars);
+  }
+
+  cleanTagKey(val)       { return this._cleanOsmString(val, this.maxCharsForTagKey); }
+  cleanTagValue(val)     { return this._cleanOsmString(val, this.maxCharsForTagValue); }
+  cleanRelationRole(val) { return this._cleanOsmString(val, this.maxCharsForRelationRole); }
+
+
+  // Immediately save the user's history to localstorage, if possible
+  // This is called sometimes, but also on the `window.onbeforeunload` handler
+  save() {
+    // no history save, no message onbeforeunload
+    if (this.inIntro || this._container.select('.modal').size()) return;
+
+    let canSave;
+    if (this._currMode?.id === 'save') {
+      canSave = false;
+
+      // Attempt to prevent user from creating duplicate changes - see iD#5200
+      const osm = this.services.get('osm');
+      if (osm && osm.isChangesetInflight()) {
+        this._editSystem.clearSaved();
+        return;
+      }
+
+    } else {
+      canSave = this.selectedIDs().every(id => {
+        const entity = this.hasEntity(id);
+        return entity && !entity.isDegenerate();
+      });
+    }
+
+    if (canSave) {
+      this._editSystem.save();
+    }
+    if (this._editSystem.hasChanges()) {
+      return this._localizationSystem.t('save.unsaved_changes');
+    }
+  }
+
+
+  // The current mode (`null` until ui.render initializes the map and enters browse mode)
+  mode() {
+    return this._currMode;
+  }
+
+
+  /**
+   * `enter`
+   * Enters the given mode, with an optional bunch of features selected.
+   * If the mode could not be entered for whatever reason, falls back to entering browse mode.
+   *
+   * @param   `modeOrModeID`  `Object` or `String` identifying the mode to enter
+   * @param   `options`        Optional `Object` of options passed to the new mode
+   * @return  The mode that got entered
+   */
+  enter(modeOrModeID, options) {
+    const currMode = this._currMode;
+    let newMode;
+
+    if (typeof modeOrModeID === 'string') {
+      newMode = this.modes.get(modeOrModeID);
+    } else {
+      newMode = modeOrModeID;
+    }
+    if (!newMode) {
+      console.error(`this.enter: no such mode: ${modeOrModeID}`);  // eslint-disable-line no-console
+      newMode = this.modes.get('browse');  // fallback
+    }
+
+    // Exit current mode, if any
+    if (currMode) {
+      currMode.exit();
+      this._container.classed(`mode-${currMode.id}`, false);
+    }
+
+    // Try to enter the new mode, fallback to 'browse' mode
+    this._currMode = newMode;
+    const didEnter = this._currMode.enter(options);
+    if (!didEnter) {
+      this._currMode = this.modes.get('browse');
+      this._currMode.enter();
+    }
+    this._container.classed(`mode-${this._currMode.id}`, true);
+    this.emit('modechange', this._currMode);
+    return this._currMode;
+  }
+
+
+  /**
+   * `selectedData`
+   * Returns a Map containing the current selected features.  It can contain
+   * multiple items of various types (e.g. some OSM data, some Rapid data etc)
+   *
+   * @return  The current selected features, as a `Map(datumID -> datum)`
+   */
+  selectedData() {
+    if (!this._currMode) return new Map();
+    return this._currMode.selectedData || new Map();
+  }
+
+  /**
+   * `selectedIDs`
+   * @return  Just the keys of the `selectedData`
+   */
+  selectedIDs() {
+    if (!this._currMode) return [];
+    return this._currMode.selectedIDs || [];
+  }
+
+  selectedNoteID() {
+    console.error('deprecated: do not call context.selectedNoteID anymore');   // eslint-disable-line no-console
+    return null;
+  }
+  selectedErrorID() {
+    console.error('deprecated: do not call context.selectedErrorID anymore');   // eslint-disable-line no-console
+    return null;
+  }
+
+
+  /**
+   * `enableBehaviors`
+   * The given behaviorIDs will be enabled, all others will be disabled
+   * @param   `enableIDs`  `Array` or `Set` containing behaviorIDs to keep enabled
+   */
+  enableBehaviors(enableIDs) {
+    if (!(enableIDs instanceof Set)) {
+      enableIDs = new Set([].concat(enableIDs));  // coax ids into a Set
+    }
+
+    for (const [behaviorID, behavior] of this.behaviors) {
+      if (enableIDs.has(behaviorID)) {  // should be enabled
+        if (!behavior.enabled) {
+          behavior.enable();
+        }
+      } else {  // should be disabled
+        if (behavior.enabled) {
+          behavior.disable();
+        }
+      }
+    }
+  }
+
+
+  // Copy/Paste
+  get copyGraph()     { return this._copyGraph; }
+  set copyGraph(val)  { this._copyGraph = val; }
+
+  get copyIDs() { return this._copyIDs; }
+  set copyIDs(val) {
+    this._copyIDs = val;
+    this._copyGraph = this._editSystem.graph();
+  }
+
+  get copyLoc()     { return this._copyLoc; }
+  set copyLoc(val)  { this._copyLoc = val; }
+
+
+  // Debug
+  debugFlags() {
+    return this._debugFlags;
+  }
+  getDebug(flag) {
+    return flag && this._debugFlags[flag];
+  }
+  setDebug(flag, val = true) {
+    this._debugFlags[flag] = val;
+    if (this._mapSystem?.renderer) {
+      this._mapSystem.immediateRedraw();
+    }
+  }
+
+
+  // Container
+  container(val) {
+    if (val === undefined) return this._container;
+    this._container = val;
+    this._container.classed('ideditor', true);
+    return this;
+  }
+
+  get containerNode() {
+    return this._container.node();
+  }
+  set containerNode(val) {
+    this.container(d3_select(val));
+  }
+
+  embed(val) {
+    if (val === undefined) return this._embed;
+    this._embed = val;
+    return this;
+  }
+
+
+  // Assets
+  asset(val) {
+    if (/^http(s)?:\/\//i.test(val)) return val;
+    const filename = `${this.assetPath}${val}`;
+    return this.assetMap[filename] || filename;
+  }
+
+  imagePath(val) {
+    console.error('deprecated: do not call context.imagePath anymore');   // eslint-disable-line no-console
+    return this.asset(`img/${val}`);
+  }
+
+}
diff --git a/modules/actions/change_preset.js b/modules/actions/change_preset.js
index 760b7937d7..132f73600b 100644
--- a/modules/actions/change_preset.js
+++ b/modules/actions/change_preset.js
@@ -1,13 +1,13 @@
 export function actionChangePreset(entityID, oldPreset, newPreset, skipFieldDefaults) {
-    return function action(graph) {
-        var entity = graph.entity(entityID);
-        var geometry = entity.geometry(graph);
-        var tags = entity.tags;
+  return function action(graph) {
+    const entity = graph.entity(entityID);
+    const geometry = entity.geometry(graph);
+    let tags = entity.tags;
 
-        // preserve tags that the new preset might care about, if any
-        if (oldPreset) tags = oldPreset.unsetTags(tags, geometry, newPreset && newPreset.addTags ? Object.keys(newPreset.addTags) : null);
-        if (newPreset) tags = newPreset.setTags(tags, geometry, skipFieldDefaults);
+    // preserve tags that the new preset might care about, if any
+    if (oldPreset) tags = oldPreset.unsetTags(tags, geometry, newPreset && newPreset.addTags ? Object.keys(newPreset.addTags) : null);
+    if (newPreset) tags = newPreset.setTags(tags, geometry, skipFieldDefaults);
 
-        return graph.replace(entity.update({tags: tags}));
-    };
+    return graph.replace(entity.update({ tags: tags }));
+  };
 }
diff --git a/modules/actions/change_tags.js b/modules/actions/change_tags.js
index 304488de01..d8472c2ec0 100644
--- a/modules/actions/change_tags.js
+++ b/modules/actions/change_tags.js
@@ -1,6 +1,6 @@
-export function actionChangeTags(entityId, tags) {
-    return function(graph) {
-        var entity = graph.entity(entityId);
-        return graph.replace(entity.update({tags: tags}));
-    };
+export function actionChangeTags(entityID, tags) {
+  return function(graph) {
+    const entity = graph.entity(entityID);
+    return graph.replace(entity.update({ tags: tags }));
+  };
 }
diff --git a/modules/actions/join.js b/modules/actions/join.js
index e6ec23f76b..b419bb746e 100644
--- a/modules/actions/join.js
+++ b/modules/actions/join.js
@@ -5,7 +5,6 @@ import { actionDeleteRelation } from './delete_relation';
 import { actionDeleteWay } from './delete_way';
 import { osmIsInterestingTag } from '../osm/tags';
 import { osmJoinWays } from '../osm/multipolygon';
-import { prefs } from '../core/preferences';
 
 
 // Join ways at the end node they share.
@@ -16,7 +15,7 @@ import { prefs } from '../core/preferences';
 //   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
 //
-export function actionJoin(ids) {
+export function actionJoin(ids, options = {}) {
 
     function groupEntitiesByGeometry(graph) {
         var entities = ids.map(function(id) { return graph.entity(id); });
@@ -75,9 +74,8 @@ export function actionJoin(ids) {
             graph = actionDeleteWay(way.id)(graph);
         });
 
-        // Rapid tagnosticRoadCombine
-        var tagnosticRoadCombine = prefs('rapid-internal-feature.tagnosticRoadCombine') === 'true';
-        if (tagnosticRoadCombine && ways.length && ways[0].tags.highway) {
+        // Rapid tagnosticRoadCombine - allow combining highways with conflicting tags
+        if (options.tagnosticRoadCombine && ways.length && ways[0].tags.highway) {
             var newTags = Object.assign({}, survivor.tags);
             newTags.highway = ways[0].tags.highway;
             survivor = survivor.update({ tags: newTags });
@@ -201,9 +199,8 @@ export function actionJoin(ids) {
                 } else if (tags[k] && osmIsInterestingTag(k) && tags[k] !== way.tags[k]) {
                     conflicting = true;
 
-                    // Rapid tagnosticRoadCombine
-                    var tagnosticRoadCombine = prefs('rapid-internal-feature.tagnosticRoadCombine') === 'true';
-                    if (k === 'highway' && tagnosticRoadCombine && !window.mocha) {
+                    // Rapid tagnosticRoadCombine - allow combining highways with conflicting tags
+                    if (k === 'highway' && options.tagnosticRoadCombine && !window.mocha) {
                         conflicting = false;
                     }
                 }
diff --git a/modules/actions/merge_remote_changes.js b/modules/actions/merge_remote_changes.js
index f9f4c72340..97d1ede720 100644
--- a/modules/actions/merge_remote_changes.js
+++ b/modules/actions/merge_remote_changes.js
@@ -1,268 +1,265 @@
+import { vecEqual } from '@rapid-sdk/math';
 import { utilArrayUnion, utilArrayUniq } from '@rapid-sdk/util';
 import deepEqual from 'fast-deep-equal';
 import { diff3Merge } from 'node-diff3';
 
-import { t } from '../core/localizer';
 import { actionDeleteMultiple } from './delete_multiple';
 import { osmEntity } from '../osm';
 
 
-export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTags, formatUser) {
-    discardTags = discardTags || {};
-    var _option = 'safe';  // 'safe', 'force_local', 'force_remote'
-    var _conflicts = [];
+export function actionMergeRemoteChanges(id, options = {}) {
+  const localGraph = options.localGraph;
+  const remoteGraph = options.remoteGraph;
+  const discardTags = options.discardTags ?? {};
+  const formatUser = options.formatUser ?? (d => d);
+  const localize = options.localize ?? (d => d);
+  const strategy = options.strategy ?? 'safe';   // 'safe', 'force_local', 'force_remote'
 
+  let _conflicts = [];
 
-    function user(d) {
-        return (typeof formatUser === 'function') ? formatUser(d) : d;
+
+  function mergeLocation(remote, target) {
+    const EPSILON = 1e-6;
+    if (strategy === 'force_local' || vecEqual(target.loc, remote.loc, EPSILON)) {
+      return target;
+    }
+    if (strategy === 'force_remote') {
+      return target.update({ loc: remote.loc });
     }
 
+    _conflicts.push(
+      localize('merge_remote_changes.conflict.location', { user: formatUser(remote.user) })
+    );
+    return target;
+  }
 
-    function mergeLocation(remote, target) {
-        function pointEqual(a, b) {
-            var epsilon = 1e-6;
-            return (Math.abs(a[0] - b[0]) < epsilon) && (Math.abs(a[1] - b[1]) < epsilon);
-        }
 
-        if (_option === 'force_local' || pointEqual(target.loc, remote.loc)) {
-            return target;
-        }
-        if (_option === 'force_remote') {
-            return target.update({loc: remote.loc});
-        }
-
-        _conflicts.push(t('merge_remote_changes.conflict.location', { user: user(remote.user) }));
-        return target;
+  function mergeNodes(base, remote, target) {
+    if (strategy === 'force_local' || deepEqual(target.nodes, remote.nodes)) {
+      return target;
+    }
+    if (strategy === 'force_remote') {
+      return target.update({ nodes: remote.nodes });
     }
 
-
-    function mergeNodes(base, remote, target) {
-        if (_option === 'force_local' || deepEqual(target.nodes, remote.nodes)) {
-            return target;
-        }
-        if (_option === 'force_remote') {
-            return target.update({nodes: remote.nodes});
+    const origLength = _conflicts.length;
+    const o = base.nodes || [];
+    const a = target.nodes || [];
+    const b = remote.nodes || [];
+    const hunks = diff3Merge(a, o, b, { excludeFalseConflicts: true });
+    let nodes = [];
+
+    for (const hunk of hunks) {
+      if (hunk.ok) {
+        nodes.push.apply(nodes, hunk.ok);
+      } else {
+        // for all conflicts, we can assume c.a !== c.b
+        // because `diff3Merge` called with `true` option to exclude false conflicts..
+        const c = hunk.conflict;
+        if (deepEqual(c.o, c.a)) {  // only changed remotely
+          nodes.push.apply(nodes, c.b);
+        } else if (deepEqual(c.o, c.b)) {  // only changed locally
+          nodes.push.apply(nodes, c.a);
+        } else {       // changed both locally and remotely
+          _conflicts.push(
+            localize('merge_remote_changes.conflict.nodelist', { user: formatUser(remote.user) })
+          );
+          break;
         }
+      }
+    }
+
+    return (_conflicts.length === origLength) ? target.update({ nodes: nodes }) : target;
+  }
 
-        var ccount = _conflicts.length;
-        var o = base.nodes || [];
-        var a = target.nodes || [];
-        var b = remote.nodes || [];
-        var nodes = [];
-        var hunks = diff3Merge(a, o, b, { excludeFalseConflicts: true });
-
-        for (var i = 0; i < hunks.length; i++) {
-            var hunk = hunks[i];
-            if (hunk.ok) {
-                nodes.push.apply(nodes, hunk.ok);
-            } else {
-                // for all conflicts, we can assume c.a !== c.b
-                // because `diff3Merge` called with `true` option to exclude false conflicts..
-                var c = hunk.conflict;
-                if (deepEqual(c.o, c.a)) {  // only changed remotely
-                    nodes.push.apply(nodes, c.b);
-                } else if (deepEqual(c.o, c.b)) {  // only changed locally
-                    nodes.push.apply(nodes, c.a);
-                } else {       // changed both locally and remotely
-                    _conflicts.push(t('merge_remote_changes.conflict.nodelist', { user: user(remote.user) }));
-                    break;
-                }
-            }
-        }
 
-        return (_conflicts.length === ccount) ? target.update({nodes: nodes}) : target;
+  function mergeChildren(targetWay, children, updates, graph) {
+    function isUsed(node, targetWay) {
+      const hasInterestingParent = graph.parentWays(node).some(way => way.id !== targetWay.id);
+      return node.hasInterestingTags() || hasInterestingParent || graph.parentRelations(node).length > 0;
     }
 
+    const origLength = _conflicts.length;
 
-    function mergeChildren(targetWay, children, updates, graph) {
-        function isUsed(node, targetWay) {
-            var hasInterestingParent = graph.parentWays(node)
-                .some(function(way) { return way.id !== targetWay.id; });
+    for (const id of children) {
+      const node = graph.hasEntity(id);
 
-            return node.hasInterestingTags() ||
-                hasInterestingParent ||
-                graph.parentRelations(node).length > 0;
+      // remove unused childNodes..
+      if (targetWay.nodes.indexOf(id) === -1) {
+        if (node && !isUsed(node, targetWay)) {
+          updates.removeIDs.push(id);
         }
+        continue;
+      }
 
-        var ccount = _conflicts.length;
-
-        for (var i = 0; i < children.length; i++) {
-            var id = children[i];
-            var node = graph.hasEntity(id);
-
-            // remove unused childNodes..
-            if (targetWay.nodes.indexOf(id) === -1) {
-                if (node && !isUsed(node, targetWay)) {
-                    updates.removeIds.push(id);
-                }
-                continue;
-            }
-
-            // restore used childNodes..
-            var local = localGraph.hasEntity(id);
-            var remote = remoteGraph.hasEntity(id);
-            var target;
-
-            if (_option === 'force_remote' && remote && remote.visible) {
-                updates.replacements.push(remote);
-
-            } else if (_option === 'force_local' && local) {
-                target = osmEntity(local);
-                if (remote) {
-                    target = target.update({ version: remote.version });
-                }
-                updates.replacements.push(target);
-
-            } else if (_option === 'safe' && local && remote && local.version !== remote.version) {
-                target = osmEntity(local, { version: remote.version });
-                if (remote.visible) {
-                    target = mergeLocation(remote, target);
-                } else {
-                    _conflicts.push(t('merge_remote_changes.conflict.deleted', { user: user(remote.user) }));
-                }
-
-                if (_conflicts.length !== ccount) break;
-                updates.replacements.push(target);
-            }
-        }
+      // restore used childNodes..
+      const local = localGraph.hasEntity(id);
+      const remote = remoteGraph.hasEntity(id);
+      let target;
 
-        return targetWay;
-    }
+      if (strategy === 'force_remote' && remote && remote.visible) {
+        updates.replacements.push(remote);
 
-
-    function updateChildren(updates, graph) {
-        for (var i = 0; i < updates.replacements.length; i++) {
-            graph = graph.replace(updates.replacements[i]);
+      } else if (strategy === 'force_local' && local) {
+        target = osmEntity(local);
+        if (remote) {
+          target = target.update({ version: remote.version });
         }
-        if (updates.removeIds.length) {
-            graph = actionDeleteMultiple(updates.removeIds)(graph);
+        updates.replacements.push(target);
+
+      } else if (strategy === 'safe' && local && remote && local.version !== remote.version) {
+        target = osmEntity(local, { version: remote.version });
+        if (remote.visible) {
+          target = mergeLocation(remote, target);
+        } else {
+          _conflicts.push(
+            localize('merge_remote_changes.conflict.deleted', { user: formatUser(remote.user) })
+          );
         }
-        return graph;
+
+        if (_conflicts.length !== origLength) break;
+        updates.replacements.push(target);
+      }
     }
 
+    return targetWay;
+  }
 
-    function mergeMembers(remote, target) {
-        if (_option === 'force_local' || deepEqual(target.members, remote.members)) {
-            return target;
-        }
-        if (_option === 'force_remote') {
-            return target.update({members: remote.members});
-        }
 
-        _conflicts.push(t('merge_remote_changes.conflict.memberlist', { user: user(remote.user) }));
-        return target;
+  function updateChildren(updates, graph) {
+    for (const entity of updates.replacements) {
+      graph = graph.replace(entity);
     }
+    if (updates.removeIDs.length) {
+      graph = actionDeleteMultiple(updates.removeIDs)(graph);
+    }
+    return graph;
+  }
 
 
-    function mergeTags(base, remote, target) {
-        if (_option === 'force_local' || deepEqual(target.tags, remote.tags)) {
-            return target;
-        }
-        if (_option === 'force_remote') {
-            return target.update({tags: remote.tags});
-        }
-
-        var ccount = _conflicts.length;
-        var o = base.tags || {};
-        var a = target.tags || {};
-        var b = remote.tags || {};
-        var keys = utilArrayUnion(utilArrayUnion(Object.keys(o), Object.keys(a)), Object.keys(b))
-            .filter(function(k) { return !discardTags[k]; });
-        var tags = Object.assign({}, a);   // shallow copy
-        var changed = false;
-
-        for (var i = 0; i < keys.length; i++) {
-            var k = keys[i];
-
-            if (o[k] !== b[k] && a[k] !== b[k]) {    // changed remotely..
-                if (o[k] !== a[k]) {      // changed locally..
-                    _conflicts.push(t('merge_remote_changes.conflict.tags',
-                        { tag: k, local: a[k], remote: b[k], user: user(remote.user) }));
-
-                } else {                  // unchanged locally, accept remote change..
-                    if (b.hasOwnProperty(k)) {
-                        tags[k] = b[k];
-                    } else {
-                        delete tags[k];
-                    }
-                    changed = true;
-                }
-            }
-        }
-
-        return (changed && _conflicts.length === ccount) ? target.update({tags: tags}) : target;
+  function mergeMembers(remote, target) {
+    if (strategy === 'force_local' || deepEqual(target.members, remote.members)) {
+      return target;
+    }
+    if (strategy === 'force_remote') {
+      return target.update({ members: remote.members });
     }
 
+    _conflicts.push(
+      localize('merge_remote_changes.conflict.memberlist', { user: formatUser(remote.user) })
+    );
+    return target;
+  }
 
-    //  `graph.base()` is the common ancestor of the two graphs.
-    //  `localGraph` contains user's edits up to saving
-    //  `remoteGraph` contains remote edits to modified nodes
-    //  `graph` must be a descendant of `localGraph` and may include
-    //      some conflict resolution actions performed on it.
-    //
-    //                  --- ... --- `localGraph` -- ... -- `graph`
-    //                 /
-    //  `graph.base()` --- ... --- `remoteGraph`
-    //
-    var action = function(graph) {
-        var updates = { replacements: [], removeIds: [] };
-        var base = graph.base.entities.get(id);
-        var local = localGraph.entity(id);
-        var remote = remoteGraph.entity(id);
-        var target = osmEntity(local, { version: remote.version });
-
-        // delete/undelete
-        if (!remote.visible) {
-            if (_option === 'force_remote') {
-                return actionDeleteMultiple([id])(graph);
-
-            } else if (_option === 'force_local') {
-                if (target.type === 'way') {
-                    target = mergeChildren(target, utilArrayUniq(local.nodes), updates, graph);
-                    graph = updateChildren(updates, graph);
-                }
-                return graph.replace(target);
-
-            } else {
-                _conflicts.push(t('merge_remote_changes.conflict.deleted', { user: user(remote.user) }));
-                return graph;  // do nothing
-            }
-        }
 
-        // merge
-        if (target.type === 'node') {
-            target = mergeLocation(remote, target);
+  function mergeTags(base, remote, target) {
+    if (strategy === 'force_local' || deepEqual(target.tags, remote.tags)) {
+      return target;
+    }
+    if (strategy === 'force_remote') {
+      return target.update({tags: remote.tags});
+    }
 
-        } else if (target.type === 'way') {
-            // pull in any child nodes that may not be present locally..
-            graph.rebase(remoteGraph.childNodes(remote), [graph], false);
-            target = mergeNodes(base, remote, target);
-            target = mergeChildren(target, utilArrayUnion(local.nodes, remote.nodes), updates, graph);
+    const origLength = _conflicts.length;
+    const o = base.tags ?? {};
+    const a = target.tags ?? {};
+    const b = remote.tags ?? {};
+    const keys = utilArrayUnion(utilArrayUnion(Object.keys(o), Object.keys(a)), Object.keys(b))
+        .filter(function(k) { return !discardTags[k]; });
+    let tags = Object.assign({}, a);   // shallow copy
+    let changed = false;
+
+    for (var i = 0; i < keys.length; i++) {
+      var k = keys[i];
+
+      if (o[k] !== b[k] && a[k] !== b[k]) {    // changed remotely..
+        if (o[k] !== a[k]) {      // changed locally..
+          _conflicts.push(
+            localize('merge_remote_changes.conflict.tags', {
+              tag: k, local: a[k], remote: b[k], user: formatUser(remote.user)
+            })
+          );
+
+        } else {                  // unchanged locally, accept remote change..
+          if (b.hasOwnProperty(k)) {
+            tags[k] = b[k];
+          } else {
+            delete tags[k];
+          }
+          changed = true;
+        }
+      }
+    }
 
-        } else if (target.type === 'relation') {
-            target = mergeMembers(remote, target);
+    return (changed && _conflicts.length === origLength) ? target.update({ tags: tags }) : target;
+  }
+
+
+  //  `graph.base()` is the common ancestor of the two graphs.
+  //  `localGraph` contains user's edits up to saving
+  //  `remoteGraph` contains remote edits to modified nodes
+  //  `graph` must be a descendant of `localGraph` and may include
+  //      some conflict resolution actions performed on it.
+  //
+  //                  --- ... --- `localGraph` -- ... -- `graph`
+  //                 /
+  //  `graph.base()` --- ... --- `remoteGraph`
+  //
+  let action = function(graph) {
+    const updates = { replacements: [], removeIDs: [] };
+    const base = graph.base.entities.get(id);
+    const local = localGraph.entity(id);
+    const remote = remoteGraph.entity(id);
+    let target = osmEntity(local, { version: remote.version });
+
+    // delete/undelete
+    if (!remote.visible) {
+      if (strategy === 'force_remote') {
+        return actionDeleteMultiple([id])(graph);
+
+      } else if (strategy === 'force_local') {
+        if (target.type === 'way') {
+          target = mergeChildren(target, utilArrayUniq(local.nodes), updates, graph);
+          graph = updateChildren(updates, graph);
         }
+        return graph.replace(target);
+
+      } else {
+        _conflicts.push(
+          localize('merge_remote_changes.conflict.deleted', { user: formatUser(remote.user) })
+        );
+        return graph;  // do nothing
+      }
+    }
 
-        target = mergeTags(base, remote, target);
+    // merge
+    if (target.type === 'node') {
+      target = mergeLocation(remote, target);
 
-        if (!_conflicts.length) {
-            graph = updateChildren(updates, graph).replace(target);
-        }
+    } else if (target.type === 'way') {
+      // pull in any child nodes that may not be present locally..
+      graph.rebase(remoteGraph.childNodes(remote), [graph], false);
+      target = mergeNodes(base, remote, target);
+      target = mergeChildren(target, utilArrayUnion(local.nodes, remote.nodes), updates, graph);
+
+    } else if (target.type === 'relation') {
+      target = mergeMembers(remote, target);
+    }
 
-        return graph;
-    };
+    target = mergeTags(base, remote, target);
 
+    if (!_conflicts.length) {
+      graph = updateChildren(updates, graph).replace(target);
+    }
 
-    action.withOption = function(opt) {
-        _option = opt;
-        return action;
-    };
+    return graph;
+  };
 
 
-    action.conflicts = function() {
-        return _conflicts;
-    };
+  action.conflicts = function() {
+    return _conflicts;
+  };
 
 
-    return action;
+  return action;
 }
diff --git a/modules/behaviors/AbstractBehavior.js b/modules/behaviors/AbstractBehavior.js
index 0f653a71e3..a749cde881 100644
--- a/modules/behaviors/AbstractBehavior.js
+++ b/modules/behaviors/AbstractBehavior.js
@@ -1,24 +1,29 @@
 import { EventEmitter } from '@pixi/utils';
 
+
 /**
  * "Behaviors" are nothing more than bundles of event handlers that we can
  * enable and disable depending on what the user is doing.
  *
  * `AbstractBehavior` is the base class from which all behaviors inherit.
- * It contains enable/disable methods which manage the event handlers for the behavior
+ * It contains enable/disable methods which manage the event handlers for the behavior.
+ * All behaviors are event emitters.
  *
  * Properties you can access:
+ *   `id`        `String` identifier for the behavior (e.g. 'draw')
  *   `enabled`   `true` if the event handlers are enabled, `false` if not.
  */
 export class AbstractBehavior extends EventEmitter {
 
   /**
    * @constructor
-   * @param  `context`   Global shared application context
+   * @param  `context`  Global shared application context
    */
   constructor(context) {
     super();
     this.context = context;
+    this.id = '';
+
     this._enabled = false;
   }
 
diff --git a/modules/behaviors/BehaviorDrag.js b/modules/behaviors/DragBehavior.js
similarity index 94%
rename from modules/behaviors/BehaviorDrag.js
rename to modules/behaviors/DragBehavior.js
index 06a3395ef3..4cb9b5be0f 100644
--- a/modules/behaviors/BehaviorDrag.js
+++ b/modules/behaviors/DragBehavior.js
@@ -7,7 +7,7 @@ const NEAR_TOLERANCE = 1;
 const FAR_TOLERANCE = 4;
 
 /**
- * `BehaviorDrag` listens to pointer events and converts those into start/move/end drag events
+ * `DragBehavior` listens to pointer events and converts those into start/move/end drag events
  *
  * Properties available:
  *   `enabled`     `true` if the event handlers are enabled, `false` if not.
@@ -21,7 +21,7 @@ const FAR_TOLERANCE = 4;
  *   `end`      Fires on pointerup when dragging is done, receives the up `eventData` Object
  *   `cancel`   Fires on pointercancel -or- pointerup outside, receives the cancel `eventData` Object
  */
-export class BehaviorDrag extends AbstractBehavior {
+export class DragBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -56,8 +56,8 @@ export class BehaviorDrag extends AbstractBehavior {
     this.lastMove = null;
     this.dragTarget = null;
 
-    const eventManager = this.context.map().renderer.events;
-    eventManager.on('modifierchanged', this._doMove);
+    const eventManager = this.context.mapSystem().renderer.events;
+    eventManager.on('modifierchange', this._doMove);
     eventManager.on('pointerover', this._doMove);
     eventManager.on('pointerout', this._doMove);
     eventManager.on('pointerdown', this._pointerdown);
@@ -87,8 +87,8 @@ export class BehaviorDrag extends AbstractBehavior {
     this.lastMove = null;
     this.dragTarget = null;
 
-    const eventManager = this.context.map().renderer.events;
-    eventManager.off('modifierchanged', this._doMove);
+    const eventManager = this.context.mapSystem().renderer.events;
+    eventManager.off('modifierchange', this._doMove);
     eventManager.off('pointerover', this._doMove);
     eventManager.off('pointerout', this._doMove);
     eventManager.off('pointerdown', this._pointerdown);
@@ -127,7 +127,7 @@ export class BehaviorDrag extends AbstractBehavior {
    * @param  `e`  A Pixi FederatedPointerEvent
    */
   _pointermove(e) {
-    const map = this.context.map();
+    const map = this.context.mapSystem();
 
     // If we detect the edit (right-click) menu, we should cease any dragging behavior.
     const hasEditmenu = map.supersurface.select('.edit-menu').size();
@@ -231,7 +231,7 @@ export class BehaviorDrag extends AbstractBehavior {
   _snappingDisabled() {
     // Ignore it if we are not over the canvas
     // (e.g. sidebar, out of browser window, over a button, toolbar, modal)
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     if (!eventManager.pointerOverRenderer) return false;
 
     const modifiers = eventManager.modifierKeys;
diff --git a/modules/behaviors/BehaviorDraw.js b/modules/behaviors/DrawBehavior.js
similarity index 96%
rename from modules/behaviors/BehaviorDraw.js
rename to modules/behaviors/DrawBehavior.js
index 52fb8de9ea..5fc7fcad36 100644
--- a/modules/behaviors/BehaviorDraw.js
+++ b/modules/behaviors/DrawBehavior.js
@@ -8,7 +8,7 @@ const FAR_TOLERANCE = 12;
 
 
 /**
- * `BehaviorDraw` listens to pointer and click events and translates those into drawing events
+ * `DrawBehavior` listens to pointer and click events and translates those into drawing events
  *
  * Properties available:
  *   `enabled`    `true` if the event handlers are enabled, `false` if not.
@@ -24,7 +24,7 @@ const FAR_TOLERANCE = 12;
  *   `click`     Fires on a successful click (or spacebar), receives `eventData` for the event that triggered the click
  *   `finish`    Fires if user presses return, enter, or escape
  */
-export class BehaviorDraw extends AbstractBehavior {
+export class DrawBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -68,10 +68,10 @@ export class BehaviorDraw extends AbstractBehavior {
 
     this._spaceClickDisabled = false;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.on('keydown', this._keydown);
     eventManager.on('keyup', this._keyup);
-    eventManager.on('modifierchanged', this._doMove);
+    eventManager.on('modifierchange', this._doMove);
     eventManager.on('pointerover', this._doMove);
     eventManager.on('pointerout', this._doMove);
     eventManager.on('pointerdown', this._pointerdown);
@@ -96,10 +96,10 @@ export class BehaviorDraw extends AbstractBehavior {
 
     this._spaceClickDisabled = false;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.off('keydown', this._keydown);
     eventManager.off('keyup', this._keyup);
-    eventManager.off('modifierchanged', this._doMove);
+    eventManager.off('modifierchange', this._doMove);
     eventManager.off('pointerover', this._doMove);
     eventManager.off('pointerout', this._doMove);
     eventManager.off('pointerdown', this._pointerdown);
@@ -257,7 +257,7 @@ export class BehaviorDraw extends AbstractBehavior {
     // Ignore it if we are not over the canvas
     // (e.g. sidebar, out of browser window, over a button, toolbar, modal)
     const context = this.context;
-    const eventManager = context.map().renderer.events;
+    const eventManager = context.mapSystem().renderer.events;
     if (!eventManager.pointerOverRenderer) return;
 
     const modifiers = eventManager.modifierKeys;
@@ -317,7 +317,7 @@ export class BehaviorDraw extends AbstractBehavior {
     // Ignore it if we are not over the canvas
     // (e.g. sidebar, out of browser window, over a button, toolbar, modal)
     const context = this.context;
-    const eventManager = context.map().renderer.events;
+    const eventManager = context.mapSystem().renderer.events;
     // if (!eventManager.pointerOverRenderer) return;
 
     const modifiers = eventManager.modifierKeys;
diff --git a/modules/behaviors/BehaviorHover.js b/modules/behaviors/HoverBehavior.js
similarity index 87%
rename from modules/behaviors/BehaviorHover.js
rename to modules/behaviors/HoverBehavior.js
index 7776c3bd63..ce6e67bf06 100644
--- a/modules/behaviors/BehaviorHover.js
+++ b/modules/behaviors/HoverBehavior.js
@@ -3,7 +3,7 @@ import { AbstractBehavior } from './AbstractBehavior';
 
 
 /**
- * `BehaviorHover` listens to pointer events emits `hoverchanged` events as the user hovers over stuff
+ * `HoverBehavior` listens to pointer events emits `hoverchange` events as the user hovers over stuff
  *
  * Properties available:
  *   `enabled`      `true` if the event handlers are enabled, `false` if not.
@@ -11,9 +11,9 @@ import { AbstractBehavior } from './AbstractBehavior';
  *   `hoverTarget`  `Object` that contains details about the feature being hovered, or `null`
  *
  * Events available:
- *   `hoverchanged`  Fires whenever the hover target has changed, receives `eventData` Object
+ *   `hoverchange`  Fires whenever the hover target has changed, receives `eventData` Object
  */
-export class BehaviorHover extends AbstractBehavior {
+export class HoverBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -43,8 +43,8 @@ export class BehaviorHover extends AbstractBehavior {
     this.lastMove = null;
     this.hoverTarget = null;
 
-    const eventManager = this.context.map().renderer.events;
-    eventManager.on('modifierchanged', this._doHover);
+    const eventManager = this.context.mapSystem().renderer.events;
+    eventManager.on('modifierchange', this._doHover);
     eventManager.on('pointerover', this._doHover);
     eventManager.on('pointerout', this._doHover);
     eventManager.on('pointermove', this._pointermove);
@@ -69,8 +69,8 @@ export class BehaviorHover extends AbstractBehavior {
     this.lastMove = null;
     this.hoverTarget = null;
 
-    const eventManager = this.context.map().renderer.events;
-    eventManager.off('modifierchanged', this._doHover);
+    const eventManager = this.context.mapSystem().renderer.events;
+    eventManager.off('modifierchange', this._doHover);
     eventManager.off('pointerover', this._doHover);
     eventManager.off('pointerout', this._doHover);
     eventManager.off('pointermove', this._pointermove);
@@ -92,7 +92,7 @@ export class BehaviorHover extends AbstractBehavior {
 
   /**
    * _doHover
-   * Emits a 'hoverchanged' event if needed
+   * Emits a 'hoverchange' event if needed
    * This may also be fired if we detect a change in the modifier keys.
    */
   _doHover() {
@@ -102,7 +102,7 @@ export class BehaviorHover extends AbstractBehavior {
     if (interaction.gesture) return;  // dont change hover while interacting with the map
 
     const context = this.context;
-    const eventManager = context.map().renderer.events;
+    const eventManager = context.mapSystem().renderer.events;
     const modifiers = eventManager.modifierKeys;
     const hasModifierKey = modifiers.has('Alt') || modifiers.has('Control') || modifiers.has('Meta');
     const eventData = Object.assign({}, this.lastMove);  // shallow copy
@@ -152,7 +152,7 @@ export class BehaviorHover extends AbstractBehavior {
     const currID = eventData?.target?.featureID || null;
     if (prevID !== currID) {
       this.hoverTarget = Object.assign({}, eventData.target);  // shallow copy
-      this.emit('hoverchanged', eventData);
+      this.emit('hoverchange', eventData);
     }
   }
 }
diff --git a/modules/behaviors/BehaviorKeyOperation.js b/modules/behaviors/KeyOperationBehavior.js
similarity index 94%
rename from modules/behaviors/BehaviorKeyOperation.js
rename to modules/behaviors/KeyOperationBehavior.js
index adb89c27b3..f901040be9 100644
--- a/modules/behaviors/BehaviorKeyOperation.js
+++ b/modules/behaviors/KeyOperationBehavior.js
@@ -2,10 +2,10 @@ import { AbstractBehavior } from './AbstractBehavior';
 
 
 /**
- * `BehaviorKeyOperation` binds whatever keystroke events trigger an "operation"
+ * `KeyOperationBehavior` binds whatever keystroke events trigger an "operation"
  * ("operations" are the things that go on the editing menu)
  */
-export class BehaviorKeyOperation extends AbstractBehavior {
+export class KeyOperationBehavior extends AbstractBehavior {
 
   /**
    * @constructor
diff --git a/modules/behaviors/BehaviorLasso.js b/modules/behaviors/LassoBehavior.js
similarity index 81%
rename from modules/behaviors/BehaviorLasso.js
rename to modules/behaviors/LassoBehavior.js
index 73023c956a..b9b1a843cf 100644
--- a/modules/behaviors/BehaviorLasso.js
+++ b/modules/behaviors/LassoBehavior.js
@@ -1,12 +1,17 @@
 import { Extent, geomPointInPolygon } from '@rapid-sdk/math';
 import { utilArrayIntersection } from '@rapid-sdk/util';
 
-import { locationManager } from '../core/LocationManager';
-import { modeSelect } from '../modes/select';
 import { AbstractBehavior } from './AbstractBehavior';
 
 
-export class BehaviorLasso extends AbstractBehavior {
+/**
+ * `LassoBehavior` listens to pointer events and tries to
+ *  create a lasso for selecting OSM features.
+ *
+ * If it's able to do this, it sends the lasso polygon data to the map ui layer
+ * and on completeion enters select mode with the OSM features selected.
+ */
+export class LassoBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -15,7 +20,6 @@ export class BehaviorLasso extends AbstractBehavior {
   constructor(context) {
     super(context);
     this.id = 'lasso';
-    this.lasso = null;
 
     this._lassoing = false;
     this._extent = null;
@@ -38,7 +42,7 @@ export class BehaviorLasso extends AbstractBehavior {
     this._lassoing = false;
     this._extent = null;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.on('pointerdown', this._pointerdown);
     eventManager.on('pointermove', this._pointermove);
     eventManager.on('pointerup', this._pointerup);
@@ -56,7 +60,7 @@ export class BehaviorLasso extends AbstractBehavior {
     this._lassoing = false;
     this._extent = null;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.off('pointerdown', this._pointerdown);
     eventManager.off('pointermove', this._pointermove);
     eventManager.off('pointerup', this._pointerup);
@@ -71,7 +75,7 @@ export class BehaviorLasso extends AbstractBehavior {
    _pointerdown() {
     // Ignore it if we are not over the canvas
     // (e.g. sidebar, out of browser window, over a button, toolbar, modal)
-     const eventManager = this.context.map().renderer.events;
+     const eventManager = this.context.mapSystem().renderer.events;
      if (!eventManager.pointerOverRenderer) return;
 
      const modifiers = eventManager.modifierKeys;
@@ -79,7 +83,7 @@ export class BehaviorLasso extends AbstractBehavior {
 
      if (drawLasso) {
        this._lassoing = true;
-       const coord = this.context.map().mouseLoc();
+       const coord = this.context.mapSystem().mouseLoc();
        this._extent = new Extent(coord);
        this._coords.push(coord);
      }
@@ -94,10 +98,10 @@ export class BehaviorLasso extends AbstractBehavior {
   _pointermove() {
     if (!this._lassoing) return;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     if (!eventManager.pointerOverRenderer) return;
 
-    const coord = this.context.map().mouseLoc();
+    const coord = this.context.mapSystem().mouseLoc();
 
     // Update geometry and extent
     this._extent = this._extent.extend(new Extent(coord));
@@ -106,7 +110,7 @@ export class BehaviorLasso extends AbstractBehavior {
     // Push the polygon data to the map UI for rendering.
     const mapUILayer = this.context.scene().layers.get('map-ui');
     mapUILayer.lassoPolygonData = this._coords;
-    this.context.map().immediateRedraw();
+    this.context.mapSystem().immediateRedraw();
   }
 
 
@@ -128,7 +132,7 @@ export class BehaviorLasso extends AbstractBehavior {
     this._extent = null;
 
     if (ids.length) {
-      this.context.enter(modeSelect(this.context, ids));
+      this.context.enter('select-osm', { selectedIDs: ids });
     }
   }
 
@@ -147,17 +151,18 @@ export class BehaviorLasso extends AbstractBehavior {
     const graph = this.context.graph();
     const context = this.context;
     const polygonLocs = this._coords;
+    const locationSystem = context.locationSystem();
 
     if (!this.context.editable()) return [];
 
-    let intersects = this.context.history()
+    let intersects = this.context.editSystem()
       .intersects(this._extent)
       .filter(entity => {
         return (
           entity.type === 'node' &&
           geomPointInPolygon(entity.loc, polygonLocs) &&
-          !context.features().isHidden(entity, graph, entity.geometry(graph)) &&
-          !locationManager.blocksAt(entity.loc).length
+          !context.filterSystem().isHidden(entity, graph, entity.geometry(graph)) &&
+          !locationSystem.blocksAt(entity.loc).length
         );
       });
 
diff --git a/modules/behaviors/BehaviorMapInteraction.js b/modules/behaviors/MapInteractionBehavior.js
similarity index 92%
rename from modules/behaviors/BehaviorMapInteraction.js
rename to modules/behaviors/MapInteractionBehavior.js
index ade0674576..1511b5f89a 100644
--- a/modules/behaviors/BehaviorMapInteraction.js
+++ b/modules/behaviors/MapInteractionBehavior.js
@@ -15,7 +15,7 @@ const FAR_TOLERANCE = 4;
 
 
 /**
- * `BehaviorMapInteraction` listens to pointer events and converts those into zoom/pan map interactions
+ * `MapInteractionBehavior` listens to pointer events and converts those into zoom/pan map interactions
  *
  * Properties available:
  *   `enabled`             `true` if the event handlers are enabled, `false` if not.
@@ -23,7 +23,7 @@ const FAR_TOLERANCE = 4;
  *   `lastDown`            `eventData` Object for the most recent down event
  *   `gesture`             String containing the current detected gesture ('pan')
  */
-export class BehaviorMapInteraction extends AbstractBehavior {
+export class MapInteractionBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -59,7 +59,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
     this.lastDown = null;
     this.gesture = null;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.on('click', this._click);
     eventManager.on('keydown', this._keydown);
     eventManager.on('pointerdown', this._pointerdown);
@@ -81,7 +81,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
     this.lastDown = null;
     this.gesture = null;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.off('click', this._click);
     eventManager.off('keydown', this._keydown);
     eventManager.off('pointerdown', this._pointerdown);
@@ -104,7 +104,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
     if (activeElement !== 'BODY') return;
 
     const context = this.context;
-    const map = context.map();
+    const map = context.mapSystem();
     const EASE = 100;  // milliseconds
 
     if (e.shiftKey) {
@@ -161,7 +161,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
     const x2 = x - p1[0] * k2;
     const y2 = y - p1[1] * k2;
 
-    this.context.map().transformEase({ x: x2, y: y2, k: k2 });
+    this.context.mapSystem().transformEase({ x: x2, y: y2, k: k2 });
   }
 
 
@@ -175,7 +175,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
     if (this.lastDown) return;   // a pointer is already down
 
     // If shift is pressed it's a lasso, not a map drag
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     if (eventManager.modifierKeys.has('Shift')) return;
 
     const down = this._getEventData(e);
@@ -219,7 +219,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
 
       const tNew = { x: t.x + newX, y: t.y + newY, k: t.k };
 
-      this.context.map().transform(tNew);
+      this.context.mapSystem().transform(tNew);
     }
   }
 
@@ -237,7 +237,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
     this.lastDown = null;
     this.gesture = null;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.setCursor('inherit');
   }
 
@@ -253,7 +253,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
     this.lastDown = null;
     this.gesture = null;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.setCursor('inherit');
   }
 
@@ -294,7 +294,7 @@ export class BehaviorMapInteraction extends AbstractBehavior {
       tNew = { x: t.x - dX, y: t.y - dY, k: t.k };
     }
 
-    this.context.map().transform(tNew);
+    this.context.mapSystem().transform(tNew);
   }
 
 }
diff --git a/modules/behaviors/BehaviorMapNudging.js b/modules/behaviors/MapNudgingBehavior.js
similarity index 81%
rename from modules/behaviors/BehaviorMapNudging.js
rename to modules/behaviors/MapNudgingBehavior.js
index e28ccaecc8..1b8cc60c59 100644
--- a/modules/behaviors/BehaviorMapNudging.js
+++ b/modules/behaviors/MapNudgingBehavior.js
@@ -8,7 +8,8 @@ import { AbstractBehavior } from './AbstractBehavior';
 const nudgeFactor = 0.1;
 
 /**
- * `BehaviorMapNudging` listens to pointer events and converts those into small map panning 'nudges' when the pointer nears the edge of the screen
+ * `MapNudgingBehavior` listens to pointer events and converts those into small
+ *  map panning 'nudges' when the pointer nears the edge of the screen
  *  useful during drawing modes
  *
  * Properties available:
@@ -16,7 +17,7 @@ const nudgeFactor = 0.1;
  *   `lastDown`            `eventData` Object for the most recent down event
  *   `gesture`             String containing the current detected gesture ('pan')
  */
-export class BehaviorMapNudging extends AbstractBehavior {
+export class MapNudgingBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -37,7 +38,7 @@ export class BehaviorMapNudging extends AbstractBehavior {
    */
   enable() {
     if (this._enabled) return;
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.on('pointermove', this._pointermove);
   }
 
@@ -62,7 +63,7 @@ export class BehaviorMapNudging extends AbstractBehavior {
   disable() {
     if (!this._enabled) return;
     this._enabled = false;
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.off('pointermove', this._pointermove);
   }
 
@@ -76,12 +77,12 @@ export class BehaviorMapNudging extends AbstractBehavior {
     if (!this._enabled) return;
 
     const point = [e.global.x, e.global.y];
-    const nudge = geomViewportNudge(point, this.context.map().dimensions);
+    const nudge = geomViewportNudge(point, this.context.mapSystem().dimensions);
     if (nudge) {
       const [dX, dY] = [nudge[0] * nudgeFactor, nudge[1] * nudgeFactor];
       const t = this.context.projection.transform();
       const tNew = { x: t.x + dX, y: t.y + dY, k: t.k };
-      this.context.map().transform(tNew);
+      this.context.mapSystem().transform(tNew);
     }
   }
 
diff --git a/modules/behaviors/BehaviorPaste.js b/modules/behaviors/PasteBehavior.js
similarity index 84%
rename from modules/behaviors/BehaviorPaste.js
rename to modules/behaviors/PasteBehavior.js
index 155ac7a01b..c30ba22464 100644
--- a/modules/behaviors/BehaviorPaste.js
+++ b/modules/behaviors/PasteBehavior.js
@@ -4,15 +4,14 @@ import { AbstractBehavior } from './AbstractBehavior';
 import { actionCopyEntities } from '../actions/copy_entities';
 import { actionMove } from '../actions/move';
 import { utilDetect } from '../util/detect';
-import { t } from '../core/localizer';
 
 const MACOS = (utilDetect().os === 'mac');
 
 
 /**
- * `BehaviorPaste` listens for key event '⌘V' when pasting is allowed
+ * `PasteBehavior` listens for key event '⌘V' when pasting is allowed
  */
-export class BehaviorPaste extends AbstractBehavior {
+export class PasteBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -35,7 +34,7 @@ export class BehaviorPaste extends AbstractBehavior {
     if (this._enabled) return;
     this._enabled = true;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.on('keydown', this._keydown);
   }
 
@@ -48,7 +47,7 @@ export class BehaviorPaste extends AbstractBehavior {
     if (!this._enabled) return;
     this._enabled = false;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.off('keydown', this._keydown);
   }
 
@@ -75,18 +74,18 @@ export class BehaviorPaste extends AbstractBehavior {
     const context = this.context;
 
     // Nothing to copy..
-    const copyIDs = context.copyIDs();
+    const copyIDs = context.copyIDs;
     if (!copyIDs.length) return;
 
     // Ignore it if we are not over the canvas
     // (e.g. sidebar, out of browser window, over a button, toolbar, modal)
-    const eventManager = context.map().renderer.events;
+    const eventManager = context.mapSystem().renderer.events;
     if (!eventManager.pointerOverRenderer) return;
 
     e.preventDefault();
     e.stopPropagation();
 
-    const copyGraph = context.copyGraph();
+    const copyGraph = context.copyGraph;
     const projection = context.projection;
 
     const action = actionCopyEntities(copyIDs, copyGraph);
@@ -114,12 +113,12 @@ export class BehaviorPaste extends AbstractBehavior {
 
     // Move pasted features to where mouse pointer is..
     // Default to map center if we can't determine the mouse pointer
-    const copyLoc = context.copyLoc();
+    const copyLoc = context.copyLoc;
     const copyPoint = (copyLoc && projection.project(copyLoc)) || projection.project(extent.center());
-    const mousePoint = eventManager.coord || context.map().centerPoint();
+    const mousePoint = eventManager.coord || context.mapSystem().centerPoint();
     const delta = vecSubtract(mousePoint, copyPoint);
 
-    const annotation = t('operations.paste.annotation', { n: pasteIDs.size });
+    const annotation = context.t('operations.paste.annotation', { n: pasteIDs.size });
     context.perform(actionMove(Array.from(pasteIDs), delta, projection), annotation);
 
     // Put the user in move mode so they can place the pasted features
diff --git a/modules/behaviors/BehaviorSelect.js b/modules/behaviors/SelectBehavior.js
similarity index 89%
rename from modules/behaviors/BehaviorSelect.js
rename to modules/behaviors/SelectBehavior.js
index 559e4fcb36..77cafa2337 100644
--- a/modules/behaviors/BehaviorSelect.js
+++ b/modules/behaviors/SelectBehavior.js
@@ -1,13 +1,10 @@
 import { vecLength } from '@rapid-sdk/math';
 
 import { AbstractBehavior } from './AbstractBehavior';
-import { modeSelect } from '../modes/select';
 import { osmEntity, osmNote, QAItem } from '../osm';
-import { services } from '../services';
 import { actionAddMidpoint } from '../actions/add_midpoint';
 import { osmNode } from '../osm/node';
 import { osmWay } from '../osm/way';
-import { t } from '../core/localizer';
 import { geoChooseEdge } from '../geo';
 
 const NEAR_TOLERANCE = 4;
@@ -15,7 +12,7 @@ const FAR_TOLERANCE = 12;
 
 
 /**
- * `BehaviorSelect` listens to pointer events and selects items that are clicked on.
+ * `SelectBehavior` listens to pointer events and selects items that are clicked on.
  *
  * Properties available:
  *   `enabled`      `true` if the event handlers are enabled, `false` if not.
@@ -25,7 +22,7 @@ const FAR_TOLERANCE = 12;
  *   `lastSpace`    `eventData` Object for the most recent move event used to trigger a spacebar click
  *   `lastClick`    `eventData` Object for the most recent click event
  */
-export class BehaviorSelect extends AbstractBehavior {
+export class SelectBehavior extends AbstractBehavior {
 
   /**
    * @constructor
@@ -77,7 +74,7 @@ export class BehaviorSelect extends AbstractBehavior {
     this.lastSpace = null;
     this.lastClick = null;
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.on('keydown', this._keydown);
     eventManager.on('keyup', this._keyup);
     eventManager.on('pointerdown', this._pointerdown);
@@ -108,7 +105,7 @@ export class BehaviorSelect extends AbstractBehavior {
 
     this._cancelLongPress();
 
-    const eventManager = this.context.map().renderer.events;
+    const eventManager = this.context.mapSystem().renderer.events;
     eventManager.off('keydown', this._keydown);
     eventManager.off('keyup', this._keyup);
     eventManager.off('pointerdown', this._pointerdown);
@@ -294,7 +291,7 @@ export class BehaviorSelect extends AbstractBehavior {
     this._cancelLongPress();
 
     const context = this.context;
-    const eventManager = context.map().renderer.events;
+    const eventManager = context.mapSystem().renderer.events;
 
     const modifiers = eventManager.modifierKeys;
     const disableSnap = modifiers.has('Alt') || modifiers.has('Control') || modifiers.has('Meta');
@@ -325,7 +322,7 @@ export class BehaviorSelect extends AbstractBehavior {
 
     // Clicked on nothing
     if (!datum) {
-      context.photos().selectPhoto(null);
+      context.photoSystem().selectPhoto(null);
 
       const mode = context.mode();
       if (mode.id !== 'browse' && !this._multiSelection.size) {
@@ -356,10 +353,10 @@ export class BehaviorSelect extends AbstractBehavior {
           selectedIDs.length <= 1 ||
           selectedIDs.indexOf(datum.id) === -1
         ) {
-          // always enter modeSelect even if the entity is already
+          // Always re-enter select mode even if the entity is already
           // selected since listeners may expect `context.enter` events,
           // e.g. in the walkthrough
-          context.enter(modeSelect(context, [datum.id]));
+          context.enter('select-osm', { selectedIDs: [datum.id] });
         }
 
       } else {
@@ -368,12 +365,12 @@ export class BehaviorSelect extends AbstractBehavior {
           if (!this._showsMenu) {
             // deselect clicked entity, then reenter select mode or return to browse mode..
             selectedIDs = selectedIDs.filter(id => id !== datum.id);
-            context.enter(modeSelect(context, selectedIDs));
+            context.enter('select-osm', { selectedIDs: selectedIDs });
           }
         } else {
           // clicked entity is not in the selected list, add it..
           selectedIDs = selectedIDs.concat([datum.id]);
-          context.enter(modeSelect(context, selectedIDs));
+          context.enter('select-osm', { selectedIDs: selectedIDs });
         }
       }
     }
@@ -382,12 +379,8 @@ export class BehaviorSelect extends AbstractBehavior {
     if (datum.captured_at) {
       // Determine the layer that was clicked on, obtain its service.
       const layerID = target.layer.id;
-      const service = services[layerID];
-      if (!service) return;
-
-      context.map().centerEase(datum.loc);
-      context.photos().selectPhoto(layerID, datum.id);
-//
+      context.mapSystem().centerEase(datum.loc);
+      context.photoSystem().selectPhoto(layerID, datum.id);
 //      // No mode change event here, just manually tell the renderer to select it, for now
 //      const scene = context.scene();
 //      scene.clearClass('selected');
@@ -397,29 +390,29 @@ export class BehaviorSelect extends AbstractBehavior {
     // Clicked on a mapillary object detection or traffic sign, so open a streetview
     // image showing that object/sign
     if (datum.first_seen_at) {
-      const service = services.mapillary;
+      const service = context.services.get('mapillary');
       if (!service) return;
-      this.context.map().centerEase(event.loc);
 
-      const selectedImageId = service.getActiveImage() && service.getActiveImage().id;
+      context.mapSystem().centerEase(event.loc);
+      const selectedImageID = service.getActiveImage() && service.getActiveImage().id;
 
       service.getDetections(datum.id).then(detections => {
-          if (detections.length) {
-              const imageId = detections[0].image.id;
-              if (imageId === selectedImageId) {
-                  service
-                      .highlightDetection(detections[0])
-                      .selectImage(context, imageId);
-              } else {
-                  service.loadViewerAsync(context)
-                      .then(function() {
-                          service
-                              .highlightDetection(detections[0])
-                              .selectImage(context, imageId)
-                              .showViewer(context);
-                      });
-              }
+        if (detections.length) {
+          const imageID = detections[0].image.id;
+          if (imageID === selectedImageID) {
+            service
+              .highlightDetection(detections[0])
+              .selectImage(imageID);
+          } else {
+            service.loadViewerAsync()
+              .then(() => {
+                service
+                  .highlightDetection(detections[0])
+                  .selectImage(imageID)
+                  .showViewer();
+              });
           }
+        }
       });
     }
   }
@@ -479,17 +472,17 @@ export class BehaviorSelect extends AbstractBehavior {
       const edge = [data.nodes[choice.index - 1], data.nodes[choice.index]];
       context.perform(
         actionAddMidpoint({ loc: loc, edge: edge }, osmNode()),
-        t('operations.add.annotation.vertex')
+        context.t('operations.add.annotation.vertex')
       );
-      context.validator().validate();
+      context.validationSystem().validate();
 
     } else if (isMidpoint) {
       const edge = [data.a.id, data.b.id];
       context.perform(
         actionAddMidpoint({ loc: data.loc, edge: edge }, osmNode()),
-        t('operations.add.annotation.vertex')
+        context.t('operations.add.annotation.vertex')
       );
-      context.validator().validate();
+      context.validationSystem().validate();
     }
   }
 
@@ -503,7 +496,7 @@ export class BehaviorSelect extends AbstractBehavior {
     if (!this._enabled || !this.lastClick) return;  // nothing to do
 
     const context = this.context;
-    const eventManager = context.map().renderer.events;
+    const eventManager = context.mapSystem().renderer.events;
 
     const modifiers = eventManager.modifierKeys;
     const disableSnap = modifiers.has('Alt') || modifiers.has('Control') || modifiers.has('Meta');
diff --git a/modules/behaviors/index.js b/modules/behaviors/index.js
index 4de5586c4e..20280842b5 100644
--- a/modules/behaviors/index.js
+++ b/modules/behaviors/index.js
@@ -1,8 +1,38 @@
-export { BehaviorDrag } from './BehaviorDrag';
-export { BehaviorDraw } from './BehaviorDraw';
-export { BehaviorHover } from './BehaviorHover';
-export { BehaviorKeyOperation } from './BehaviorKeyOperation';
-export { BehaviorLasso } from './BehaviorLasso';
-export { BehaviorMapInteraction } from './BehaviorMapInteraction';
-export { BehaviorPaste } from './BehaviorPaste';
-export { BehaviorSelect } from './BehaviorSelect';
+import { AbstractBehavior } from './AbstractBehavior';
+import { DragBehavior } from './DragBehavior';
+import { DrawBehavior } from './DrawBehavior';
+import { HoverBehavior } from './HoverBehavior';
+import { KeyOperationBehavior } from './KeyOperationBehavior';
+import { LassoBehavior } from './LassoBehavior';
+import { MapInteractionBehavior } from './MapInteractionBehavior';
+import { MapNudgingBehavior } from './MapNudgingBehavior';
+import { PasteBehavior } from './PasteBehavior';
+import { SelectBehavior } from './SelectBehavior';
+
+export {
+  AbstractBehavior,
+  DragBehavior,
+  DrawBehavior,
+  HoverBehavior,
+  KeyOperationBehavior,
+  LassoBehavior,
+  MapInteractionBehavior,
+  MapNudgingBehavior,
+  PasteBehavior,
+  SelectBehavior
+};
+
+// At init time, we will instantiate any that are in the 'available' collection.
+export const behaviors = {
+  available:    new Map(),   // Map (id -> Behavior constructor)
+  instantiated: new Map()    // Map (id -> Behavior instance)
+};
+
+behaviors.available.set('drag', DragBehavior);
+behaviors.available.set('draw', DrawBehavior);
+behaviors.available.set('hover', HoverBehavior);
+behaviors.available.set('lasso', LassoBehavior);
+behaviors.available.set('map-interaction', MapInteractionBehavior);
+behaviors.available.set('map-nudging', MapNudgingBehavior);
+behaviors.available.set('paste', PasteBehavior);
+behaviors.available.set('select', SelectBehavior);
diff --git a/modules/core/AbstractSystem.js b/modules/core/AbstractSystem.js
new file mode 100644
index 0000000000..e22b926a4f
--- /dev/null
+++ b/modules/core/AbstractSystem.js
@@ -0,0 +1,43 @@
+import { EventEmitter } from '@pixi/utils';
+
+
+/**
+ * "Systems" are the core components of Rapid
+ * They are owned by the context.
+ *
+ * `AbstractSystem` is the base class from which all systems inherit.
+ *  It provides common methods `init` and `reset` to be overridden in derived classes.
+ *  All systems are event emitters.
+ *
+ * Properties you can access:
+ *   `id`   `String` identifier for the system (e.g. 'l10n')
+ */
+export class AbstractSystem extends EventEmitter {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super();
+    this.context = context;
+    this.id = '';
+  }
+
+
+  /**
+   * init
+   * Called one time after all objects have been instantiated.
+   */
+  init() {
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+  }
+
+}
diff --git a/modules/core/DataLoaderSystem.js b/modules/core/DataLoaderSystem.js
new file mode 100644
index 0000000000..75e4d96c13
--- /dev/null
+++ b/modules/core/DataLoaderSystem.js
@@ -0,0 +1,118 @@
+import { AbstractSystem } from './AbstractSystem';
+
+
+/**
+ * `DataLoaderSystem` fetches data in JSON files.
+ * This allows us to deploy Rapid in a way that the data it needs can be fetched at runtime.
+ * It provides a method `get` that returns a Promise that resolves when the data is available.
+ *
+ * Properties available:
+ *   `fileMap`   `Map` of resourceID to url
+ */
+export class DataLoaderSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  `context`   Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'data';
+
+    const fileMap  = new Map();
+    fileMap.set('address_formats', 'data/address_formats.min.json');
+    fileMap.set('deprecated', 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/deprecated.min.json');
+    fileMap.set('discarded', 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/discarded.min.json');
+    fileMap.set('imagery', 'data/imagery.min.json');
+    fileMap.set('intro_graph', 'data/intro_graph.min.json');
+    fileMap.set('intro_rapid_graph', 'data/intro_rapid_graph.min.json');
+    fileMap.set('keepRight', 'data/keepRight.min.json');
+    fileMap.set('languages', 'data/languages.min.json');
+    fileMap.set('locales', 'locales/index.min.json');
+    fileMap.set('oci_defaults', 'https://cdn.jsdelivr.net/npm/osm-community-index@5.5/dist/defaults.min.json');
+    fileMap.set('oci_features', 'https://cdn.jsdelivr.net/npm/osm-community-index@5.5/dist/featureCollection.min.json');
+    fileMap.set('oci_resources', 'https://cdn.jsdelivr.net/npm/osm-community-index@5.5/dist/resources.min.json');
+    fileMap.set('phone_formats', 'data/phone_formats.min.json');
+    fileMap.set('preset_categories', 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/preset_categories.min.json');
+    fileMap.set('preset_defaults', 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/preset_defaults.min.json');
+    fileMap.set('preset_fields', 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/fields.min.json');
+    fileMap.set('preset_presets', 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/presets.min.json');
+    fileMap.set('qa_data', 'data/qa_data.min.json');
+    fileMap.set('shortcuts', 'data/shortcuts.min.json');
+    fileMap.set('territory_languages', 'data/territory_languages.min.json');
+    fileMap.set('wmf_sitematrix', 'https://cdn.jsdelivr.net/npm/wmf-sitematrix@0.1/wikipedia.min.json');
+
+    this.fileMap = fileMap;
+    this._cachedData = {};
+    this._inflight = {};
+
+    // Mock data for testing, prevents the data from being fetched.
+    // Not sure how I feel about this :-/
+    if (window.mocha) {
+      const c = this._cachedData;
+      c.address_formats = [{ format: [['housenumber', 'street'], ['city', 'postcode']] }];
+      c.deprecated = [{ old: { highway: 'no' } }, { old: { highway: 'ford' }, replace: { ford: '*' } } ];
+      c.discarded = {};
+      c.imagery = [];
+      c.keepRight = {};
+      c.languages = { de: { nativeName: 'Deutsch' }, en: { nativeName: 'English' } };
+      c.locales = { en: { rtl: false, pct: 1 } };
+      c.locale_general_en = { en: {} };
+      c.locale_tagging_en = { en: {} };
+      c.locales_index_general = { en: { rtl: false, pct: 1 } };
+      c.locales_index_tagging = { en: { rtl: false, pct: 1 } };
+      c.phone_formats = {};
+      c.preset_categories = {};
+      c.preset_defaults = {};
+      c.preset_fields = {};
+      c.preset_presets = {};
+      c.qa_data = { improveOSM: {}, osmose: {} };
+      c.shortcuts = [];
+      c.territory_languages = {};
+      c.wmf_sitematrix = [ ['English','English','en'], ['German', 'Deutsch', 'de'] ];
+    }
+  }
+
+
+  // Returns a Promise to fetch data
+  // (resolved with the data if we have it already)
+  get(fileID) {
+    if (this._cachedData[fileID]) {
+      return Promise.resolve(this._cachedData[fileID]);
+    }
+
+    const file = this.fileMap.get(fileID);
+    const url = file && this.context.asset(file);
+    if (!url) {
+      return Promise.reject(`Unknown data file for "${fileID}"`);
+    }
+
+    let prom = this._inflight[url];
+    if (!prom) {
+      this._inflight[url] = prom = fetch(url)
+        .then(response => {
+          // fetch in PhantomJS tests may return ok=false and status=0 even if it's okay
+          if ((!response.ok && response.status !== 0) || !response.json) {
+            throw new Error(response.status + ' ' + response.statusText);
+          }
+          if (response.status === 204 || response.status === 205) return;  // No Content, Reset Content
+          return response.json();
+        })
+        .then(result => {
+          delete this._inflight[url];
+          if (!result) {
+            throw new Error(`No data loaded for "${fileID}"`);
+          }
+          this._cachedData[fileID] = result;
+          return result;
+        })
+        .catch(err => {
+          delete this._inflight[url];
+          throw err;
+        });
+    }
+
+    return prom;
+  }
+
+}
diff --git a/modules/core/EditSystem.js b/modules/core/EditSystem.js
new file mode 100644
index 0000000000..00ce021143
--- /dev/null
+++ b/modules/core/EditSystem.js
@@ -0,0 +1,822 @@
+import { easeLinear as d3_easeLinear } from 'd3-ease';
+import { select as d3_select } from 'd3-selection';
+import { utilArrayDifference, utilArrayGroupBy, utilArrayUnion, utilObjectOmit, utilSessionMutex } from '@rapid-sdk/util';
+
+import { AbstractSystem } from './AbstractSystem';
+import { Difference, Graph, Tree } from './lib';
+import { osmEntity } from '../osm/entity';
+import { uiLoading } from '../ui/loading';
+
+
+const DURATION = 150;
+
+
+/**
+ * `EditSystem` maintains the stack of user edits
+ *  (it used to be called 'history')
+ *
+ * Events available:
+ *   'change'
+ *   'merge'
+ *   'restore'
+ *   'undone'
+ *   'redone'
+ *   'storage_error'
+ */
+export class EditSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  `context`   Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'edits';   // was: 'history'
+
+    this._mutex = utilSessionMutex('lock');
+    this._hasRestorableChanges = false;
+
+    this._imageryUsed = [];
+    this._photosUsed = [];
+    this._checkpoints = {};
+    this._pausedGraph = false;
+    this._stack = [];
+    this._tree = null;
+    this._index = 0;
+
+    // When called like `context.graph`, don't lose `this`
+    this.graph = this.graph.bind(this);
+    this.pauseChangeDispatch = this.pauseChangeDispatch.bind(this);
+    this.resumeChangeDispatch = this.resumeChangeDispatch.bind(this);
+  }
+
+
+  /**
+   * init
+   * Called one time after all objects have been instantiated.
+   */
+  init() {
+    this.reset();
+
+    // changes are restorable if Rapid is not open in another window/tab and a saved history exists in localStorage
+    const prefs = this.context.storageSystem();
+    this._hasRestorableChanges = this._mutex.lock() && prefs.hasItem(this._historyKey());
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    d3_select(document).interrupt('editTransition');
+    const base = new Graph();
+    this._stack = [{ graph: base }];
+    this._tree = new Tree(base);
+    this._index = 0;
+    this._checkpoints = {};
+  }
+
+
+  graph() {
+    return this._stack[this._index].graph;
+  }
+
+
+  tree() {
+    return this._tree;
+  }
+
+
+  base() {
+    return this._stack[0].graph;
+  }
+
+
+  peekAnnotation() {
+    return this._stack[this._index].annotation;
+  }
+
+  peekAllAnnotations() {
+    let result = [];
+    for (let i = 0; i <= this._index; i++) {
+      if (this._stack[i].annotation) {
+        result.push(this._stack[i].annotation);
+      }
+    }
+    return result;
+  }
+
+
+  /**
+   *  merge
+   *  Merge new entities into the history.  This function is called
+   *  when we have parsed a new tile of OSM data, we will receive the
+   *  new entities and a list of all entity ids that the tile contains.
+   *  Can also be called in other situations, like restoring history from
+   *  storage, or loading specific entities from the OSM API.
+   *
+   *  @param  entities   Entities to merge into the history (usually only the new ones)
+   *  @param  seenIDs?   Optional - All entity IDs on the tile (including previously seen ones)
+   */
+  merge(entities, seenIDs) {
+    const baseGraph = this.base();
+    const headGraph = this.graph();
+
+    if (!(seenIDs instanceof Set)) {
+      seenIDs = new Set(entities.map(entity => entity.id));
+    }
+
+    // Which ones are really new (not in the base graph)?
+    const newIDs = new Set();
+    for (const entity of entities) {
+      if (!baseGraph.hasEntity(entity.id)) {  // not merged in yet.
+        newIDs.add(entity.id);
+      }
+    }
+
+    // If we are merging in new relation members, bump the relation's version.
+    for (const id of seenIDs) {
+      const entity = headGraph.hasEntity(id);
+      if (entity?.type !== 'relation') continue;
+
+      for (const member of entity.members) {
+        if (newIDs.has(member.id)) {
+          entity.touch();  // bump version in place
+        }
+      }
+    }
+
+    const graphs = this._stack.map(state => state.graph);
+    baseGraph.rebase(entities, graphs, false);
+    this._tree.rebase(entities, false);
+
+    this.emit('merge', seenIDs);
+  }
+
+
+  perform(...args) {
+    // complete any transition already in progress
+    d3_select(document).interrupt('editTransition');
+
+    // We can perform a eased edit in a transition if we have:
+    // - a single action (or single action + annotation)
+    // - and that action is 'transitionable' (i.e. accepts eased time parameter)
+    const action0 = args[0];
+    let transitionable = false;
+    if (args.length === 1 || (args.length === 2 && typeof args[1] !== 'function')) {
+      transitionable = !!action0.transitionable;
+    }
+
+    if (transitionable) {
+      d3_select(document)
+        .transition('editTransition')
+        .duration(DURATION)
+        .ease(d3_easeLinear)
+        .tween('history.tween', () => {
+          return (t) => {
+            if (t < 1) this._overwrite([action0], t);
+          };
+        })
+        .on('start', () => {
+          this._perform([action0], 0);
+        })
+        .on('end interrupt', () => {
+          this._overwrite(args, 1);
+        });
+
+    } else {
+      return this._perform(args);
+    }
+  }
+
+
+  replace(...args) {
+    d3_select(document).interrupt('editTransition');
+    return this._replace(args, 1);
+  }
+
+
+  // Same as calling pop and then perform
+  overwrite(...args) {
+    d3_select(document).interrupt('editTransition');
+    return this._overwrite(args, 1);
+  }
+
+
+  pop(n) {
+    d3_select(document).interrupt('editTransition');
+
+    const previous = this._stack[this._index].graph;
+    if (isNaN(+n) || +n < 0) {
+      n = 1;
+    }
+    while (n-- > 0 && this._index > 0) {
+      this._index--;
+      this._stack.pop();
+    }
+    return this._change(previous);
+  }
+
+
+  // Go back to the previous annotated edit or _index = 0.
+  undo() {
+    d3_select(document).interrupt('editTransition');
+
+    const previousEdit = this._stack[this._index];
+    while (this._index > 0) {
+      this._index--;
+      if (this._stack[this._index].annotation) break;
+    }
+
+    this.emit('undone', this._stack[this._index], previousEdit);
+    return this._change(previousEdit.graph);
+  }
+
+
+  // Go forward to the next annotated state.
+  redo() {
+    d3_select(document).interrupt('editTransition');
+
+    const previousEdit = this._stack[this._index];
+
+    let tryIndex = this._index;
+    while (tryIndex < this._stack.length - 1) {
+      tryIndex++;
+      if (this._stack[tryIndex].annotation) {
+        this._index = tryIndex;
+        this.emit('redone', this._stack[this._index], previousEdit);
+        break;
+      }
+    }
+
+    return this._change(previousEdit.graph);
+  }
+
+
+  pauseChangeDispatch() {
+    if (!this._pausedGraph) {
+      this._pausedGraph = this._stack[this._index].graph;
+    }
+  }
+
+
+  resumeChangeDispatch() {
+    if (this._pausedGraph) {
+      const previous = this._pausedGraph;
+      this._pausedGraph = null;
+      return this._change(previous);
+    }
+  }
+
+
+  undoAnnotation() {
+    let i = this._index;
+    while (i >= 0) {
+      if (this._stack[i].annotation) return this._stack[i].annotation;
+      i--;
+    }
+  }
+
+
+  redoAnnotation() {
+    let i = this._index + 1;
+    while (i <= this._stack.length - 1) {
+      if (this._stack[i].annotation) return this._stack[i].annotation;
+      i++;
+    }
+  }
+
+
+  // Returns the entities from the active graph with bounding boxes
+  // overlapping the given `extent`.
+  intersects(extent) {
+    return this._tree.intersects(extent, this._stack[this._index].graph);
+  }
+
+
+  difference() {
+    const base = this._stack[0].graph;
+    const head = this._stack[this._index].graph;
+    return new Difference(base, head);
+  }
+
+
+  changes(action) {
+    const base = this._stack[0].graph;
+    let head = this._stack[this._index].graph;
+
+    if (action) {
+      head = action(head);
+    }
+
+    const difference = new Difference(base, head);
+
+    return {
+      modified: difference.modified(),
+      created: difference.created(),
+      deleted: difference.deleted()
+    };
+  }
+
+
+  hasChanges() {
+    return this.difference().changes.size > 0;
+  }
+
+
+  imageryUsed(sources) {
+    if (sources !== undefined) {
+      this._imageryUsed = sources;
+      return this;
+
+    } else {
+      let results = new Set();
+      this._stack.slice(1, this._index + 1).forEach(function(edit) {
+        for (const source of edit.imageryUsed ?? []) {
+          if (source !== 'Custom') {
+            results.add(source);
+          }
+        }
+      });
+
+      return Array.from(results);
+    }
+  }
+
+
+  photosUsed(sources) {
+    if (sources !== undefined) {
+      this._photosUsed = sources;
+      return this;
+
+    } else {
+      let results = new Set();
+      this._stack.slice(1, this._index + 1).forEach(function(edit) {
+        for (const source of edit.photosUsed ?? []) {
+          results.add(source);
+        }
+      });
+
+      return Array.from(results);
+    }
+  }
+
+
+  // save the current history state
+  setCheckpoint(key) {
+    d3_select(document).interrupt('editTransition');
+
+    this._checkpoints[key] = {
+      stack: this._stack,
+      index: this._index
+    };
+    return this;
+  }
+
+
+  // restore history state to a given checkpoint
+  resetToCheckpoint(key) {
+    d3_select(document).interrupt('editTransition');
+
+    if (key !== undefined && this._checkpoints.hasOwnProperty(key)) {  // reset to given key
+      const fromGraph = this._stack[this._index].graph;
+
+      this._stack = this._checkpoints[key].stack;
+      this._index = this._checkpoints[key].index;
+
+      const toGraph = this._stack[this._index].graph;
+      const difference = new Difference(fromGraph, toGraph);
+      this.emit('change', difference);
+    }
+  }
+
+
+  // `toIntroGraph()` is used to export the intro graph used by the walkthrough.
+  //
+  // To use it:
+  //  1. Start the walkthrough.
+  //  2. Get to a "free editing" tutorial step
+  //  3. Make your edits to the walkthrough map
+  //  4. In your browser dev console run:  `context.editSystem().toIntroGraph()`
+  //  5. This outputs stringified JSON to the browser console
+  //  6. Copy it to `data/intro_graph.json` and prettify it in your code editor
+  toIntroGraph() {
+    let nextID = { n: 0, r: 0, w: 0 };
+    let permIDs = {};
+    let graph = this.graph();
+    let result = new Map;   // Map(entityID -> Entity)
+
+    // Copy base entities..
+    for (const entity of graph.base.entities.values()) {
+      const copy = _copyIntroEntity(entity);
+      result.set(copy.id, copy);
+    }
+
+    // Replace base entities with head entities..
+    for (const [entityID, entity] of graph.local.entities) {
+      if (entity) {
+        const copy = _copyIntroEntity(entity);
+        result.set(copy.id, copy);
+      } else {
+        result.delete(entityID);
+      }
+    }
+
+    // Swap ids in node and member lists..
+    for (let entity of result.values()) {
+      if (Array.isArray(entity.nodes)) {
+        entity.nodes = entity.nodes.map(nodeID => {
+          return permIDs[nodeID] ?? nodeID;
+        });
+      }
+      if (Array.isArray(entity.members)) {
+        entity.members = entity.members.map(member => {
+          member.id = permIDs[member.id] || member.id;
+          return member;
+        });
+      }
+    }
+
+    // Convert to Object so we can stringify it.
+    let obj = {};
+    for (const [k, v] of result) { obj[k] = v; }
+    return JSON.stringify({ dataIntroGraph: obj });
+
+
+    function _copyIntroEntity(entity) {
+      let copy = utilObjectOmit(entity, ['type', 'user', 'v', 'version', 'visible']);
+
+      // Note: the copy is no longer an osmEntity, so it might not have `tags`
+      if (copy.tags && !Object.keys(copy.tags)) {
+        delete copy.tags;
+      }
+
+      if (Array.isArray(copy.loc)) {
+        copy.loc[0] = +copy.loc[0].toFixed(6);
+        copy.loc[1] = +copy.loc[1].toFixed(6);
+      }
+
+      const match = entity.id.match(/([nrw])-\d*/);  // temporary id
+      if (match !== null) {
+        let nrw = match[1];
+        let permID;
+        do { permID = nrw + (++nextID[nrw]); }
+        while (result.has(permID));
+
+        permIDs[entity.id] = permID;
+        copy.id = permID;
+      }
+      return copy;
+    }
+
+  }
+
+
+  //
+  //
+  //
+  toJSON() {
+    if (!this.hasChanges()) return;
+
+    const modifiedEntities = new Map();  // Map(Entity.key -> Entity)
+    const allEntityIDs = new Set();
+    const stackData = [];
+
+    // Preserve the users stack of edits..
+    for (const s of this._stack) {
+      const currGraph = s.graph;   // edit done at this point in time
+      let modified = [];
+      let deleted = [];
+
+      // watch out: for modified entities we index on "key" - e.g. "n1v1"
+      for (const [entityID, entity] of currGraph.local.entities) {
+        allEntityIDs.add(entityID);
+        if (entity) {
+          const key = osmEntity.key(entity);
+          modifiedEntities.set(key, entity);
+          modified.push(key);
+        } else {
+          deleted.push(entityID);
+        }
+      }
+
+      const item = {};
+      if (modified.length)      item.modified = modified;
+      if (deleted.length)       item.deleted = deleted;
+      if (s.imageryUsed)        item.imageryUsed = s.imageryUsed;
+      if (s.photosUsed)  item.photosUsed = s.photosUsed;
+      if (s.annotation)         item.annotation = s.annotation;
+      if (s.transform)          item.transform = s.transform;
+      if (s.selectedIDs)        item.selectedIDs = s.selectedIDs;
+      stackData.push(item);
+    }
+
+    // Preserve the originals of edited Entities.
+    // If user restores their edits, we need these Entities to look the same too.
+    const baseGraph = this.base();   // The initial unedited graph
+    let baseEntities = new Map();    // Map(entityID -> entity)
+
+    for (const entityID of allEntityIDs) {
+      const original = baseGraph.hasEntity(entityID);
+      if (!original || baseEntities.has(entityID)) continue;
+
+      baseEntities.set(entityID, original);
+
+      // Preserve originals of child nodes
+      for (const child of baseGraph.childNodes(original)) {
+        baseEntities.set(child.id, child);
+      }
+      // Preserve originals of parent entities too
+      for (const parent of baseGraph.parentWays(original)) {
+        baseEntities.set(parent.id, parent);
+      }
+    }
+
+    return JSON.stringify({
+      version: 3,
+      entities: [...modifiedEntities.values()],
+      baseEntities: [...baseEntities.values()],
+      stack: stackData,
+      nextIDs: osmEntity.id.next,
+      index: this._index,
+      timestamp: (new Date()).getTime()
+    });
+  }
+
+
+  //
+  //
+  //
+  fromJSON(json, loadChildNodes) {
+    const context = this.context;
+    const baseGraph = this.base();   // The initial unedited graph
+    const hist = JSON.parse(json);
+    let loadComplete = true;
+
+    osmEntity.id.next = hist.nextIDs;
+    this._index = hist.index;
+
+    if (hist.version !== 2 && hist.version !== 3) {
+      throw new Error(`History version ${hist.version} not supported.`);
+    }
+
+    // Instantiate the modified entities
+    const modifiedEntities = new Map;  // Map(Entity.key -> Entity)
+    for (const e of hist.entities) {
+      modifiedEntities.set(osmEntity.key(e), osmEntity(e));
+    }
+
+    if (hist.version >= 3) {
+      // If v3+, instantiate base entities too.
+      const baseEntities = hist.baseEntities.map(e => osmEntity(e));
+
+      // Merge originals into base graph, note that the force parameter is `true` here
+      // to replace any that might have been loaded from the API.
+      const graphs = this._stack.map(s => s.graph);
+      baseGraph.rebase(baseEntities, graphs, true);
+      this._tree.rebase(baseEntities, true);
+
+      // When we restore a modified way, we also need to fetch any missing
+      // childnodes that would normally have been downloaded with it.. #2142
+      if (loadChildNodes) {
+        const osm = context.services.get('osm');
+        const baseWays = baseEntities.filter(entity => entity.type === 'way');
+        const nodeIDs = baseWays.reduce(function(acc, way) { return utilArrayUnion(acc, way.nodes); }, []);
+        let missing = nodeIDs.filter(nodeID => !baseGraph.hasEntity(nodeID));
+
+        if (missing.length && osm) {
+          loadComplete = false;
+          context.mapSystem().redrawEnabled = false;
+
+          const loading = uiLoading(context).blocking(true);
+          context.container().call(loading);
+
+          var _childNodesLoaded = function(err, result) {
+            if (!err) {
+              const visibleGroups = utilArrayGroupBy(result.data, 'visible');
+              const visibles = visibleGroups.true || [];      // alive nodes
+              const invisibles = visibleGroups.false || [];   // deleted nodes
+
+              if (visibles.length) {
+                const visibleIDs = visibles.map(entity => entity.id);
+                const graphs = this._stack.map(s => s.graph);
+                missing = utilArrayDifference(missing, visibleIDs);
+                baseGraph.rebase(visibles, graphs, true);   // force = true
+                this._tree.rebase(visibles, true);               // force = true
+              }
+
+              // fetch older versions of nodes that were deleted..
+              invisibles.forEach(function(entity) {
+                osm.loadEntityVersion(entity.id, +entity.version - 1, _childNodesLoaded);
+              });
+            }
+
+            if (err || !missing.length) {
+              loading.close();
+              context.mapSystem().redrawEnabled = true;
+              this.emit('change');
+              this.emit('restore');
+            }
+          };
+
+          osm.loadMultiple(missing, _childNodesLoaded);
+        }
+      }
+    }   // end v3+
+
+
+    // Replace the history stack.
+    this._stack = hist.stack.map((s, index) => {
+      // Leave base graph alone, this first entry should have nothing in it.
+      if (index === 0) return this._stack[0];
+
+      let entities = {};
+
+      if (Array.isArray(s.modified)) {
+        s.modified.forEach(key => {
+          const entity = modifiedEntities.get(key);
+          entities[entity.id] = entity;
+        });
+      }
+
+      if (Array.isArray(s.deleted)) {
+        s.deleted.forEach(entityID => {
+          entities[entityID] = undefined;
+        });
+      }
+
+      // restore Rapid sources
+      if (s.annotation && s.annotation.type === 'rapid_accept_feature') {
+        const rapidSystem = context.rapidSystem();
+        const sourceTag = s.annotation.source;
+        rapidSystem.sources.add('mapwithai');      // always add 'mapwithai'
+        if (sourceTag && /^esri/.test(sourceTag)) {
+          rapidSystem.sources.add('esri');       // add 'esri' for esri sources
+        }
+      }
+
+      return {
+        graph: new Graph(baseGraph).load(entities),
+        annotation: s.annotation,
+        imageryUsed: s.imageryUsed,
+        photosUsed: s.photosUsed,
+        transform: s.transform,
+        selectedIDs: s.selectedIDs
+      };
+    });
+
+
+    const transform = this._stack[this._index].transform;
+    if (transform) {
+      context.mapSystem().transform(transform);
+    }
+
+    if (loadComplete) {
+      this.emit('change');
+      this.emit('restore');
+    }
+
+    return this;
+  }
+
+
+  lock() {
+    return this._mutex.lock();
+  }
+
+
+  unlock() {
+    return this._mutex.unlock();
+  }
+
+
+  save() {
+    // bail out if another browser tab has locked the mutex, or changes exist that the user may want to restore.
+    if (!this._mutex.locked() || this._hasRestorableChanges) return;
+
+    const prefs = this.context.storageSystem();
+    const json = this.toJSON();
+    if (json) {
+      const success = prefs.setItem(this._historyKey(), json);
+      if (!success) this.emit('storage_error');
+    } else {
+      prefs.removeItem(this._historyKey());
+    }
+  }
+
+
+  // delete the history version saved in localStorage
+  clearSaved() {
+    this.context.debouncedSave.cancel();
+
+    // bail out if another browser tab has locked the mutex
+    if (!this._mutex.locked()) return;
+
+    this._hasRestorableChanges = false;
+    const prefs = this.context.storageSystem();
+    prefs.removeItem(this._historyKey());
+
+    // clear the changeset metadata associated with the saved history
+    prefs.removeItem('comment');
+    prefs.removeItem('hashtags');
+    prefs.removeItem('source');
+  }
+
+
+  savedHistoryJSON() {
+    const prefs = this.context.storageSystem();
+    return prefs.getItem(this._historyKey());
+  }
+
+
+  hasRestorableChanges() {
+    return this._hasRestorableChanges;
+  }
+
+
+  // load history from a version stored in localStorage
+  restore() {
+    if (this._mutex.locked()) {
+      this._hasRestorableChanges = false;
+      const json = this.savedHistoryJSON();
+      if (json) this.fromJSON(json, true);
+    }
+  }
+
+
+  // Rapid uses namespaced keys so multiple installations do not conflict
+  _historyKey() {
+    return 'Rapid_' + window.location.origin + '_saved_history';
+  }
+
+
+  // internal _act, accepts Array of actions and eased time
+  _act(args, t) {
+    let actions = args.slice();  // copy
+
+    let annotation;
+    if (typeof actions.at(-1) !== 'function') {
+      annotation = actions.pop();
+    }
+
+    let graph = this._stack[this._index].graph;
+    for (const fn of actions) {
+      graph = fn(graph, t);
+    }
+
+    return {
+      graph: graph,
+      annotation: annotation,
+      imageryUsed: this._imageryUsed,
+      photosUsed: this._photosUsed,
+      transform: this.context.projection.transform(),
+      selectedIDs: this.context.selectedIDs()
+    };
+  }
+
+
+  // internal _perform with eased time
+  _perform(args, t) {
+    const previous = this._stack[this._index].graph;
+    this._stack = this._stack.slice(0, this._index + 1);
+    const edit = this._act(args, t);
+    this._stack.push(edit);
+    this._index++;
+    return this._change(previous);
+  }
+
+
+  // internal _replace with eased time
+  _replace(args, t) {
+    const previous = this._stack[this._index].graph;
+    const edit = this._act(args, t);
+    this._stack[this._index] = edit;
+    return this._change(previous);
+  }
+
+
+  // internal this._overwrite with eased time
+  _overwrite(args, t) {
+    const previous = this._stack[this._index].graph;
+    if (this._index > 0) {
+      this._index--;
+      this._stack.pop();
+    }
+    this._stack = this._stack.slice(0, this._index + 1);
+    const edit = this._act(args, t);
+    this._stack.push(edit);
+    this._index++;
+    return this._change(previous);
+  }
+
+
+  // determine difference and dispatch a change event
+  _change(previous) {
+    const difference = new Difference(previous, this.graph());
+    if (!this._pausedGraph) {
+      this.emit('change', difference);
+    }
+    return difference;
+  }
+}
diff --git a/modules/core/FilterSystem.js b/modules/core/FilterSystem.js
new file mode 100644
index 0000000000..db75804fdd
--- /dev/null
+++ b/modules/core/FilterSystem.js
@@ -0,0 +1,752 @@
+import { utilArrayGroupBy, utilArrayUnion } from '@rapid-sdk/util';
+
+import { AbstractSystem } from './AbstractSystem';
+import { osmEntity, osmLifecyclePrefixes } from '../osm';
+
+
+const traffic_roads = {
+  'motorway': true,
+  'motorway_link': true,
+  'trunk': true,
+  'trunk_link': true,
+  'primary': true,
+  'primary_link': true,
+  'secondary': true,
+  'secondary_link': true,
+  'tertiary': true,
+  'tertiary_link': true,
+  'residential': true,
+  'unclassified': true,
+  'living_street': true
+};
+
+const service_roads = {
+  'busway': true,
+  'service': true,
+  'road': true,
+  'track': true
+};
+
+const paths = {
+  'path': true,
+  'footway': true,
+  'cycleway': true,
+  'bridleway': true,
+  'steps': true,
+  'pedestrian': true
+};
+
+
+
+class FilterRule {
+  constructor(filter) {
+    this.filter = filter;
+    this.enabled = true;   // true = shown, false = hidden
+    this.count = 0;
+  }
+}
+
+
+/**
+ * `FilterSystem` maintains matching and filtering rules.
+ * Each rule is basically a filter function that returns true if an entity matches the rule.
+ * The code in here is relatively "hot", as it gets run against every entity.
+ *
+ * Events available:
+ *   `filterchange`   Fires whenever user changes the enabled/disabled rules
+ */
+export class FilterSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  context  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'filters';
+
+    this._rules = new Map();          // Map(rulekey -> rule)
+    this._hidden = new Set();         // Set(rulekey) to hide
+    this._forceVisible = new Set();   // Set(entityIDs) to show
+    this._cache = {};                 // Cache of entity.key to matched rules
+//    this._deferred = new Set();
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this._hashchange = this._hashchange.bind(this);
+
+    // hardcode the rules for now
+    this._rules.set('points',          new FilterRule(this._isPoint.bind(this)));
+    this._rules.set('traffic_roads',   new FilterRule(this._isTrafficRoad.bind(this)));
+    this._rules.set('service_roads',   new FilterRule(this._isServiceRoad.bind(this)));
+    this._rules.set('paths',           new FilterRule(this._isPath.bind(this)));
+    this._rules.set('buildings',       new FilterRule(this._isBuilding.bind(this)));
+    this._rules.set('building_parts',  new FilterRule(this._isBuildingPart.bind(this)));
+    this._rules.set('indoor',          new FilterRule(this._isIndoor.bind(this)));
+    this._rules.set('landuse',         new FilterRule(this._isLanduse.bind(this)));
+    this._rules.set('boundaries',      new FilterRule(this._isBoundary.bind(this)));
+    this._rules.set('water',           new FilterRule(this._isWater.bind(this)));
+    this._rules.set('rail',            new FilterRule(this._isRail.bind(this)));
+    this._rules.set('pistes',          new FilterRule(this._isPiste.bind(this)));
+    this._rules.set('aerialways',      new FilterRule(this._isAerialway.bind(this)));
+    this._rules.set('power',           new FilterRule(this._isPower.bind(this)));
+    this._rules.set('past_future',     new FilterRule(this._isPastFuture.bind(this)));
+    this._rules.set('others',          new FilterRule(this._isOther.bind(this)));
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    // Take initial values from urlhash first, localstorage second
+    const prefs = this.context.storageSystem();
+    const urlHashSystem = this.context.urlHashSystem();
+    const toHide = urlHashSystem.getParam('disable_features') ?? prefs.getItem('disabled-features');
+
+    if (toHide) {
+      const keys = toHide.replace(/;/g, ',').split(',').map(s => s.trim()).filter(Boolean);
+      for (const key of keys) {
+        this._hidden.add(key);
+        const rule = this._rules.get(key);
+        rule.enabled = false;
+      }
+    }
+
+    urlHashSystem.on('hashchange', this._hashchange);
+
+//    // warm up the feature matching cache upon merging fetched data
+//    this.context.editSystem().on('merge.features', function(newEntities) {
+//        if (!newEntities) return;
+//        var handle = window.requestIdleCallback(function() {
+//            var graph = this.context.graph();
+//            var types = utilArrayGroupBy(newEntities, 'type');
+//            // ensure that getMatches is called on relations before ways
+//            var entities = [].concat(types.relation || [], types.way || [], types.node || []);
+//            for (var i = 0; i < entities.length; i++) {
+//                var geometry = entities[i].geometry(graph);
+//                this.getMatches(entities[i], graph, geometry);
+//            }
+//        });
+//        this._deferred.add(handle);
+//    });
+
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+//    for (const handle of this._deferred) {
+//      window.cancelIdleCallback(handle);
+//    }
+//    this._deferred.clear();
+
+    this._cache = {};
+    this._forceVisible.clear();
+  }
+
+
+  /**
+   * keys
+   */
+  get keys() {
+    return [...this._rules.keys()];
+  }
+
+
+  /**
+   * hidden
+   * @return Set of hidden rule keys
+   */
+  get hidden() {
+    return this._hidden;
+  }
+
+
+  /**
+   * isEnabled
+   * @param   k  rule key
+   * @return  true/false
+   */
+  isEnabled(k) {
+    const rule = this._rules.get(k);
+    return rule?.enabled;
+  }
+
+
+  /**
+   * enable
+   * Enables the given rule key
+   * @param  k  the rule key
+   */
+  enable(k) {
+    const rule = this._rules.get(k);
+    if (rule && !rule.enabled) {
+      rule.enabled = true;
+      this._update();
+    }
+  }
+
+
+  /**
+   * enableAll
+   * Enables all rule keys
+   */
+  enableAll() {
+    let didChange = false;
+    for (const rule of this._rules.values()) {
+      if (!rule.enabled) {
+        didChange = true;
+        rule.enabled = true;
+      }
+    }
+    if (didChange) {
+      this._update();
+    }
+  }
+
+
+  /**
+   * disable
+   * Disables the given rule key
+   * @param  k  the rule key
+   */
+  disable(k) {
+    const rule = this._rules.get(k);
+    if (rule && rule.enabled) {
+      rule.enabled = false;
+      this._update();
+    }
+  }
+
+
+  /**
+   * disableAll
+   * Disables all rule keys
+   */
+  disableAll() {
+    let didChange = false;
+    for (const rule of this._rules.values()) {
+      if (rule.enabled) {
+        didChange = true;
+        rule.enabled = false;
+      }
+    }
+    if (didChange) {
+      this._update();
+    }
+  }
+
+
+  /**
+   * toggle
+   * Toggles the given rule key between enabled/disabled states
+   * @param  k  the rule key
+   */
+  toggle(k) {
+    const rule = this._rules.get(k);
+    if (!rule) return;
+
+    rule.enabled = !rule.enabled;
+    this._update();
+  }
+
+
+  /**
+   * resetStats
+   * Resets all stats and emits a `filterchange` event
+   */
+  resetStats() {
+    for (const rule of this._rules.values()) {
+      rule.count = 0;
+    }
+    this.emit('filterchange');
+  }
+
+
+  /**
+   * gatherStats
+   * Gathers all filter stats for the given scene
+   * @param   d         Array of entities in the scene
+   * @param   resolver  Graph
+   */
+  gatherStats(d, resolver) {
+    const types = utilArrayGroupBy(d, 'type');
+    const entities = [].concat(types.relation || [], types.way || [], types.node || []);
+
+    for (const rule of this._rules.values()) {  // reset stats
+      rule.count = 0;
+    }
+
+    for (const entity of entities) {
+      const geometry = entity.geometry(resolver);
+      const matchedKeys = Object.keys(this.getMatches(entity, resolver, geometry));
+      for (const key of matchedKeys) {
+        const rule = this._rules.get(key);
+        rule.count++;
+      }
+    }
+  }
+
+
+  /**
+   * stats
+   * Returns a result Object of all the rules and count of objects filtered
+   * @return  Object
+   */
+  stats() {
+    let result = {};
+    for (const [key, rule] of this._rules) {
+      result[key] = rule.count;
+    }
+    return result;
+  }
+
+
+  /**
+   * clear
+   * Clears the cache of entity matches for the given entities
+   * @param  entities  Array of entities
+   */
+  clear(entities) {
+    for (const entity of entities) {
+      this.clearEntity(entity);
+    }
+  }
+
+
+  /**
+   * clearEntity
+   * Clears the cache of entity matches for a single entity
+   * @param  entity  Entity
+   */
+  clearEntity(entity) {
+    const ekey = osmEntity.key(entity);
+    delete this._cache[ekey];
+  }
+
+
+  /**
+   * getMatches
+   * Matches a single entity against the rules (`rule.filter` actually where this happens?)
+   * @param   entity    Entity
+   * @param   resolver  Graph
+   * @param   geometry  geometry of the entity ('point', 'line', 'vertex', 'area', 'relation')
+   * @return  An Object with keys that are the matched rule ids (e.g. `{ points: true, power: true }`)
+   */
+  getMatches(entity, resolver, geometry) {
+    // skip - vertexes are hidden based on whatever rules their parent ways have matched
+    if (geometry === 'vertex') return {};
+    // skip - most relations don't have a geometry worth checking
+    // (note that multipolygons are considered 'area' geometry not 'relation')
+    if (geometry === 'relation' && entity.tags.type !== 'boundary') return {};
+
+    const ekey = osmEntity.key(entity);
+    if (!this._cache[ekey]) {
+      this._cache[ekey] = {};
+    }
+
+    if (!this._cache[ekey].matches) {
+      let matches = {};
+      let hasMatch = false;
+
+      for (const [key, rule] of this._rules) {
+        if (key === 'others') {
+          if (hasMatch) continue;  // we matched something better already
+
+          // If an entity...
+          // 1. is a way that hasn't matched other 'interesting' feature rules,
+          if (entity.type === 'way') {
+            const parents = this.getParents(entity, resolver, geometry);
+
+            //  2a. belongs only to a single multipolygon relation
+            if ((parents.length === 1 && parents[0].isMultipolygon()) ||
+              // 2b. or belongs only to boundary relations
+              (parents.length > 0 && parents.every(parent => parent.tags.type === 'boundary'))) {
+
+              // ...then match whatever feature rules the parent relation has matched.
+              // see iD#2548, iD#2887
+              // IMPORTANT: For this to work, getMatches must be called on relations before ways.
+              const pkey = osmEntity.key(parents[0]);
+              if (this._cache[pkey] && this._cache[pkey].matches) {
+                matches = Object.assign({}, this._cache[pkey].matches);  // shallow copy
+                continue;
+              }
+            }
+          }
+        }
+
+        if (rule.filter(entity.tags, geometry)) {
+          matches[key] = hasMatch = true;
+        }
+      }
+      this._cache[ekey].matches = matches;
+    }
+
+    return this._cache[ekey].matches;
+  }
+
+
+  /**
+   * getParents
+   * Returns parentWays of vertexes or parentRelations of other geometry types
+   * @param   entity    Entity
+   * @param   resolver  Graph
+   * @param   geometry  geometry of the entity ('point', 'line', 'vertex', 'area', 'relation')
+   * @return  An array of parent entities
+   */
+  getParents(entity, resolver, geometry) {
+    if (geometry === 'point') return [];
+
+    const ekey = osmEntity.key(entity);
+    if (!this._cache[ekey]) {
+      this._cache[ekey] = {};
+    }
+
+    if (!this._cache[ekey].parents) {
+      let parents;
+      if (geometry === 'vertex') {
+        parents = resolver.parentWays(entity);
+      } else {   // 'line', 'area', 'relation'
+        parents = resolver.parentRelations(entity);
+      }
+      this._cache[ekey].parents = parents;
+    }
+    return this._cache[ekey].parents;
+  }
+
+
+  /**
+   * isHiddenPreset
+   * Checks whether a given preset would be hidden by the current filtering rules
+   * @param   preset    Preset
+   * @param   geometry  geometry of the Preset ('point', 'line', 'vertex', 'area', 'relation')
+   * @return  The rule which causes the preset to be hidden, or `false`
+   */
+  isHiddenPreset(preset, geometry) {
+    if (!this._hidden.size) return false;
+    if (!preset.tags) return false;
+
+    const tags = preset.setTags({}, geometry);
+    for (const [key, rule] of this._rules) {
+      if (rule.filter(tags, geometry)) {
+        if (this._hidden.has(key)) {
+          return key;
+        }
+        return false;
+      }
+    }
+    return false;
+  }
+
+
+  /**
+   * isHiddenFeature
+   * Checks whether a given entity would be hidden by the current filtering rules
+   * @param   entity    Entity
+   * @param   resolver  Graph
+   * @param   geometry  geometry of the entity ('point', 'line', 'vertex', 'area', 'relation')
+   * @return  true/false
+   */
+  isHiddenFeature(entity, resolver, geometry) {
+    if (!this._hidden.size) return false;
+    if (!entity.version) return false;
+    if (this._forceVisible.has(entity.id)) return false;
+
+    const matches = Object.keys(this.getMatches(entity, resolver, geometry));
+    return matches.length && matches.every(key => this._hidden.has(key));
+  }
+
+
+  /**
+   * isHiddenChild
+   * Checks whether a given child entity would be hidden by the current filtering rules
+   * @param   entity    Entity
+   * @param   resolver  Graph
+   * @param   geometry  geometry of the entity ('point', 'line', 'vertex', 'area', 'relation')
+   * @return  true/false
+   */
+  isHiddenChild(entity, resolver, geometry) {
+    if (!this._hidden.size) return false;
+    if (!entity.version || geometry === 'point') return false;
+    if (this._forceVisible.has(entity.id)) return false;
+
+    const parents = this.getParents(entity, resolver, geometry);
+    if (!parents.length) return false;
+
+    for (const parent of parents) {
+      if (!this.isHidden(parent, resolver, parent.geometry(resolver))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+
+  /**
+   * hasHiddenConnections
+   * Checks whether a given entity is connected to a feature that is hidden
+   * @param   entity    Entity
+   * @param   resolver  Graph
+   * @return  true/false
+   */
+  hasHiddenConnections(entity, resolver) {
+    if (!this._hidden.size) return false;
+
+    let childNodes, connections;
+    if (entity.type === 'midpoint') {
+      childNodes = [resolver.entity(entity.edge[0]), resolver.entity(entity.edge[1])];
+      connections = [];
+    } else {
+      childNodes = entity.nodes ? resolver.childNodes(entity) : [];
+      connections = this.getParents(entity, resolver, entity.geometry(resolver));
+    }
+
+    // gather ways connected to child nodes..
+    connections = childNodes.reduce((result, e) => {
+      return resolver.isShared(e) ? utilArrayUnion(result, resolver.parentWays(e)) : result;
+    }, connections);
+
+    return connections.some(other => this.isHidden(other, resolver, other.geometry(resolver)));
+  }
+
+
+  /**
+   * isHidden
+   * Checks whether a given entity is hidden
+   * @param   entity    Entity
+   * @param   resolver  Graph
+   * @param   geometry  geometry of the entity ('point', 'line', 'vertex', 'area', 'relation')
+   * @return  true/false
+   */
+  isHidden(entity, resolver, geometry) {
+    if (!this._hidden.size) return false;
+    if (!entity.version) return false;
+
+    if (geometry === 'vertex') {
+      return this.isHiddenChild(entity, resolver, geometry);
+    } else {
+      return this.isHiddenFeature(entity, resolver, geometry);
+    }
+  }
+
+
+  /**
+   * filter
+   * Returns a result Array containing the non-hidden entities
+   * @param   entities  Array of Entities
+   * @param   resolver  Graph
+   * @return  Array of non-hidden entities
+   */
+  filter(entities, resolver) {
+    if (!this._hidden.size) return entities;
+
+    var result = [];
+    for (const entity of entities) {
+      if (!this.isHidden(entity, resolver, entity.geometry(resolver))) {
+        result.push(entity);
+      }
+    }
+    return result;
+  }
+
+
+  /**
+   * forceVisible
+   * Adds the given entityIDs to the _forceVisible Set
+   * This is usually done temporarily so that users can see stuff as they edit
+   * that might otherwise be hidden
+   * @param   entityIDs  Array of Entity ids
+   */
+  forceVisible(entityIDs) {
+    this._forceVisible = new Set();
+
+    for (const entityID of entityIDs) {
+      this._forceVisible.add(entityID);
+
+      const entity = this.context.hasEntity(entityID);
+      if (entity?.type === 'relation') {  // include relation members (one level deep)
+        for (const member of entity.members) {
+          this._forceVisible.add(member.id);
+        }
+      }
+    }
+  }
+
+
+  /**
+   * _hashchange
+   * Respond to any changes appearing in the url hash
+   * @param  q   Object containing key/value pairs of the current query parameters
+   */
+  _hashchange(q) {
+    // disable_features
+    let toDisableIDs = new Set();
+    if (typeof q.disable_features === 'string') {
+      toDisableIDs = new Set(q.disable_features.replace(/;/g, ',').split(','));
+    }
+
+    let didChange = false;
+    for (const [key, rule] of this._rules) {
+      if (rule.enabled && toDisableIDs.has(key)) {
+        rule.enabled = false;
+        didChange = true;
+      } else if (!rule.enabled && !toDisableIDs.has(key)) {
+        rule.enabled = true;
+        didChange = true;
+      }
+    }
+
+    if (didChange) {
+      this._update();
+    }
+  }
+
+
+  /**
+   *  _update
+   *  Called whenever the enabled/disabled rules change
+   *  Used to push changes in state to the urlhash and the localStorage
+   */
+  _update() {
+    // gather hidden
+    this._hidden = new Set();
+    for (const [key, rule] of this._rules) {
+      if (!rule.enabled) {
+        this._hidden.add(key);
+      }
+    }
+    const ruleIDs = [...this._hidden].join(',');
+
+    // update url hash
+    const urlhash = this.context.urlHashSystem();
+    urlhash.setParam('disable_features', ruleIDs.length ? ruleIDs : null);
+
+    // update localstorage
+    const prefs = this.context.storageSystem();
+    prefs.setItem('disabled-features', ruleIDs);
+
+    this.emit('filterchange');
+  }
+
+
+  // filter rules
+
+  _isPoint(tags, geometry) {
+    return geometry === 'point';
+  }
+
+  _isTrafficRoad(tags) {
+    return traffic_roads[tags.highway];
+  }
+
+  _isServiceRoad(tags) {
+    return service_roads[tags.highway];
+  }
+
+  _isPath(tags) {
+    return paths[tags.highway];
+  }
+
+  _isBuilding(tags) {
+    return (
+      (!!tags.building && tags.building !== 'no') ||
+      tags.parking === 'multi-storey' ||
+      tags.parking === 'sheds' ||
+      tags.parking === 'carports' ||
+      tags.parking === 'garage_boxes'
+    );
+  }
+
+  _isBuildingPart(tags) {
+    return tags['building:part'];
+  }
+
+  _isIndoor(tags) {
+    return tags.indoor;
+  }
+
+  _isLanduse(tags, geometry) {
+    return geometry === 'area' &&
+      !this._isBuilding(tags) &&
+      !this._isBuildingPart(tags) &&
+      !this._isIndoor(tags) &&
+      !this._isWater(tags) &&
+      !this._isAerialway(tags);
+  }
+
+  _isBoundary(tags) {
+    return (
+      !!tags.boundary
+    ) && !(
+      traffic_roads[tags.highway] ||
+      service_roads[tags.highway] ||
+      paths[tags.highway] ||
+      tags.waterway ||
+      tags.railway ||
+      tags.landuse ||
+      tags.natural ||
+      tags.building ||
+      tags.power
+    );
+  }
+
+  _isWater(tags) {
+    return (
+      !!tags.waterway ||
+      tags.natural === 'water' ||
+      tags.natural === 'coastline' ||
+      tags.natural === 'bay' ||
+      tags.landuse === 'pond' ||
+      tags.landuse === 'basin' ||
+      tags.landuse === 'reservoir' ||
+      tags.landuse === 'salt_pond'
+    );
+  }
+
+  _isRail(tags) {
+    return (
+      !!tags.railway || tags.landuse === 'railway'
+    ) && !(
+      traffic_roads[tags.highway] ||
+      service_roads[tags.highway] ||
+      paths[tags.highway]
+    );
+  }
+
+  _isPiste(tags) {
+    return tags['piste:type'];
+  }
+
+  _isAerialway(tags) {
+    return tags.aerialway &&
+      tags.aerialway !== 'yes' &&
+      tags.aerialway !== 'station';
+  }
+
+  _isPower(tags) {
+    return !!tags.power;
+  }
+
+  // contains a past/future tag, but not in active use as a road/path/cycleway/etc..
+  _isPastFuture(tags) {
+    if (traffic_roads[tags.highway] || service_roads[tags.highway] || paths[tags.highway] ) {
+      return false;
+    }
+
+    for (const k of Object.keys(tags)) {
+      if (osmLifecyclePrefixes[k] || osmLifecyclePrefixes[tags[k]]) return true;
+    }
+    return false;
+  }
+
+  // Lines or areas that don't match another feature filter.
+  // IMPORTANT: The 'others' feature must be the last one defined,
+  // so that code in getMatches can skip this test if `hasMatch = true`
+  _isOther(tags, geometry) {
+    return (geometry === 'line' || geometry === 'area');
+  }
+}
diff --git a/modules/renderer/RendererImagery.js b/modules/core/ImagerySystem.js
similarity index 84%
rename from modules/renderer/RendererImagery.js
rename to modules/core/ImagerySystem.js
index 6878042b79..733c352efb 100644
--- a/modules/renderer/RendererImagery.js
+++ b/modules/core/ImagerySystem.js
@@ -1,21 +1,12 @@
-import { EventEmitter } from '@pixi/utils';
 import { geoMetersToOffset, geoOffsetToMeters } from '@rapid-sdk/math';
 import whichPolygon from 'which-polygon';
 
-import { prefs } from '../core/preferences';
-import { fileFetcher } from '../core/file_fetcher';
-
-import {
-  RendererImagerySource,
-  RendererImagerySourceBing,
-  RendererImagerySourceCustom,
-  RendererImagerySourceEsri,
-  RendererImagerySourceNone
-} from './RendererImagerySource';
+import { AbstractSystem } from './AbstractSystem';
+import { ImagerySource, ImagerySourceBing, ImagerySourceCustom, ImagerySourceEsri, ImagerySourceNone } from './lib/ImagerySource';
 
 
 /**
- * `RendererImagery` maintains the state of the tiled background and overlay imagery.
+ * `ImagerySystem` maintains the state of the tiled background and overlay imagery.
  *
  * Properties available:
  *   `offset`
@@ -28,17 +19,17 @@ import {
  * Events available:
  *   `imagerychange`     Fires on any change in imagery or display options
  */
-export class RendererImagery extends EventEmitter {
+export class ImagerySystem extends AbstractSystem {
 
   /**
    * @constructor
    * @param  `context`   Global shared application context
    */
   constructor(context) {
-    super();
-    this.context = context;
+    super(context);
+    this.id = 'imagery';
 
-    this._setupPromise = null;
+    this._initPromise = null;
     this._imageryIndex = null;
     this._baseLayer = null;
     this._overlayLayers = [];
@@ -61,8 +52,8 @@ export class RendererImagery extends EventEmitter {
    * Called one time after all objects have been instantiated.
    */
   init() {
-    this._setupPromise = this._setupImageryAsync();
-    this.context.urlhash().on('hashchange', this._hashchange);
+    this._initPromise = this._setupImageryAsync();
+    this.context.urlHashSystem().on('hashchange', this._hashchange);
   }
 
 
@@ -72,9 +63,9 @@ export class RendererImagery extends EventEmitter {
    * @param  q   Object containing key/value pairs of the current query parameters
    */
   _hashchange(q) {
-    if (!this._setupPromise) return;  // called too early
+    if (!this._initPromise) return;  // called too early
 
-    this._setupPromise  // after imagery loaded
+    this._initPromise  // after imagery loaded
       .then(() => {
         // background
         let baseLayer;
@@ -115,7 +106,7 @@ export class RendererImagery extends EventEmitter {
    */
   updateImagery() {
     const baseLayer = this._baseLayer;
-    if (this.context.inIntro() || !baseLayer) return;
+    if (this.context.inIntro || !baseLayer) return;
 
     let imageryUsed = [];
     let overlayIDs = [];
@@ -138,10 +129,10 @@ export class RendererImagery extends EventEmitter {
     }
 
     // Update history "imagery used" property
-    this.context.history().imageryUsed(imageryUsed);
+    this.context.editSystem().imageryUsed(imageryUsed);
 
     // Update hash params: 'background', 'overlays', 'offset'
-    const urlhash = this.context.urlhash();
+    const urlhash = this.context.urlHashSystem();
     urlhash.setParam('background', baseID);
     urlhash.setParam('overlays', overlayIDs.length ? overlayIDs.join(',') : null);
 
@@ -171,8 +162,8 @@ export class RendererImagery extends EventEmitter {
     const sources = [...this._imageryIndex.sources.values()];
 
     // Recheck blocked sources only if we detect new blocklists pulled from the OSM API.
-    const osm = this.context.connection();
-    const blocklists = (osm && osm.imageryBlocklists()) || [];
+    const osm = this.context.services.get('osm');
+    const blocklists = osm?.imageryBlocklists ?? [];
     const blocklistChanged = (blocklists.length !== this._checkedBlocklists.length) ||
       blocklists.some((regex, index) => String(regex) !== this._checkedBlocklists[index]);
 
@@ -200,10 +191,10 @@ export class RendererImagery extends EventEmitter {
     if (!arguments.length) return this._baseLayer;
 
     // test source against OSM imagery blocklists..
-    const osm = this.context.connection();
+    const osm = this.context.services.get('osm');
     if (!osm) return this;
 
-    const blocklists = osm.imageryBlocklists();
+    const blocklists = osm?.imageryBlocklists ?? [];
     const template = d.template;
     let fail = false;
     let tested = 0;
@@ -224,6 +215,7 @@ export class RendererImagery extends EventEmitter {
     this._baseLayer = (!fail ? d : this.findSource('none'));
 
     this.updateImagery();
+    this.context.immediateRedraw();
     this.emit('imagerychange');
     return this;
   }
@@ -233,13 +225,15 @@ export class RendererImagery extends EventEmitter {
    *
    */
   chooseDefaultSource() {
-    const map = this.context.map();
+    const map = this.context.mapSystem();
     const available = this.sources(map.extent(), map.zoom());
     const first = available[0];
     const best = available.find(s => s.best);
+    const prefs = this.context.storageSystem();
+    const lastUsed = prefs.getItem('background-last-used') || '';
 
     return best ||
-      this.findSource(prefs('background-last-used')) ||
+      this.findSource(lastUsed) ||
       this.findSource('Bing') ||
       this.findSource('Maxar-Premium') ||
       first ||    // maybe this is a custom Rapid that doesn't include Bing or Maxar?
@@ -284,6 +278,7 @@ export class RendererImagery extends EventEmitter {
       if (layer === d) {
         this._overlayLayers.splice(i, 1);
         this.updateImagery();
+        this.context.immediateRedraw();
         this.emit('imagerychange');
         return;
       }
@@ -293,6 +288,7 @@ export class RendererImagery extends EventEmitter {
 
     this._overlayLayers.push(layer);
     this.updateImagery();
+    this.context.immediateRedraw();
     this.emit('imagerychange');
   }
 
@@ -307,6 +303,7 @@ export class RendererImagery extends EventEmitter {
     if (this._baseLayer) {
       this._baseLayer.nudge(delta, zoom);
       this.updateImagery();
+      this.context.immediateRedraw();
       this.emit('imagerychange');
     }
   }
@@ -326,6 +323,7 @@ export class RendererImagery extends EventEmitter {
     if (this._baseLayer) {
       this._baseLayer.offset = [setX, setY];
       this.updateImagery();
+      this.context.immediateRedraw();
       this.emit('imagerychange');
     }
   }
@@ -341,6 +339,7 @@ export class RendererImagery extends EventEmitter {
     if (val === this._brightness) return;  // no change
     this._brightness = val;
     this.context.scene().layers.get('background')?.setBrightness(val);
+    this.context.immediateRedraw();
     this.emit('imagerychange');
   }
 
@@ -369,6 +368,7 @@ export class RendererImagery extends EventEmitter {
     if (val === this._saturation) return;  // no change
     this._saturation = val;
     this.context.scene().layers.get('background')?.setSaturation(val);
+    this.context.immediateRedraw();
     this.emit('imagerychange');
   }
 
@@ -383,6 +383,7 @@ export class RendererImagery extends EventEmitter {
     if (val === this._sharpness) return;  // no change
     this._sharpness = val;
     this.context.scene().layers.get('background')?.setSharpness(val);
+    this.context.immediateRedraw();
     this.emit('imagerychange');
   }
 
@@ -396,6 +397,7 @@ export class RendererImagery extends EventEmitter {
   set numGridSplits(val = 0) {
     if (val === this._numGridSplits) return;  // no change
     this._numGridSplits = val;
+    this.context.immediateRedraw();
     this.emit('imagerychange');
   }
 
@@ -413,9 +415,13 @@ export class RendererImagery extends EventEmitter {
    * @return  Promise that resolves with the imagery index once everything has been loaded and is ready
    */
   _setupImageryAsync() {
-    if (this._setupPromise) return this._setupPromise;
+    if (this._initPromise) return this._initPromise;
+
+    const context = this.context;
+    const dataLoaderSystem = context.dataLoaderSystem();
+    const storageSystem = this.context.storageSystem();
 
-    return fileFetcher.get('imagery')
+    return dataLoaderSystem.get('imagery')
       .then(data => {
         this._imageryIndex = {
           features: new Map(),   // Map(id -> GeoJSON feature)
@@ -447,26 +453,26 @@ export class RendererImagery extends EventEmitter {
         // Create a which-polygon index to support efficient spatial querying.
         this._imageryIndex.query = whichPolygon({ type: 'FeatureCollection', features: features });
 
-        // Instantiate `RendererImagerySource` objects for each imagery item.
+        // Instantiate `ImagerySource` objects for each imagery item.
         for (const d of data) {
           let source;
           if (d.type === 'bing') {
-            source = new RendererImagerySourceBing(d);
+            source = new ImagerySourceBing(context, d);
           } else if (/^EsriWorldImagery/.test(d.id)) {
-            source = new RendererImagerySourceEsri(d);
+            source = new ImagerySourceEsri(context, d);
           } else {
-            source = new RendererImagerySource(d);
+            source = new ImagerySource(context, d);
           }
           this._imageryIndex.sources.set(d.id, source);
         }
 
         // Add 'None'
-        const none = new RendererImagerySourceNone();
+        const none = new ImagerySourceNone(context);
         this._imageryIndex.sources.set(none.id, none);
 
         // Add 'Custom' - seed it with whatever template the user has used previously
-        const custom = new RendererImagerySourceCustom();
-        custom.template = prefs('background-custom-template') || '';
+        const custom = new ImagerySourceCustom(context);
+        custom.template = storageSystem.getItem('background-custom-template') || '';
         this._imageryIndex.sources.set(custom.id, custom);
 
         // Default the locator overlay to "on"..
diff --git a/modules/core/LocalizationSystem.js b/modules/core/LocalizationSystem.js
new file mode 100644
index 0000000000..bd04f23e7a
--- /dev/null
+++ b/modules/core/LocalizationSystem.js
@@ -0,0 +1,779 @@
+import { utilStringQs } from '@rapid-sdk/util';
+
+import { AbstractSystem } from './AbstractSystem';
+import { utilDetect } from '../util/detect';
+
+
+function wrap(x, min, max) {
+  const d = max - min;
+  return ((x - min) % d + d) % d + min;
+}
+
+function clamp(x, min, max) {
+  return Math.max(min, Math.min(x, max));
+}
+
+
+/**
+ * `LocalizationSystem` manages language and locale parameters including translated strings
+ */
+export class LocalizationSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  `context`   Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'l10n';
+
+    // `_supportedLanguages`
+    // All known language codes and their local name. This is used for the language pickers.
+    // {
+    //   "ar": { "nativeName": "العربية" },
+    //   "de": { "nativeName": "Deutsch" },
+    //   "en": { "nativeName": "English" },
+    //   …
+    // }
+    this._supportedLanguages = {};
+
+    // `_supportedLocales`
+    // All supported locale codes that we can fetch translated strings for.
+    // We generate this based on the data that we fetch from Transifex.
+    //
+    // * `rtl` - right-to-left or left-to-right text direction
+    // * `pct` - the percent of strings translated; 1 = 100%, full coverage
+    //
+    // {
+    //   "ar":    { "rtl": true, "pct": 0 },
+    //   "ar-AA": { "rtl": true, "pct": 0 },
+    //   "en":    { "rtl": false, "pct": 1 },
+    //   "en-AU": { "rtl": false, "pct": 0 },
+    //   "en-GB": { "rtl": false, "pct": 0 },
+    //   "de":    { "rtl": false, "pct": 0 },
+    //   …
+    // }
+    this._supportedLocales = {};
+
+    // `_cache`
+    // Where we keep all loaded localized string data, organized by "scope" and "locale":
+    // {
+    //   general: {
+    //     en: { icons: {…}, toolbar: {…}, modes: {…}, operations: {…}, … },
+    //     de: { icons: {…}, toolbar: {…}, modes: {…}, operations: {…}, … },
+    //     …
+    //   },
+    //   tagging: {
+    //     en: { presets: {…}, fields: {…}, … },
+    //     de: { presets: {…}, fields: {…}, … },
+    //     …
+    //   },
+    // }
+    this._cache = {};
+
+    this._preferredLocaleCodes = [];
+    this._currLocaleCode = 'en-US';            // The current locale
+    this._currLocaleCodes = ['en-US', 'en'];   // Must contain `_currLocaleCode` first, followed by fallbacks
+    this._currLanguageCode = 'en';
+    this._currTextDirection = 'ltr';
+    this._currIsMetric = false;
+    this._languageNames = {};
+    this._scriptNames = {};
+
+    this._initPromise = null;
+
+    // When called like `context.t`, don't lose `this`
+    this.t = this.t.bind(this);
+    this.tHtml = this.tHtml.bind(this);
+    this.tAppend = this.tAppend.bind(this);
+  }
+
+
+  // getters for the current locale parameters
+  localeCode()     { return this._currLocaleCode;    }
+  localeCodes()    { return this._currLocaleCodes;   }
+  languageCode()   { return this._currLanguageCode;  }
+  textDirection()  { return this._currTextDirection; }
+  usesMetric()     { return this._currIsMetric;      }
+  languageNames()  { return this._languageNames;     }
+  scriptNames()    { return this._scriptNames;       }
+  isRTL()          { return this._currTextDirection === 'rtl'; }
+
+  /**
+   * preferredLocaleCodes
+   * Allows the user to manually set the locale, overriding the locales specified by the browser
+   * If you're going to use this, you must call it before `initAsync` starts fetching data.
+   * @param   codes  Array or String of preferred locales
+   */
+  set preferredLocaleCodes(codes) {
+    if (typeof codes === 'string') {
+      // Be generous and accept delimited strings as input
+      this._preferredLocaleCodes = codes.split(/,|;| /gi).filter(Boolean);
+    } else {
+      this._preferredLocaleCodes = codes || [];
+    }
+  }
+  get preferredLocaleCodes() {
+    return this._preferredLocaleCodes;
+  }
+
+
+  /**
+   * initAsync
+   * Call this before doing anything with the localizationSystem to ensure that
+   * the needed files have been loaded
+   * @return {Promise}   A Promise resolved after the files have been loaded
+   */
+  initAsync() {
+    if (this._initPromise) return this._initPromise;
+
+    let filesToFetch = ['languages', 'locales'];
+
+    const scopes = {
+      general: 'locales',
+      tagging: 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/translations'
+    };
+
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+    let fileMap = dataLoaderSystem.fileMap;
+    for (let scope in scopes) {
+      const key = `locales_index_${scope}`;
+      if (!fileMap.has(key)) {
+        fileMap.set(key, scopes[scope] + '/index.min.json');
+      }
+      filesToFetch.push(key);
+    }
+
+    return this._initPromise = Promise.all(filesToFetch.map(key => dataLoaderSystem.get(key)))
+      .then(results => {
+        this._supportedLanguages = results[0];
+        this._supportedLocales = results[1];
+
+        let indexes = results.slice(2);
+        let requestedLocales = (this._preferredLocaleCodes || [])
+          .concat(utilDetect().browserLocales)   // List of locales preferred by the browser in priority order.
+          .concat(['en']);   // fallback to English since it's the only guaranteed complete language
+
+        this._currLocaleCodes = this._localesToUseFrom(requestedLocales);
+        this._currLocaleCode = this._currLocaleCodes[0];   // First is highest priority locale; the rest are fallbacks
+
+        let loadStringsPromises = [];
+
+        indexes.forEach((index, i) => {
+//          // Will always return the index for `en` if nothing else
+//          const fullCoverageIndex = this._currLocaleCodes.findIndex(function(locale) {
+//            return index[locale] && index[locale].pct === 1;
+//          });
+//          // We only need to load locales up until we find one with full coverage
+//          // this._currLocaleCodes.slice(0, fullCoverageIndex + 1).forEach(code => {
+// Rapid note:
+// We always need `en` because it contains Rapid strings that are not localized to other languages.
+// This means we can't assume that a language with 100% coverage is an alternative for `en`.
+          this._currLocaleCodes.forEach(code => {
+            const scope = Object.keys(scopes)[i];
+            const directory = Object.values(scopes)[i];
+            if (index[code]) {
+              loadStringsPromises.push(this.loadLocale(code, scope, directory));
+            }
+          });
+        });
+
+        return Promise.all(loadStringsPromises);
+      })
+      .then(() => this._updateForCurrentLocale())
+      .catch(e => console.error(e));  // eslint-disable-line
+  }
+
+
+  /**
+   * loadLocale
+   * Returns a Promise to load the strings for the requested locale
+   * @param  {string}  locale     locale code to load
+   * @param  {string}  scope      one of `general`, `tagging`, etc (not clear whether this is actually used?)
+   * @param  {string}  directory  directory to include in the filename
+   * @return {Promise}
+   */
+  loadLocale(locale, scope, directory) {
+    if (locale.toLowerCase() === 'en-us') {   // US English is the default
+      locale = 'en';
+    }
+
+    if (this._cache[scope] && this._cache[scope][locale]) {    // already loaded
+      return Promise.resolve(locale);
+    }
+
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+    let fileMap = dataLoaderSystem.fileMap;
+    const key = `locale_${scope}_${locale}`;
+    if (!fileMap.has(key)) {
+      fileMap.set(key, `${directory}/${locale}.min.json`);
+    }
+
+    return dataLoaderSystem.get(key)
+      .then(d => {
+        if (!this._cache[scope]) {
+          this._cache[scope] = {};
+        }
+        this._cache[scope][locale] = d[locale];
+        return locale;
+      });
+  }
+
+
+  /**
+   * pluralRule
+   * Returns the plural rule for the given `number` with the given `code`.
+   * see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/PluralRules/select
+   *
+   * @param  {number}   number      number to get the plural rule
+   * @param  {string?}  locale      locale to use (defaults to currentLocale)
+   * @return {string}   One of: `zero`, `one`, `two`, `few`, `many`, `other`
+   */
+  pluralRule(number, locale = this._currLocaleCode) {
+    // modern browsers have this functionality built-in
+    const rules = 'Intl' in window && Intl.PluralRules && new Intl.PluralRules(locale);
+    if (rules) {
+      return rules.select(number);
+    }
+    // fallback to basic one/other, as in English
+    return (number === 1) ? 'one' : 'other';
+  }
+
+
+  /**
+   * _getString
+   * Try to find that string in `locale` or the current `this._currLocaleCode` matching
+   * the given `stringID`. If no string can be found in the requested locale,
+   * we'll recurse through all the `this._currLocaleCodes` until one is found.
+   *
+   * @param  {string}   origStringID   string identifier
+   * @param  {object?}  replacements   token replacements and default string
+   * @param  {string?}  locale         locale to use (defaults to currentLocale)
+   * @return {object?}  result containing the localized string and chosen locale
+   */
+  _getString(origStringID, replacements, locale) {
+    let stringID = origStringID.trim();
+    let scope = 'general';
+
+    if (stringID[0] === '_') {
+      const split = stringID.split('.');
+      scope = split[0].slice(1);
+      stringID = split.slice(1).join('.');
+    }
+
+    locale = locale || this._currLocaleCode;
+
+    let path = stringID
+      .split('.')
+      .map(s => s.replace(/<TX_DOT>/g, '.'))
+      .reverse();
+
+    let stringsKey = locale;
+    // US English is the default
+    if (stringsKey.toLowerCase() === 'en-us') {
+      stringsKey = 'en';
+    }
+    let result = this._cache[scope] && this._cache[scope][stringsKey];
+
+    while (result !== undefined && path.length) {
+      result = result[path.pop()];
+    }
+
+    if (result !== undefined) {
+      if (replacements) {
+        if (typeof result === 'object' && Object.keys(result).length) {
+          // If plural forms are provided, dig one level deeper based on the
+          // first numeric token replacement provided.
+          const number = Object.values(replacements).find(val => (typeof val === 'number'));
+          if (number !== undefined) {
+            const rule = this.pluralRule(number, locale);
+            if (result[rule]) {
+              result = result[rule];
+            } else {
+              // We're pretty sure this should be a plural but no string
+              // could be found for the given rule. Just pick the first
+              // string and hope it makes sense.
+              result = Object.values(result)[0];
+            }
+          }
+        }
+
+        if (typeof result === 'string') {
+          for (let key in replacements) {
+            let value = replacements[key];
+            if (typeof value === 'number') {
+              if (value.toLocaleString) {
+                // format numbers for the locale
+                value = value.toLocaleString(locale, {
+                  style: 'decimal',
+                  useGrouping: true,
+                  minimumFractionDigits: 0
+                });
+              } else {
+                value = value.toString();
+              }
+            }
+            const token = `{${key}}`;
+            const regex = new RegExp(token, 'g');
+            result = result.replace(regex, value);
+          }
+        }
+      }
+      if (typeof result === 'string') {  // found a localized string!
+        return { text: result, locale: locale };
+      }
+    }
+    // no localized string found...
+
+    // attempt to fallback to a lower-priority language
+    let index = this._currLocaleCodes.indexOf(locale);
+    if (index >= 0 && index < this._currLocaleCodes.length - 1) {
+      const fallback = this._currLocaleCodes[index + 1];
+      return this._getString(origStringID, replacements, fallback);
+    }
+
+    // Fallback to a default value if one is specified in `replacements`
+    if (replacements && 'default' in replacements) {
+      return { text: replacements.default, locale: null };
+    }
+
+    const missing = `Missing ${locale} translation: ${origStringID}`;
+    if (typeof console !== 'undefined') console.error(missing);  // eslint-disable-line
+
+    return { text: missing, locale: 'en' };
+  }
+
+
+  /**
+   * hasTextForStringID
+   * Returns true if the given string id will return a string
+   *
+   * @param  {string}   stringID      string identifier
+   * @return {boolean}  true if the given string id will return a string
+   */
+  hasTextForStringID(stringID) {
+    return !!this._getString(stringID, { default: 'nothing found'}).locale;
+  }
+
+
+  /**
+   * t
+   * Returns only the localized text, discarding the locale info
+   * @param  {string}   stringID      string identifier
+   * @param  {object?}  replacements  token replacements and default string
+   * @param  {string?}  locale        locale to use (defaults to currentLocale)
+   * @return {string?}  the localized string
+   */
+  t(stringID, replacements, locale) {
+    return this._getString(stringID, replacements, locale).text;
+  }
+
+
+  /**
+   * t.html
+   * Returns the localized text wrapped in an HTML span element encoding the locale info
+   * @param  {string}   stringID      string identifier
+   * @param  {object?}  replacements  token replacements and default string
+   * @param  {string?}  locale        locale to use (defaults to currentLocale)
+   * @return {string}   localized string wrapped in a HTML span, or empty string ''
+   */
+  tHtml(stringID, replacements, locale) {
+    const info = this._getString(stringID, replacements, locale);
+    // text may be empty or undefined depending on `replacements.default`
+    return info.text ? this.htmlForLocalizedText(info.text, info.locale) : '';
+  }
+
+
+  /**
+   * t.append
+   * Safer version of t.html that instead uses a function that appends the localized text to the given d3 selection
+   * @param  {string}   stringID      string identifier
+   * @param  {object?}  replacements  token replacements and default string
+   * @param  {string?}  locale        locale to use (defaults to currentLocale)
+   * @return {Function} Function that accepts a d3 selection and appends the localized text
+   */
+  tAppend(stringID, replacements, locale) {
+    const ret = function(selection) {
+      const info = this._getString(stringID, replacements, locale);
+      return selection.append('span')
+        .attr('class', 'localized-text')
+        .attr('lang', info.locale || 'und')
+        .text((replacements?.prefix || '') + info.text + (replacements?.suffix || ''));
+    };
+    ret.stringID = stringID;
+    return ret;
+  }
+
+
+  /**
+   * htmlForLocalizedText
+   * Just returns the given text wrapped in an HTML span element encoding the locale
+   * @param  {string}   text          the text content for the span
+   * @param  {string?}  localeCode    the locale code for the span
+   * @return {string}   text wrapped in a HTML span
+   */
+  htmlForLocalizedText(text, localeCode) {
+    return `<span class="localized-text" lang="${localeCode || 'unknown'}">${text}</span>`;
+  }
+
+
+  /**
+   * languageName
+   * Returns a display-ready string for a given language code
+   * @param  {string}   code          the language code (e.g. 'de')
+   * @param  {object?}  options       see below
+   * @return {string}   the language string to display (e.g. "Deutsch (de)")
+   */
+  languageName(code, options) {
+    if (this._languageNames[code]) {     // name in locale language
+      // e.g. "German"
+      return this._languageNames[code];
+    }
+
+    // sometimes we only want the local name
+    if (options && options.localOnly) return null;
+
+    const langInfo = this._supportedLanguages[code];
+    if (langInfo) {
+      if (langInfo.nativeName) {  // name in native language
+        // e.g. "Deutsch (de)"
+        return this.t('translate.language_and_code', { language: langInfo.nativeName, code: code });
+
+      } else if (langInfo.base && langInfo.script) {
+        const base = langInfo.base;   // the code of the language this is based on
+
+        if (this._languageNames[base]) {   // base language name in locale language
+          const scriptCode = langInfo.script;
+          const script = this._scriptNames[scriptCode] || scriptCode;
+          // e.g. "Serbian (Cyrillic)"
+          return this.t('translate.language_and_code', { language: this._languageNames[base], code: script });
+
+        } else if (this._supportedLanguages[base] && this._supportedLanguages[base].nativeName) {
+          // e.g. "српски (sr-Cyrl)"
+          return this.t('translate.language_and_code', { language: this._supportedLanguages[base].nativeName, code: code });
+        }
+      }
+    }
+    return code;  // if not found, use the code
+  }
+
+
+  /**
+   * displayName
+   * Display a name for an Entity
+   * @param {boolean} hideNetwork If true, the `network` tag will not be used in the name to prevent
+   *                              it being shown twice (see PR #8707#discussion_r712658175)
+   */
+  displayName(entity, hideNetwork) {
+    const code = this._currLanguageCode.toLowerCase();
+    let name = entity.tags[`name:${code}`] ?? entity.tags.name ?? '';
+
+    let tags = {
+      name,
+      direction: entity.tags.direction,
+      from: entity.tags.from,
+      network: hideNetwork ? undefined : (entity.tags.cycle_network || entity.tags.network),
+      ref: entity.tags.ref,
+      to: entity.tags.to,
+      via: entity.tags.via
+    };
+
+    // for routes, prefer `network+ref+name` or `ref+name` over `name`
+    if (name && tags.ref && entity.tags.route) {
+      return tags.network
+        ? this.t('inspector.display_name.network_ref_name', tags)
+        : this.t('inspector.display_name.ref_name', tags);
+    }
+    if (name) return name;
+
+    let keyComponents = [];
+    if (tags.network) {
+      keyComponents.push('network');
+    }
+    if (tags.ref) {
+      keyComponents.push('ref');
+    }
+
+    // Routes may need more disambiguation based on direction or destination
+    if (entity.tags.route) {
+      if (tags.direction) {
+        keyComponents.push('direction');
+      } else if (tags.from && tags.to) {
+        keyComponents.push('from');
+        keyComponents.push('to');
+        if (tags.via) {
+          keyComponents.push('via');
+        }
+      }
+    }
+
+    if (keyComponents.length) {
+      name = this.t('inspector.display_name.' + keyComponents.join('_'), tags);
+    }
+
+  // bhousel 3/28 - no labels for addresses for now
+  //    // if there's still no name found, try addr:housename
+  //    if (!name && entity.tags['addr:housename']) {
+  //        name = entity.tags['addr:housename'];
+  //    }
+  //
+  //    // as a last resort, use the street address as a name
+  //    if (!name && entity.tags['addr:housenumber'] && entity.tags['addr:street']) {
+  //        name = entity.tags['addr:housenumber'] + ' ' + entity.tags['addr:street'];
+  //    }
+
+    return name;
+  }
+
+
+  // This is like `displayName`, but more useful for POI display names
+  displayPOIName(entity) {
+    const code = this._currLanguageCode.toLowerCase();
+    const tags = entity.tags;
+    return tags[`name:${code}`] ?? tags.name ?? tags[`brand:${code}`] ?? tags.brand;
+  }
+
+
+  displayType(id) {
+    return {
+      n: this.t('inspector.node'),
+      w: this.t('inspector.way'),
+      r: this.t('inspector.relation')
+    }[id.charAt(0)];
+  }
+
+
+  // displayLabel
+  // Returns a string suitable for display
+  // By default returns something like name/ref, fallback to preset type, fallback to OSM type
+  //   "Main Street" or "Tertiary Road"
+  // If `verbose=true`, include both preset name and feature name.
+  //   "Tertiary Road Main Street"
+  //
+  displayLabel(entity, graphOrGeometry, verbose) {
+    const displayName = this.displayName(entity);
+    const presetSystem = this.context.presetSystem();
+    const preset = typeof graphOrGeometry === 'string' ?
+      presetSystem.matchTags(entity.tags, graphOrGeometry) :
+      presetSystem.match(entity, graphOrGeometry);
+    const presetName = preset && (preset.suggestion ? preset.subtitle() : preset.name());
+
+    let result;
+    if (verbose) {
+      result = [presetName, displayName].filter(Boolean).join(' ');
+    } else {
+      result = displayName || presetName;
+    }
+
+    // Fallback to the OSM type (node/way/relation)
+    return result || this.displayType(entity.id);
+  }
+
+
+  /**
+   * Returns a localized representation of the given length measurement.
+   * @param  {Number}  meters
+   * @param  {Boolean} isImperial true for U.S. customary units; false for metric
+   * @return {String}  Text to display
+   */
+  displayLength(meters, isImperial) {
+    const locale = this._currLocaleCode;
+    let n = meters * (isImperial ? 3.28084 : 1);
+    let unit;
+
+    if (isImperial) {
+      if (n >= 5280) {
+        n /= 5280;
+        unit = 'miles';
+      } else {
+        unit = 'feet';
+      }
+    } else {
+      if (n >= 1000) {
+        n /= 1000;
+        unit = 'kilometers';
+      } else {
+        unit = 'meters';
+      }
+    }
+
+    return this.t(`units.${unit}`, {
+      quantity: n.toLocaleString(locale, { maximumSignificantDigits: 4 })
+    });
+  }
+
+
+  /**
+   * Returns a localized representation of the given area measurement.
+   *
+   * @param {Number}  meters2 area in square meters
+   * @param {Boolean} isImperial true for U.S. customary units; false for metric
+   * @return {String}  Text to display
+   */
+  displayArea(meters2, isImperial) {
+    const locale = this._currLocaleCode;
+    let n = meters2 * (isImperial ? 10.7639111056 : 1);
+    let n1, n2, unit1, unit2;
+
+    if (isImperial) {
+      if (n >= 6969600) {  // > 0.25mi² show mi²
+        n1 = n / 27878400;
+        unit1 = 'square_miles';
+      } else {
+        n1 = n;
+        unit1 = 'square_feet';
+      }
+
+      if (n > 4356 && n < 43560000) {  // 0.1 - 1000 acres
+        n2 = n / 43560;
+        unit2 = 'acres';
+      }
+
+    } else {
+      if (n >= 250000) {  // > 0.25km² show km²
+        n1 = n / 1000000;
+        unit1 = 'square_kilometers';
+      } else {
+        n1 = n;
+        unit1 = 'square_meters';
+      }
+
+      if (n > 1000 && n < 10000000) {   // 0.1 - 1000 hectares
+        n2 = n / 10000;
+        unit2 = 'hectares';
+      }
+    }
+
+    const area = this.t(`units.${unit1}`, {
+      quantity: n1.toLocaleString(locale, { maximumSignificantDigits: 4 })
+    });
+
+    if (unit2) {
+      const area2 = this.t(`units.${unit2}`, {
+        quantity: n2.toLocaleString(locale, { maximumSignificantDigits: 2 })
+      });
+
+      return this.t('units.area_pair', { area1: area, area2: area2 });
+    } else {
+      return area;
+    }
+  }
+
+
+  /**
+   * Returns given coordinate pair in degree-minute-second format.
+   * @param {Array<Number>} coord longitude and latitude
+   * @return {String}  Text to display
+   */
+  dmsCoordinatePair(coord) {
+    return this.t('units.coordinate_pair', {
+      latitude: this._displayCoordinate(clamp(coord[1], -90, 90), 'north', 'south'),
+      longitude: this._displayCoordinate(wrap(coord[0], -180, 180), 'east', 'west')
+    });
+  }
+
+
+  /**
+   * Returns the given coordinate pair in decimal format.
+   * note: unlocalized to avoid comma ambiguity - see iD#4765
+   * @param {Array<Number>} coord longitude and latitude
+   * @return {String}  Text to display
+   */
+  decimalCoordinatePair(coord) {
+    const OSM_PRECISION = 7;
+    return this.t('units.coordinate_pair', {
+      latitude: clamp(coord[1], -90, 90).toFixed(OSM_PRECISION),
+      longitude: wrap(coord[0], -180, 180).toFixed(OSM_PRECISION)
+    });
+  }
+
+
+  _displayCoordinate(deg, pos, neg) {
+    const locale = this._currLocaleCode;
+    const min = (Math.abs(deg) - Math.floor(Math.abs(deg))) * 60;
+    const sec = (min - Math.floor(min)) * 60;
+    const displayDegrees = this.t('units.arcdegrees', {
+      quantity: Math.floor(Math.abs(deg)).toLocaleString(locale)
+    });
+
+    let displayCoordinate;
+
+    if (Math.floor(sec) > 0) {
+      displayCoordinate = displayDegrees +
+        this.t('units.arcminutes', { quantity: Math.floor(min).toLocaleString(locale) }) +
+        this.t('units.arcseconds', { quantity: Math.round(sec).toLocaleString(locale) });
+    } else if (Math.floor(min) > 0) {
+      displayCoordinate = displayDegrees +
+        this.t('units.arcminutes', { quantity: Math.round(min).toLocaleString(locale) });
+    } else {
+      displayCoordinate =
+        this.t('units.arcdegrees', { quantity: Math.round(Math.abs(deg)).toLocaleString(locale) });
+    }
+
+    if (deg === 0) {
+      return displayCoordinate;
+    } else {
+      return this.t('units.coordinate', {
+        coordinate: displayCoordinate,
+        direction: this.t('units.' + (deg > 0 ? pos : neg))
+      });
+    }
+  }
+
+
+  /**
+   * _localesToUseFrom
+   * Returns the locales from `requestedLocales` that are actually supported
+   * @param  {Array}  requestedLocales  Array or Set of locale codes to consider
+   * @return {Array}  The locales that we can actually support
+   */
+  _localesToUseFrom(requestedLocales) {
+    let toUse = new Set();
+    requestedLocales.forEach(locale => {
+      if (this._supportedLocales[locale]) {
+        toUse.add(locale);
+      }
+      // For a locale with a culture code ('es-ES'), include fallback to the base locale ('es')
+      if (locale.includes('-')) {
+        const base = locale.split('-')[0];
+        if (this._supportedLocales[base]) {
+          toUse.add(base);
+        }
+      }
+    });
+    return Array.from(toUse);
+  }
+
+
+  /**
+   * _updateForCurrentLocale
+   * Called after all locale files have been fetched to finalize the current state
+   */
+  _updateForCurrentLocale() {
+    if (!this._currLocaleCode) return;
+
+    const [language, culture] = this._currLocaleCode.toLowerCase().split('-', 2);
+    this._currLanguageCode = language;
+    this._currIsMetric = (culture !== 'us');
+
+    // Allow hash parameter to override the locale 'rtl' setting - useful for testing
+    const hash = utilStringQs(window.location.hash);
+    if (hash.rtl === 'true') {
+      this._currTextDirection = 'rtl';
+    } else if (hash.rtl === 'false') {
+      this._currTextDirection = 'ltr';
+    } else {
+      const supported = this._supportedLocales[this._currLocaleCode] || this._supportedLocales[this._currLanguageCode];
+      this._currTextDirection = supported && supported.rtl ? 'rtl' : 'ltr';
+    }
+
+    // Language and Script names will appear in the local language
+    let locale = this._currLocaleCode;
+    if (locale.toLowerCase() === 'en-us') {
+      locale = 'en';
+    }
+    this._languageNames = this._cache.general[locale].languageNames;
+    this._scriptNames = this._cache.general[locale].scriptNames;
+  }
+
+}
diff --git a/modules/core/LocationManager.js b/modules/core/LocationSystem.js
similarity index 92%
rename from modules/core/LocationManager.js
rename to modules/core/LocationSystem.js
index 21065ba380..7dec099c91 100644
--- a/modules/core/LocationManager.js
+++ b/modules/core/LocationSystem.js
@@ -1,13 +1,14 @@
-import { EventEmitter } from '@pixi/utils';
 import LocationConflation from '@rapideditor/location-conflation';
 import whichPolygon from 'which-polygon';
 import calcArea from '@mapbox/geojson-area';
 
-const _loco = new LocationConflation();    // instance of a location-conflation resolver
+import { AbstractSystem } from './AbstractSystem';
+
+const LOCO = new LocationConflation();    // shared instance of a location-conflation resolver
 
 
 /**
- * `LocationManager` maintains an internal index of all the boundaries/geofences.
+ * `LocationSystem` maintains an internal index of all the boundaries/geofences.
  * It's used by presets, community index, background imagery, to know where in the world these things are valid.
  * These geofences should be defined by `locationSet` objects:
  *
@@ -23,7 +24,7 @@ const _loco = new LocationConflation();    // instance of a location-conflation
  * Events available:
  *   `locationchange`  Fires on any change in the location index
  */
-export class LocationManager extends EventEmitter {
+export class LocationSystem extends AbstractSystem {
 
 /**
  * @typedef {Object} LocationSet
@@ -32,9 +33,11 @@ export class LocationManager extends EventEmitter {
 
   /**
    * @constructor
+   * @param  context  Global shared application context
    */
-  constructor() {
-    super();
+  constructor(context) {
+    super(context);
+    this.id = 'locations';
 
     this._wp = null;                        // A which-polygon index
     this._resolved = new Map();             // Map (id -> GeoJSON feature)
@@ -93,7 +96,7 @@ export class LocationManager extends EventEmitter {
 
       // Validate the locationSet only
       // Resolve the include/excludes
-      const locationSetID = _loco.validateLocationSet(locationSet).id;
+      const locationSetID = LOCO.validateLocationSet(locationSet).id;
       obj.locationSetID = locationSetID;
       if (this._knownLocationSets.has(locationSetID)) return;   // seen one like this before
 
@@ -101,11 +104,11 @@ export class LocationManager extends EventEmitter {
 
       // Resolve and index the 'includes'
       (locationSet.include || []).forEach(location => {
-        const locationID = _loco.validateLocation(location).id;
+        const locationID = LOCO.validateLocation(location).id;
         let geojson = this._resolved.get(locationID);
 
         if (!geojson) {    // first time seeing a location like this
-          geojson = _loco.resolveLocation(location).feature;     // resolve to GeoJSON
+          geojson = LOCO.resolveLocation(location).feature;     // resolve to GeoJSON
           this._resolved.set(locationID, geojson);
         }
         area += geojson.properties.area;
@@ -120,11 +123,11 @@ export class LocationManager extends EventEmitter {
 
       // Resolve and index the 'excludes'
       (locationSet.exclude || []).forEach(location => {
-        const locationID = _loco.validateLocation(location).id;
+        const locationID = LOCO.validateLocation(location).id;
         let geojson = this._resolved.get(locationID);
 
         if (!geojson) {    // first time seeing a location like this
-          geojson = _loco.resolveLocation(location).feature;     // resolve to GeoJSON
+          geojson = LOCO.resolveLocation(location).feature;     // resolve to GeoJSON
           this._resolved.set(locationID, geojson);
         }
         area -= geojson.properties.area;
@@ -161,7 +164,7 @@ export class LocationManager extends EventEmitter {
     if (this._resolved.has(obj.locationSetID)) return;  // work was done already
 
     try {
-      const result = _loco.resolveLocationSet(obj.locationSet);
+      const result = LOCO.resolveLocationSet(obj.locationSet);
       const locationSetID = result.id;
       obj.locationSetID = locationSetID;
 
@@ -231,7 +234,7 @@ export class LocationManager extends EventEmitter {
         props.area = Number(area.toFixed(2));
       }
 
-      _loco._cache[id] = feature;   // insert directly into LocationConflations internal cache
+      LOCO._cache[id] = feature;   // insert directly into LocationConflations internal cache
     });
   }
 
@@ -274,7 +277,7 @@ export class LocationManager extends EventEmitter {
   locationSetID(locationSet) {
     let locationSetID;
     try {
-      locationSetID = _loco.validateLocationSet(locationSet).id;
+      locationSetID = LOCO.validateLocationSet(locationSet).id;
     } catch (err) {
       locationSetID = '+[Q2]';  // the world
     }
@@ -378,7 +381,7 @@ export class LocationManager extends EventEmitter {
 
   // Direct access to the location-conflation resolver
   loco() {
-    return _loco;
+    return LOCO;
   }
 
   // Direct access to the "blocks" which-polygon index
@@ -386,8 +389,3 @@ export class LocationManager extends EventEmitter {
     return this._wpblocks;
   }
 }
-
-
-const _sharedLocationManager = new LocationManager();
-export { _sharedLocationManager as locationManager };
-
diff --git a/modules/3drenderer/Map.js b/modules/core/Map3dSystem.js
similarity index 77%
rename from modules/3drenderer/Map.js
rename to modules/core/Map3dSystem.js
index 512865db8d..5c690fccce 100644
--- a/modules/3drenderer/Map.js
+++ b/modules/core/Map3dSystem.js
@@ -1,76 +1,93 @@
-import { Map as mapLibreMap } from 'maplibre-gl';
+import { Map as MapLibre } from 'maplibre-gl';
+
+import { AbstractSystem } from './AbstractSystem';
 
 const SELECTION_COLOR = '#01d4fa';
 
-export class Map {
-  constructor(id, context) {
-    this.building3dlayerSpec = this.get3DBuildingLayerSpec(
-      '3D Buildings',
-      'osmbuildings'
-    );
 
+/**
+ * `Map3dSystem` wraps an instance of MapLibre viewer
+ * and maintains the map state and style specification.
+ */
+export class Map3dSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  `context`   Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'map3d';
+    this.containerID = '3d-buildings';
+
+    this.building3dlayerSpec = this.get3dBuildingLayerSpec('3D Buildings', 'osmbuildings');
     this.roadStrokelayerSpec = this.getRoadStrokeLayerSpec('Roads', 'osmroads');
     this.roadCasinglayerSpec = this.getRoadCasingLayerSpec('Roads', 'osmroads');
-    this.roadSelectedlayerSpec = this.getRoadSelectedLayerSpec(
-      'Roads',
-      'osmroads'
-    );
+    this.roadSelectedlayerSpec = this.getRoadSelectedLayerSpec('Roads', 'osmroads');
     this.areaLayerSpec = this.getAreaLayerSpec('Areas', 'osmareas');
+    this.maplibre = null;
+  }
+
 
-    this.map = new mapLibreMap({
-      container: id,
+  /**
+   * init
+   * Called one time after all objects have been instantiated.
+   */
+  init() {
+    this.maplibre = new MapLibre({
+      container: this.containerID,
       pitch: 30,
-      style:
-        'https://api.maptiler.com/maps/streets-v2/style.json?key=5pbVUaiVhKNAxkLf1kts',
+      style: 'https://api.maptiler.com/maps/streets-v2/style.json?key=5pbVUaiVhKNAxkLf1kts'
     });
 
-    this.map.on('load', () => {
-      this.map.setLight({
+    this.maplibre.on('load', () => {
+      this.maplibre.setLight({
         anchor: 'viewport',
         color: '#ff00ff',
         position: [1, 200, 30],
         intensity: 0.3,
       });
 
-      this.map.jumpTo({
-        zoom: context.map().zoom() - 3,
-        center: context.map().extent().center(),
+      this.maplibre.jumpTo({
+        zoom: this.context.mapSystem().zoom() - 3,
+        center: this.context.mapSystem().extent().center(),
       });
 
-      this.map.addSource('osmareas', {
+      this.maplibre.addSource('osmareas', {
         type: 'geojson',
         data: { type: 'FeatureCollection', features: [] },
       });
 
       // Layers need to be added in 'painter's algorithm' order, so the stuff on the bottom goes first!
-      this.map.addLayer(this.areaLayerSpec);
+      this.maplibre.addLayer(this.areaLayerSpec);
 
-      this.map.addSource('osmroads', {
+      this.maplibre.addSource('osmroads', {
         type: 'geojson',
         data: { type: 'FeatureCollection', features: [] },
       });
 
-      this.map.addLayer(this.roadSelectedlayerSpec);
-      this.map.addLayer(this.roadCasinglayerSpec);
-      this.map.addLayer(this.roadStrokelayerSpec);
+      this.maplibre.addLayer(this.roadSelectedlayerSpec);
+      this.maplibre.addLayer(this.roadCasinglayerSpec);
+      this.maplibre.addLayer(this.roadStrokelayerSpec);
 
-      this.map.addSource('osmbuildings', {
+      this.maplibre.addSource('osmbuildings', {
         type: 'geojson',
         data: { type: 'FeatureCollection', features: [] },
       });
-      this.map.addLayer(this.building3dlayerSpec);
+      this.maplibre.addLayer(this.building3dlayerSpec);
 
       //Turn off the existing 3d building data and road data that ships with the vector tile-
       // we don't want to have that data competing with the custom data layer we want to render.
       // Drawing both is bad!
-      this.map.getLayer('building-3d').visibility = 'none';
-      this.map.getLayer('road_network').visibility = 'none';
-      this.map.getLayer('road_network-casing').visibility = 'none';
+      this.maplibre.getLayer('building-3d').visibility = 'none';
+      this.maplibre.getLayer('road_network').visibility = 'none';
+      this.maplibre.getLayer('road_network-casing').visibility = 'none';
     });
   }
 
+
   /**
-   * get3DBuildingLayerSpec
+   * get3dBuildingLayerSpec
    * Returns a maplibre layer style specification that appropriately styles 3D buildings
    * using data-driven styling for selected features. Features with no height data are drawn as flat
    * polygons.
@@ -78,7 +95,7 @@ export class Map {
    * @param {string} source the source geojson data that to be rendered
    * @returns
    */
-  get3DBuildingLayerSpec(id, source) {
+  get3dBuildingLayerSpec(id, source) {
     return {
       id: id,
       type: 'fill-extrusion',
@@ -119,7 +136,7 @@ export class Map {
   }
 
   /**
-   * get3DBuildingLayerSpec
+   * get3dBuildingLayerSpec
    * Returns a maplibre layer style specification that appropriately styles 3D buildings
    * using data-driven styling for selected features. Features with no height data are drawn as flat
    * polygons.
diff --git a/modules/renderer/RendererMap.js b/modules/core/MapSystem.js
similarity index 83%
rename from modules/renderer/RendererMap.js
rename to modules/core/MapSystem.js
index fc4af77f63..cedc50d510 100644
--- a/modules/renderer/RendererMap.js
+++ b/modules/core/MapSystem.js
@@ -1,11 +1,9 @@
-import { EventEmitter } from '@pixi/utils';
 import { select as d3_select } from 'd3-selection';
-
 import { Projection, Extent, geoMetersToLon, geoScaleToZoom, geoZoomToScale, vecAdd, vecScale, vecSubtract } from '@rapid-sdk/math';
 
+import { AbstractSystem } from './AbstractSystem';
 import { PixiRenderer } from '../pixi/PixiRenderer';
-
-import { prefs } from '../core/preferences';
+import { uiCmd } from '../ui/cmd.js';
 import { utilTotalExtent } from '../util/util';
 import { utilGetDimensions } from '../util/dimensions';
 
@@ -22,7 +20,7 @@ function clamp(num, min, max) {
 
 
 /**
- * `RendererMap` maintains the map state
+ * `MapSystem` maintains the map state
  * and provides an interface for manipulating the map view.
  *
  * Properties available:
@@ -41,15 +39,15 @@ function clamp(num, min, max) {
  *                 ('move' is mostly for when you want to update some content that floats over the map)
  *   `mapchange`  Fires on any change in map display options (wireframe/areafill, highlightedits)
  */
-export class RendererMap extends EventEmitter {
+export class MapSystem extends AbstractSystem {
 
   /**
    * @constructor
    * @param  `context`   Global shared application context
    */
   constructor(context) {
-    super();
-    this.context = context;
+    super(context);
+    this.id = 'map';
 
     this.supersurface = d3_select(null);  // parent `div` temporary zoom/pan transform
     this.surface = d3_select(null);       // sibling `canvas`
@@ -58,9 +56,9 @@ export class RendererMap extends EventEmitter {
 
     // display options
     this.areaFillOptions = ['wireframe', 'partial', 'full'];
-    this._highlightEdits = false;                                   // whether to style edited features differently
-    this._currFillMode = prefs('area-fill') || 'partial';           // the current fill mode
-    this._toggleFillMode = prefs('area-fill-toggle') || 'partial';  // the previous *non-wireframe* fill mode
+    this._highlightEdits = false;      // whether to style edited features differently
+    this._currFillMode = 'partial';    // the current fill mode
+    this._toggleFillMode = 'partial';  // the previous *non-wireframe* fill mode
 
     this._renderer = null;
     this._dimensions = [1, 1];
@@ -80,13 +78,46 @@ export class RendererMap extends EventEmitter {
    * Called one time after all objects have been instantiated.
    */
   init() {
-    /* noop */
+    const context = this.context;
+    const prefs = context.storageSystem();
+    this._currFillMode = prefs.getItem('area-fill') || 'partial';           // the current fill mode
+    this._toggleFillMode = prefs.getItem('area-fill-toggle') || 'partial';  // the previous *non-wireframe* fill mode
+
+    const l10n = context.localizationSystem();
+    l10n.initAsync()
+      .then(() => {
+        const wireframeKey = l10n.t('area_fill.wireframe.key');
+        const highlightEditsKey = l10n.t('map_data.highlight_edits.key');
+
+        context.keybinding()
+          .on(wireframeKey, e => {
+            e.preventDefault();
+            e.stopPropagation();
+            this.wireframeMode = !this.wireframeMode;
+          })
+          .on(uiCmd('⌥' + wireframeKey), e => {
+            e.preventDefault();
+            e.stopPropagation();
+
+            // Don't allow layer changes while drawing - iD#6584
+            const mode = context.mode();
+            if (mode && /^draw/.test(mode.id)) return;
+
+            this.scene.toggleLayers('osm');
+            context.enter('browse');
+          })
+          .on(highlightEditsKey, e => {
+            e.preventDefault();
+            this.highlightEdits = !this.highlightEdits;
+          });
+      });
   }
 
 
+
   /**
    * render
-   * @param  `selection`  A d3-selection to a `div` that the panel should render itself into
+   * @param  `selection`  A d3-selection to a `div` that the map should render itself into
    */
   render(selection) {
     const context = this.context;
@@ -125,32 +156,32 @@ export class RendererMap extends EventEmitter {
       .append('div')
       .attr('class', 'overlay');
 
-    this._renderer = new PixiRenderer(context, this.supersurface, this.surface, this.overlay);
+    if (!this._renderer) {
+      this._renderer = new PixiRenderer(context, this.supersurface, this.surface, this.overlay);
 
-    // Forward the 'move' and 'draw' events from PixiRenderer
-    this._renderer
-      .on('move', () => this.emit('move'))
-      .on('draw', () => {
-        this._updateHash();
-        this.emit('draw', { full: true });  // pass {full: true} for legacy receivers
-      });
+      // Forward the 'move' and 'draw' events from PixiRenderer
+      this._renderer
+        .on('move', () => this.emit('move'))
+        .on('draw', () => {
+          this._updateHash();
+          this.emit('draw', { full: true });  // pass {full: true} for legacy receivers
+        });
+    }
 
     this.dimensions = utilGetDimensions(selection);
 
     const scene = this._renderer.scene;
-    const thiz = this;
 
     // Setup events that cause the map to redraw...
-
-    function _didUndoOrRedo(targetTransform) {
+    const _didUndoOrRedo = (targetTransform) => {
       const mode = context.mode().id;
       if (mode !== 'browse' && mode !== 'select') return;
       if (targetTransform) {
-        thiz.transformEase(targetTransform);
+        this.transformEase(targetTransform);
       }
-    }
+    };
 
-    context.history()
+    context.editSystem()
       .on('merge', entityIDs => {
         if (entityIDs) {
           scene.dirtyData('osm', entityIDs);
@@ -161,11 +192,10 @@ export class RendererMap extends EventEmitter {
         if (difference) {
           // todo - maybe only do this if difference.didChange.geometry?
           const complete = difference.complete();
-          const features = context.features();
           for (const entity of complete.values()) {
             if (entity) {      // may be undefined if entity was deleted
               entity.touch();  // bump version in place
-              features.clearEntity(entity);  // clear feature filter cache
+              context.filterSystem().clearEntity(entity);  // clear feature filter cache
             }
           }
           // touching entity will bump .v and the renderer should pick it up as dirty?
@@ -174,27 +204,25 @@ export class RendererMap extends EventEmitter {
         }
         this.immediateRedraw();
       })
-      .on('undone.map', (stack, fromStack) => _didUndoOrRedo(fromStack.transform))
-      .on('redone.map', (stack) => _didUndoOrRedo(stack.transform));
+      .on('undone', (stack, fromStack) => _didUndoOrRedo(fromStack.transform))
+      .on('redone', (stack) => _didUndoOrRedo(stack.transform));
 
-    context.features().on('change', () => {
-      scene.dirtyLayers('osm');
-      this.immediateRedraw();
-    });
-
-    context.imagery().on('imagerychange', this.immediateRedraw);
-    context.photos().on('photochange', this.immediateRedraw);
-    context.urlhash().on('hashchange', this._hashchange);
+    context.filterSystem()
+      .on('filterchange', () => {
+        scene.dirtyLayers('osm');
+        this.immediateRedraw();
+      });
 
+    context.urlHashSystem().on('hashchange', this._hashchange);
 
-    const osm = context.connection();
+    const osm = context.services.get('osm');
     if (osm) {
-      osm.on('change', this.immediateRedraw);
+      osm.on('authchange', this.immediateRedraw);
     }
 
     scene
       .on('layerchange', () => {
-        context.imagery().updateImagery();
+        context.imagerySystem().updateImagery();
         this.immediateRedraw();
     });
   }
@@ -249,26 +277,30 @@ export class RendererMap extends EventEmitter {
     if (Math.abs(rot) > EPSILON) {
       v += `/${rotStr}`;
     }
-    this.context.urlhash().setParam('map', v);
+    this.context.urlHashSystem().setParam('map', v);
   }
 
 
   /**
    * deferredRedraw
    * Tell the renderer to redraw soon
+   * This is ideal for most situations where data is streaming in, and we can
+   * allow the changes to batch up over several animation frames.
    */
   deferredRedraw() {
-    if (!this.redrawEnabled) return;
+    if (!this._renderer || !this.redrawEnabled) return;
     this._renderer.deferredRender();
   }
 
 
   /**
-   * deferredRedraw
-   * Tell the renderer to redraw as soon as possible
+   * immediateRedraw
+   * Tell the renderer to redraw as soon as possible.
+   * This is ideal for interactive situations where the user did a thing and we want
+   * the map to update on one of the next few animation frames to show their change.
    */
   immediateRedraw() {
-    if (!this.redrawEnabled) return;
+    if (!this._renderer || !this.redrawEnabled) return;
     this._renderer.render();
   }
 
@@ -299,6 +331,16 @@ export class RendererMap extends EventEmitter {
   }
 
 
+  /**
+   * centerLoc
+   * Returns the current [lon,lat] location at the center of the viewport
+   * @return  Array [lon,lat] location at the center of the viewport
+   */
+  centerLoc() {
+    return this.context.projection.invert(this.centerPoint());
+  }
+
+
   /**
    * mouse
    * Gets the current [x,y] pixel location of the pointer
@@ -635,16 +677,17 @@ export class RendererMap extends EventEmitter {
     return this._currFillMode;
   }
   set areaFillMode(val) {
+    const prefs = this.context.storageSystem();
     const current = this._currFillMode;
     if (current === val) return;  // no change
 
     if (current !== 'wireframe') {
       this._toggleFillMode = current;
-      prefs('area-fill-toggle', current);  // remember the previous *non-wireframe* fill mode
+      prefs.setItem('area-fill-toggle', current);  // remember the previous *non-wireframe* fill mode
     }
 
     this._currFillMode = val;
-    prefs('area-fill', val);
+    prefs.setItem('area-fill', val);
 
     this._renderer.scene.dirtyScene();
     this.immediateRedraw();
diff --git a/modules/renderer/RendererPhotos.js b/modules/core/PhotoSystem.js
similarity index 93%
rename from modules/renderer/RendererPhotos.js
rename to modules/core/PhotoSystem.js
index d662a979c9..dcca2e32a2 100644
--- a/modules/renderer/RendererPhotos.js
+++ b/modules/core/PhotoSystem.js
@@ -1,10 +1,8 @@
-import { EventEmitter } from '@pixi/utils';
-
-import { services } from '../services';
+import { AbstractSystem } from './AbstractSystem';
 
 
 /**
- * `RendererPhotos` maintains the state of the photo viewer
+ * `PhotoSystem` maintains the state of the photo viewer
  *
  * Properties available:
  *   `allPhotoTypes`     List of all available photo types ('flat', 'panoramic')
@@ -15,15 +13,15 @@ import { services } from '../services';
  * Events available:
  *   `photochange`       Fires on any change in photo display or filtering options
  */
-export class RendererPhotos extends EventEmitter {
+export class PhotoSystem extends AbstractSystem {
 
   /**
    * @constructor
    * @param  `context`   Global shared application context
    */
   constructor(context) {
-    super();
-    this.context = context;
+    super(context);
+    this.id = 'photos';
 
     this._LAYERIDS = ['streetside', 'mapillary', 'mapillary-map-features', 'mapillary-signs', 'kartaview'];
     this._PHOTOTYPES = ['flat', 'panoramic'];
@@ -51,7 +49,7 @@ export class RendererPhotos extends EventEmitter {
 // for now this init() gets delayed until after ui/init, see context.js
     const context = this.context;
     context.scene().on('layerchange', this._updateHash);
-    context.urlhash().on('hashchange', this._hashchange);
+    context.urlHashSystem().on('hashchange', this._hashchange);
   }
 
 
@@ -109,7 +107,7 @@ export class RendererPhotos extends EventEmitter {
    * Push changes in photo viewer state to the urlhash
    */
   _updateHash() {
-    const urlhash = this.context.urlhash();
+    const urlhash = this.context.urlHashSystem();
     const scene = this.context.scene();
 
     // photo_overlay
@@ -214,8 +212,8 @@ export class RendererPhotos extends EventEmitter {
 scene.clearClass('selected');
 
     if (layerID && photoID) {
-      const service = services[layerID];
-      if (!service || !service.loadViewerAsync) return null;
+      const service = context.services.get(layerID);
+      if (!service) return null;
 
       // If we're selecting a photo then make sure its layer is enabled too.
       scene.enableLayers(layerID);
@@ -224,14 +222,15 @@ scene.clearClass('selected');
 scene.classData(layerID, photoID, 'selected');
 
       // Try to show the viewer with the image selected..
-      service.loadViewerAsync(context)
+      service.loadViewerAsync()
         .then(() => {
-          service.selectImage(context, photoID);
-          service.showViewer(context);
+          service.selectImage(photoID);
+          service.showViewer();
         });
     }
 
     this._updateHash();
+    this.context.immediateRedraw();
     this.emit('photochange');
   }
 
@@ -282,6 +281,7 @@ scene.classData(layerID, photoID, 'selected');
 
     if (didChange) {
       this._updateHash();
+      this.context.immediateRedraw();
       this.emit('photochange');
     }
   }
@@ -304,6 +304,7 @@ scene.classData(layerID, photoID, 'selected');
     }
     this._usernames = val;
     this._updateHash();
+    this.context.immediateRedraw();
     this.emit('photochange');
   }
 
@@ -322,6 +323,7 @@ scene.classData(layerID, photoID, 'selected');
       this._shownPhotoTypes.add(which);
     }
 
+    this.context.immediateRedraw();
     this.emit('photochange');
   }
 
diff --git a/modules/core/PresetSystem.js b/modules/core/PresetSystem.js
new file mode 100644
index 0000000000..4dc68ef1ef
--- /dev/null
+++ b/modules/core/PresetSystem.js
@@ -0,0 +1,533 @@
+import { utilArrayUniq } from '@rapid-sdk/util';
+
+import { AbstractSystem } from './AbstractSystem';
+import { osmNodeGeometriesForTags, osmSetAreaKeys, osmSetPointTags, osmSetVertexTags } from '../osm/tags';
+import { Category, Collection, Field, Preset } from './lib';
+import { uiFields } from '../ui/fields';
+
+const VERBOSE = true;        // warn about v6 preset featues we don't support currently
+const MAXRECENTS = 30;       // how many recents to store in localstorage
+const MAXRECENTS_SHOW = 6;   // how many recents to show on the preset list
+
+
+/**
+ * `PresetSystem` maintains an internal index of all the presets, fields, and categories.
+ */
+export class PresetSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  context  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'presets';
+    this.geometries = ['point', 'vertex', 'line', 'area', 'relation'];
+
+    // Create geometry fallbacks
+    const POINT = new Preset(context, 'point', { name: 'Point', tags: {}, geometry: ['point', 'vertex'], matchScore: 0.1 } );
+    const LINE = new Preset(context, 'line', { name: 'Line', tags: {}, geometry: ['line'], matchScore: 0.1 } );
+    const AREA = new Preset(context, 'area', { name: 'Area', tags: { area: 'yes' }, geometry: ['area'], matchScore: 0.1 } );
+    const RELATION = new Preset(context, 'relation', { name: 'Relation', tags: {}, geometry: ['relation'], matchScore: 0.1 } );
+
+    // Collection of all Presets and Categories
+    this.collection = new Collection(context, [POINT, LINE, AREA, RELATION]);
+
+    // Defaults are the Presets and Categories offered to the user when adding a new feature.
+    // A fallback preset is appended to the list automatically so they dont need to be included here.
+    this._defaults = {
+      point: [],
+      vertex: [],
+      line: [],
+      area: [],
+      relation: []
+    };
+
+    this._presets = { point: POINT, line: LINE, area: AREA, relation: RELATION };
+    this._fields = {};
+    this._categories = {};
+    this._universal = [];
+    this._recentIDs = null;
+
+    // Set of presetIDs that the user can add (if null, all are normally addable)
+    this.addablePresetIDs = null;
+
+    // Index of presets by (geometry, tag key).
+    this._geometryIndex = { point: {}, vertex: {}, line: {}, area: {}, relation: {} };
+    this._initPromise = null;
+  }
+
+
+  /**
+   * initAsync
+   * Called one time after all objects have been instantiated.
+   */
+  initAsync() {
+    if (this._initPromise) return this._initPromise;
+
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+    return this._initPromise = Promise.all([
+        dataLoaderSystem.get('preset_categories'),
+        dataLoaderSystem.get('preset_defaults'),
+        dataLoaderSystem.get('preset_presets'),
+        dataLoaderSystem.get('preset_fields')
+      ])
+      .then(vals => {
+        this.merge({
+          categories: vals[0],
+          defaults: vals[1],
+          presets: vals[2],
+          fields: vals[3]
+        });
+        osmSetAreaKeys(this.areaKeys());
+        osmSetPointTags(this.pointTags());
+        osmSetVertexTags(this.vertexTags());
+      });
+  }
+
+
+  /**
+   * merge
+   * Accepts an object containing new preset data (all properties optional):
+   * {
+   *   fields: {},               // fieldID -> fieldData
+   *   presets: {},              // presetID -> presetData
+   *   categories: {},           // categoryID -> categoryData
+   *   defaults: {},             // geometry -> Array(presetIDs)
+   *   featureCollection: {}     // GeoJSON
+   * }
+   */
+  merge(src) {
+    let newLocationSets = [];
+    const context = this.context;
+    const locationSystem = context.locationSystem();
+
+    // Merge Fields
+    if (src.fields) {
+      for (const [fieldID, f] of Object.entries(src.fields)) {
+        if (f) {   // add or replace
+          if (!uiFields[f.type]) {
+            if (VERBOSE) console.warn(`"${f.type}" type not supported for ${fieldID}`);  // eslint-disable-line no-console
+            continue;
+          }
+          const field = new Field(context, fieldID, f, this._fields);
+          if (field.locationSet) newLocationSets.push(field);
+          this._fields[fieldID] = field;
+
+        } else {   // remove
+          delete this._fields[fieldID];
+        }
+      }
+    }
+
+    // Merge Presets
+    if (src.presets) {
+      for (const [presetID, p] of Object.entries(src.presets)) {
+        const existing = this._presets[presetID];
+        const isFallback = existing?.isFallback();
+
+        if (p) {   // add or replace
+// Rename icon identifiers to match the rapid spritesheet
+if (p.icon) p.icon = p.icon.replace(/^iD-/, 'rapid-');
+
+// A few overrides to use better icons than the ones provided by the id-tagging-schema project
+if (presetID === 'address') p.icon ='maki-circle-stroked';
+if (presetID === 'highway/crossing/traffic_signals') p.icon ='temaki-pedestrian_crosswalk';
+
+          const preset = new Preset(context, presetID, p, this._fields, this._presets);
+          if (preset.locationSet) newLocationSets.push(preset);
+          this._presets[presetID] = preset;
+
+        } else if (!isFallback) {   // remove (but not if it's a fallback)
+          delete this._presets[presetID];
+        }
+      }
+    }
+
+    // Merge Categories
+    if (src.categories) {
+      for (const [categoryID, c] of Object.entries(src.categories)) {
+        if (c) {   // add or replace
+// Rename icon identifiers to match the rapid spritesheet
+if (c.icon) c.icon = c.icon.replace(/^iD-/, 'rapid-');
+          const category = new Category(context, categoryID, c, this._presets);
+          if (category.locationSet) newLocationSets.push(category);
+          this._categories[categoryID] = category;
+
+        } else {   // remove
+          delete this._categories[categoryID];
+        }
+      }
+    }
+
+    // Merge Defaults
+    if (src.defaults) {
+      for (const [geometry, ids] of Object.entries(src.defaults)) {
+        if (Array.isArray(ids)) {   // add or replace
+          this._defaults[geometry] = ids
+            .map(id => this._presets[id] || this._categories[id])
+            .filter(item => item && !item.isFallback());
+        } else {   // remove
+          this._defaults[geometry] = [];
+        }
+      }
+    }
+
+    // Replace `this.collection` after changing Presets and Categories
+    const all = Object.values(this._presets).concat(Object.values(this._categories));
+    this.collection = new Collection(context, all);
+
+    // Rebuild universal fields array
+    this._universal = Object.values(this._fields).filter(field => field.universal);
+
+    // Reset all the preset fields - they'll need to be resolved again
+    Object.values(this._presets).forEach(preset => preset.resetFields());
+
+    // Rebuild geometry index
+    this._geometryIndex = { point: {}, vertex: {}, line: {}, area: {}, relation: {} };
+    all.forEach(preset => {
+      (preset.geometry || []).forEach(geometry => {
+        let g = this._geometryIndex[geometry];
+        for (let key in preset.tags) {
+          g[key] = g[key] || {};
+          let value = preset.tags[key];
+          (g[key][value] = g[key][value] || []).push(preset);
+        }
+      });
+    });
+
+    // Merge Custom Features
+    if (src.featureCollection && Array.isArray(src.featureCollection.features)) {
+      locationSystem.mergeCustomGeoJSON(src.featureCollection);
+    }
+
+    // Resolve all locationSet features.
+    if (newLocationSets.length) {
+      locationSystem.mergeLocationSets(newLocationSets);
+    }
+
+    return this;
+  }
+
+
+  item(id)                      { return this.collection.item(id); }
+  index(id)                     { return this.collection.index(id); }
+  fallback(geometry)            { return this.collection.fallback(geometry); }
+  matchGeometry(geometry)       { return this.collection.matchGeometry(geometry); }
+  matchAllGeometry(geometries)  { return this.collection.matchAllGeometry(geometries); }
+  search(value, geometry, loc)  { return this.collection.search(value, geometry, loc); }
+
+
+  /**
+   * match
+   * @param   entity
+   * @param   resolver
+   * @return  Preset that best matches
+   */
+  match(entity, resolver) {
+    return resolver.transient(entity, 'presetMatch', () => {
+      let geometry = entity.geometry(resolver);
+      // Treat entities on addr:interpolation lines as points, not vertices - iD#3241
+      if (geometry === 'vertex' && entity.isOnAddressLine(resolver)) {
+        geometry = 'point';
+      }
+      const entityExtent = entity.extent(resolver);
+      return this.matchTags(entity.tags, geometry, entityExtent.center());
+    });
+  }
+
+
+  /**
+   * matchTags
+   * @param   tags
+   * @param   geometry
+   * @param   loc
+   * @return  Preset that best matches
+   */
+  matchTags(tags, geometry, loc) {
+    const keyIndex = this._geometryIndex[geometry];
+    let bestScore = -1;
+    let bestMatch;
+    let matchCandidates = [];
+
+    for (let k in tags) {
+      let indexMatches = [];
+
+      let valueIndex = keyIndex[k];
+      if (!valueIndex) continue;
+
+      let keyValueMatches = valueIndex[tags[k]];
+      if (keyValueMatches) indexMatches.push(...keyValueMatches);
+      let keyStarMatches = valueIndex['*'];
+      if (keyStarMatches) indexMatches.push(...keyStarMatches);
+
+      if (indexMatches.length === 0) continue;
+
+      for (let i = 0; i < indexMatches.length; i++) {
+        const candidate = indexMatches[i];
+        const score = candidate.matchScore(tags);
+        if (score === -1) continue;
+
+        matchCandidates.push({score, candidate});
+
+        if (score > bestScore) {
+          bestScore = score;
+          bestMatch = candidate;
+        }
+      }
+    }
+
+    const locationSystem = this.context.locationSystem();
+    if (bestMatch && bestMatch.locationSetID && bestMatch.locationSetID !== '+[Q2]' && Array.isArray(loc)) {
+      const validHere = locationSystem.locationSetsAt(loc);
+      if (!validHere[bestMatch.locationSetID]) {
+        matchCandidates.sort((a, b) => (a.score < b.score) ? 1 : -1);
+        for (let i = 0; i < matchCandidates.length; i++){
+          const candidateScore = matchCandidates[i];
+          if (!candidateScore.candidate.locationSetID || validHere[candidateScore.candidate.locationSetID]) {
+            bestMatch = candidateScore.candidate;
+            bestScore = candidateScore.score;
+            break;
+          }
+        }
+      }
+    }
+
+    // If any part of an address is present, allow fallback to "Address" preset - iD#4353
+    if (!bestMatch || bestMatch.isFallback()) {
+      for (let k in tags) {
+        if (/^addr:/.test(k) && keyIndex['addr:*'] && keyIndex['addr:*']['*']) {
+          bestMatch = keyIndex['addr:*']['*'][0];
+          break;
+        }
+      }
+    }
+
+    return bestMatch || this.fallback(geometry);
+  }
+
+
+  /**
+   * allowsVertex
+   * @param   entity
+   * @param   resolver
+   * @return  `true` if this entity can be a vertex, `false` if not
+   */
+  allowsVertex(entity, resolver) {
+    if (entity.type !== 'node') return false;
+    if (Object.keys(entity.tags).length === 0) return true;
+
+    return resolver.transient(entity, 'vertexMatch', () => {
+      // address lines allow vertices to act as standalone points
+      if (entity.isOnAddressLine(resolver)) return true;
+
+      const geometries = osmNodeGeometriesForTags(entity.tags);
+      if (geometries.vertex) return true;
+      if (geometries.point) return false;
+      // allow vertices for unspecified points
+      return true;
+    });
+  }
+
+
+  /**
+   * areaKeys
+   * Because of the open nature of tagging, we will never have a complete
+   * list of tags used in OSM, so we want it to have logic like "assume
+   * that a closed way with an amenity tag is an area, unless the amenity
+   * is one of these specific types". This function computes a structure
+   * that allows testing of such conditions, based on the presets designated
+   * as as supporting (or not supporting) the area geometry.
+   *
+   * The returned object L is a keeplist/discardlist of tags. A closed way
+   * with a tag (k, v) is considered to be an area if `k in L && !(v in L[k])`
+   * (see `Way#isArea()`). In other words, the keys of L form the keeplist,
+   * and the subkeys form the discardlist.
+   *
+   * @returns  areaKeys Object
+   */
+  areaKeys() {
+    // The ignore list is for keys that imply lines. (We always add `area=yes` for exceptions)
+    const ignore = ['barrier', 'highway', 'footway', 'railway', 'junction', 'type'];
+    let areaKeys = {};
+
+    // ignore name-suggestion-index and deprecated presets
+    const presets = Object.values(this._presets).filter(p => !p.suggestion && !p.replacement);
+
+    // keeplist
+    for (const p of presets) {
+      const k = Object.keys(p.tags)[0];  // pick the first tag
+      if (!k) continue;
+      if (ignore.includes(k)) continue;
+
+      if (p.geometry.includes('area')) {    // probably an area..
+        areaKeys[k] = areaKeys[k] || {};
+      }
+    }
+
+    // discardlist
+    for (const p of presets) {
+      if (!p.geometry.includes('line')) continue;
+      for (const [k, v] of Object.entries(p.addTags)) {
+        // examine all addTags to get a better sense of what can be tagged on lines - iD#6800
+        // probably an area... but sometimes a line.
+        if (k in areaKeys && v !== '*') {
+          areaKeys[k][v] = true;
+        }
+      }
+    }
+
+    return areaKeys;
+  }
+
+
+  pointTags() {
+    let pointTags = {};
+
+    // ignore name-suggestion-index and deprecated presets
+    const presets = Object.values(this._presets).filter(p => !p.suggestion && !p.replacement && p.searchable !== false);
+
+    for (const p of presets) {
+      if (!p.geometry.includes('point')) continue;
+
+      const k = Object.keys(p.tags)[0];    // pick the first tag
+      const v = Object.values(p.tags)[0];  // pick the first tag
+      if (!k || !v) continue;
+
+      pointTags[k] = pointTags[k] || {};
+      pointTags[k][v] = true;
+    }
+
+    return pointTags;
+  }
+
+
+  vertexTags() {
+    let vertexTags = {};
+
+    // ignore name-suggestion-index and deprecated presets
+    const presets = Object.values(this._presets).filter(p => !p.suggestion && !p.replacement && p.searchable !== false);
+
+    for (const p of presets) {
+      if (!p.geometry.includes('vertex')) continue;
+
+      const k = Object.keys(p.tags)[0];    // pick the first tag
+      const v = Object.values(p.tags)[0];  // pick the first tag
+      if (!k || !v) continue;
+
+      vertexTags[k] = vertexTags[k] || {};
+      vertexTags[k][v] = true;
+    }
+
+    return vertexTags;
+  }
+
+
+  field(id) {
+    return this._fields[id];
+  }
+
+  universal() {
+    return this._universal;
+  }
+
+
+  /**
+   * defaults
+   * Defaults are the Presets and Categories offered to the user when adding a new feature.
+   * Each geometry type has its own set of defaults.
+   * The fallback preset for the given geometry is appended to the list automatically.
+   * @param   geometry
+   * @param   limit               Integer max number of results to return
+   * @param   startWithRecents    Boolean
+   * @param   loc
+   * @return  Collection
+   */
+  defaults(geometry, limit = 10, startWithRecents = true, loc = null) {
+    let results = new Map();   // Map (itemID -> item)  (may be a Preset or a Category)
+
+    if (startWithRecents) {
+      for (const preset of this.getRecents()) {
+        if (results.size < MAXRECENTS_SHOW && preset.matchGeometry(geometry)) {
+          results.set(preset.id, preset);
+        }
+      }
+    }
+
+    // If there is a set of addable presetIDs, use that instead of defaults
+    if (this.addablePresetIDs instanceof Set) {
+      for (const itemID of this.addablePresetIDs) {
+        const item = this.item(itemID);
+        if (item?.matchGeometry(geometry)) {
+          results.set(itemID, item);
+        }
+      }
+    } else {
+      for (const item of this._defaults[geometry]) {
+        if (item.matchGeometry(geometry)) {
+          results.set(item.id, item);
+        }
+      }
+    }
+
+    const fallback = this.fallback(geometry);
+    if (fallback && !results.has(fallback.id)) {
+      results.set(fallback.id, fallback);
+    }
+
+    // If a location was provided, filter results to only those valid here.
+    let arr = [...results.values()];
+    if (Array.isArray(loc)) {
+      const locationSystem = this.context.locationSystem();
+      const validHere = locationSystem.locationSetsAt(loc);
+      arr = arr.filter(item => !item.locationSetID || validHere[item.locationSetID]);
+    }
+
+    return new Collection(this.context, arr.slice(0, limit - 1));
+  }
+
+
+  /**
+   * getRecents
+   * Returns the recently used presets
+   * If this._recentIDs is unset, try to load them from localStorage
+   * @return   An Array of recent presets
+   */
+  getRecents() {
+    let presetIDs = this._recentIDs;
+    if (!presetIDs) {  // first time, try to get them from localStorage
+      const prefs = this.context.storageSystem();
+      presetIDs = JSON.parse(prefs.getItem('preset_recents')) || [];
+    }
+
+    const presets = presetIDs
+      .map(item => {
+        const id = item?.id || item;  // previously we stored preset, now we just store presetID
+        return this._presets[id];
+      })
+      .filter(Boolean);
+
+    if (!this._recentIDs) {
+      this._recentIDs = presets.map(item => item.id);
+    }
+
+    return presets;
+  }
+
+
+  /**
+   * setMostRecent
+   * Prepends a preset to the recently used presets array
+   * @param   A preset to add
+   */
+  setMostRecent(preset) {
+    if (preset.searchable === false) return;
+
+    this._recentIDs.unshift(preset.id);   // prepend array
+    this._recentIDs = utilArrayUniq(this._recentIDs).slice(0, MAXRECENTS);
+
+    const prefs = this.context.storageSystem();
+    prefs.setItem('preset_recents', JSON.stringify(this._recentIDs));
+  }
+
+}
diff --git a/modules/core/RapidSystem.js b/modules/core/RapidSystem.js
new file mode 100644
index 0000000000..c937e03fbc
--- /dev/null
+++ b/modules/core/RapidSystem.js
@@ -0,0 +1,236 @@
+import { gpx } from '@tmcw/togeojson';
+import { Extent } from '@rapid-sdk/math';
+
+import { AbstractSystem } from './AbstractSystem';
+
+const RAPID_MAGENTA = '#da26d3';
+const RAPID_COLORS = [
+  '#ff0000',  // red
+  '#ffa500',  // orange
+  '#ffd700',  // gold
+  '#00ff00',  // lime
+  '#00ffff',  // cyan
+  '#1e90ff',  // dodgerblue
+  '#da26d3',  // rapid magenta
+  '#ffc0cb',  // pink
+  '#d3d3d3',  // lightgray
+  '#faf0e6'   // linen
+];
+
+
+/**
+ * `RapidSystem` maintains all the Rapid datasets
+ *
+ * Events available:
+ *  `taskchanged`
+ */
+export class RapidSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  `context`   Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'rapid';
+
+    this.showPowerUser = context.initialHashParams.poweruser === 'true';
+    this.sources = new Set();
+
+    this._datasets = new Map();   // Map(datasetID -> dataset)
+    this._taskExtent = null;
+    this._isTaskBoundsRect = null;
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this._hashchange = this._hashchange.bind(this);
+  }
+
+
+  /**
+   * init
+   * Called one time after all objects have been instantiated.
+   */
+  init() {
+    this.context.urlHashSystem().on('hashchange', this._hashchange);
+
+    // setup the built-in datasets (after localization ready)
+    const l10n = this.context.localizationSystem();
+    l10n.initAsync()
+      .then(() => {
+        this._datasets.set('fbRoads', {
+          id: 'fbRoads',
+          beta: false,
+          added: true,         // whether it should appear in the list
+          enabled: false,      // whether the user has checked it on
+          conflated: true,
+          service: 'mapwithai',
+          color: RAPID_MAGENTA,
+          label: l10n.t('rapid_feature_toggle.fbRoads.label'),
+          license_markdown: l10n.t('rapid_feature_toggle.fbRoads.license_markdown')
+        });
+        this._datasets.set('msBuildings', {
+          id: 'msBuildings',
+          beta: false,
+          added: true,         // whether it should appear in the list
+          enabled: false,      // whether the user has checked it on
+          conflated: true,
+          service: 'mapwithai',
+          color: RAPID_MAGENTA,
+          label: l10n.t('rapid_feature_toggle.msBuildings.label'),
+          license_markdown: l10n.t('rapid_feature_toggle.msBuildings.license_markdown')
+        });
+      });
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    this.sources = new Set();
+  }
+
+
+  get colors() {
+    return RAPID_COLORS;
+  }
+
+  get datasets() {
+    return this._datasets;
+  }
+
+  get taskExtent() {
+    return this._taskExtent;
+  }
+
+  isTaskRectangular() {
+    return (!!this._taskExtent && this._isTaskBoundsRect);
+  }
+
+
+  /**
+   * setTaskExtentByGpxData
+   */
+  setTaskExtentByGpxData(gpxData) {
+    const dom = (new DOMParser()).parseFromString(gpxData, 'text/xml');
+    const gj = gpx(dom);
+    const lineStringCount = gj.features.reduce((accumulator, currentValue) =>  {
+      return accumulator + (currentValue.geometry.type === 'LineString' ? 1 : 0);
+    }, 0);
+
+    if (gj.type === 'FeatureCollection') {
+      let minlat, minlon, maxlat, maxlon;
+
+      gj.features.forEach(f => {
+        if (f.geometry.type === 'Point') {
+          const lon = f.geometry.coordinates[0];
+          const lat = f.geometry.coordinates[1];
+          if (minlat === undefined || lat < minlat) minlat = lat;
+          if (minlon === undefined || lon < minlon) minlon = lon;
+          if (maxlat === undefined || lat > maxlat) maxlat = lat;
+          if (maxlon === undefined || lon > maxlon) maxlon = lon;
+
+        } else if (f.geometry.type === 'LineString' && lineStringCount === 1) {
+          const lats = f.geometry.coordinates.map(f => f[0]);
+          const lngs = f.geometry.coordinates.map(f => f[1]);
+          const uniqueLats = lats.filter(distinct);
+          const uniqueLngs = lngs.filter(distinct);
+          let eachLatHas2Lngs = true;
+
+          uniqueLats.forEach(lat => {
+            const lngsForThisLat = f.geometry.coordinates
+              .filter(coord => coord[0] === lat)   // Filter the coords to the ones with this lat
+              .map(coord => coord[1])              // Make an array of lngs that associate with that lat
+              .filter(distinct);                   // Finally, filter for uniqueness
+
+            if (lngsForThisLat.length !== 2) {
+              eachLatHas2Lngs = false;
+            }
+          });
+          // Check for exactly two unique latitudes, two unique longitudes,
+          // and that each latitude was associated with exactly 2 longitudes,
+          if (uniqueLats.length === 2 && uniqueLngs.length === 2 && eachLatHas2Lngs) {
+            this._isTaskBoundsRect = true;
+          } else {
+            this._isTaskBoundsRect = false;
+          }
+        }
+      });
+
+      this._taskExtent = new Extent([minlon, minlat], [maxlon, maxlat]);
+      this.emit('taskchanged');
+    }
+
+    function distinct(value, index, self) {
+      return self.indexOf(value) === index;
+    }
+  }
+
+
+  /**
+   * _hashchange
+   * Respond to any changes appearing in the url hash
+   * @param  q   Object containing key/value pairs of the current query parameters
+   */
+  _hashchange(q) {
+    // datasets
+    let toEnable = new Set();
+    if (typeof q.datasets === 'string') {
+      toEnable = new Set(q.datasets.split(','));
+    }
+
+    // Update all known datasets
+    for (const [datasetID, dataset] of this._datasets) {
+      if (toEnable.has(datasetID)) {
+        dataset.enabled = true;
+        toEnable.delete(datasetID);  // delete marks it as done
+      } else {
+        dataset.enabled = false;
+      }
+    }
+
+    // If there are remaining datasets to enable, try to load them from Esri.
+    const esri = this.context.services.get('esri');
+    if (!esri || !toEnable.size) return;
+
+    esri.loadDatasetsAsync()
+      .then(results => {
+        for (const datasetID of toEnable) {
+          const d = results[datasetID];
+          if (!d) continue;  // dataset with requested id not found, fail silently
+
+          // *** Code here is copied from `rapid_view_manage_datasets.js` `toggleDataset()` ***
+          esri.loadLayerAsync(d.id);   // start fetching layer info (the mapping between attributes and tags)
+
+          const isBeta = d.groupCategories.some(cat => cat.toLowerCase() === '/categories/preview');
+          const isBuildings = d.groupCategories.some(cat => cat.toLowerCase() === '/categories/buildings');
+          const nextColor = this._datasets.size % RAPID_COLORS.length;
+
+          let dataset = {
+            id: d.id,
+            beta: isBeta,
+            added: true,       // whether it should appear in the list
+            enabled: true,     // whether the user has checked it on
+            conflated: false,
+            service: 'esri',
+            color: RAPID_COLORS[nextColor],
+            label: d.title,
+            license_markdown: this.context.t('rapid_feature_toggle.esri.license_markdown')
+          };
+
+          if (d.extent) {
+            dataset.extent = new Extent(d.extent[0], d.extent[1]);
+          }
+
+          // Test running building layers through MapWithAI conflation service
+          if (isBuildings) {
+            dataset.conflated = true;
+            dataset.service = 'mapwithai';
+          }
+
+          this._datasets.set(d.id, dataset);  // add it
+        }
+      });
+  }
+}
diff --git a/modules/core/StorageSystem.js b/modules/core/StorageSystem.js
new file mode 100644
index 0000000000..b8ee55bb60
--- /dev/null
+++ b/modules/core/StorageSystem.js
@@ -0,0 +1,94 @@
+import { AbstractSystem } from './AbstractSystem';
+
+/**
+ * `StorageSystem` is a wrapper around `window.localStorage`
+ * It is used to store user preferences (good)
+ * and the user's edit history (not good)
+ *
+ * n.b.:  `localStorage` is a _synchronous_ API.
+ * We should add another system for wrapping `indexedDB`,
+ * which is an _asynchronous_ API, but would allow us to store
+ * a whole lot more data, and share it with worker processes.
+ * (The user's edit history should go there instead.)
+ */
+export class StorageSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  context  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'storage';   // was: 'prefs'
+    this._storage = null;
+
+    // Note that accessing localStorage may throw a `SecurityError`, so wrap in a try/catch.
+    try {
+      this._storage = window.localStorage;
+    } catch (e) {
+      this._mock = new Map();
+      this._storage = {
+        hasItem: (k) => this._mock.has(k),
+        getItem: (k) => this._mock.get(k),
+        setItem: (k, v) => this._mock.set(k, v),
+        removeItem: (k) => this._mock.delete(k),
+        clear: () => this._mock.clear()
+      };
+    }
+  }
+
+
+  /**
+   * hasItem
+   * @param   k  String key to check for existance
+   * @return  `true` if the key is set, `false` if not
+   */
+  hasItem(k) {
+    return !!this._storage.getItem(k);
+  }
+
+
+  /**
+   * getItem
+   * @param   k  String key to get the value for
+   * @return  The stored value, or `null` if not found
+   */
+  getItem(k) {
+    return this._storage.getItem(k);
+  }
+
+
+  /**
+   * setItem
+   * @param   k  String key to set the value for
+   * @param   v  String value to set
+   * @return  `true` if it succeeded, `false` if it failed
+   */
+  setItem(k, v) {
+    try {
+      this._storage.setItem(k, v);
+      return true;
+    } catch (e) {
+      console.error('localStorage quota exceeded');  // eslint-disable-line no-console
+    }
+    return false;
+  }
+
+
+  /**
+   * removeItem
+   * @param   k  String key to remove from storage
+   */
+  removeItem(k) {
+    this._storage.removeItem(k);
+  }
+
+
+  /**
+   * clear
+   * Clears all values from the storage
+   */
+  clear() {
+    this._storage.clear();
+  }
+}
diff --git a/modules/ui/init.js b/modules/core/UiSystem.js
similarity index 52%
rename from modules/ui/init.js
rename to modules/core/UiSystem.js
index 481aafc64d..7e7aad5797 100644
--- a/modules/ui/init.js
+++ b/modules/core/UiSystem.js
@@ -1,78 +1,112 @@
 import { select as d3_select } from 'd3-selection';
 
-import { prefs } from '../core/preferences';
-import { t, localizer } from '../core/localizer';
-import { presetManager } from '../presets';
+import { AbstractSystem } from './AbstractSystem';
 import { utilDetect } from '../util/detect';
 import { utilGetDimensions } from '../util/dimensions';
-import { uiAccount } from './account';
-import { uiAttribution } from './attribution';
-import { uiContributors } from './contributors';
-import { UiDefs } from './UiDefs';
-import { uiEditMenu } from './edit_menu';
-import { uiFeatureInfo } from './feature_info';
-import { uiFlash } from './flash';
-import { uiFullScreen } from './full_screen';
-import { uiGeolocate } from './geolocate';
-import { uiIcon } from './icon';
-import { uiInfo } from './info';
-import { uiIntro } from './intro';
-import { uiIssuesInfo } from './issues_info';
-import { uiLoading } from './loading';
-import { uiMapInMap } from './map_in_map';
-import { uiPhotoviewer } from './photoviewer';
-import { uiRestore } from './restore';
-import { uiScale } from './scale';
-import { uiShortcuts } from './shortcuts';
-import { uiSidebar } from './sidebar';
-import { uiSourceSwitch } from './source_switch';
-import { uiSpinner } from './spinner';
-import { uiStatus } from './status';
-import { uiTooltip } from './tooltip';
-import { uiTopToolbar } from './top_toolbar';
-import { uiVersion } from './version';
-import { uiZoom } from './zoom';
-import { uiZoomToSelection } from './zoom_to_selection';
-import { uiCmd } from './cmd';
-
-import { uiPaneBackground } from './panes/background';
-import { uiPaneHelp } from './panes/help';
-import { uiPaneIssues } from './panes/issues';
-import { uiPaneMapData } from './panes/map_data';
-import { uiPanePreferences } from './panes/preferences';
-
-import { uiRapidServiceLicense } from './rapid_service_license';
-import { uiRapidWhatsNew } from './rapid_whatsnew';
-import { uiRapidSplash } from './rapid_splash';
-import { ui3DMap } from './tools/3dmap/3d_map';
-
-
-export function uiInit(context) {
-  let _initCounter = 0;
-  let _needWidth = {};
-
-  let generateBugLink = () => {
-    let link = new URL('https://github.com/facebook/Rapid/issues/new');
 
-    // From the template we set up at https://github.com/facebook/Rapid/blob/main/.github/ISSUE_TEMPLATE/bug_report.yml
-    link.searchParams.append('template', 'bug_report.yml');
-    const detected = utilDetect();
+import {
+  uiAccount, uiAttribution, uiContributors, UiDefs, uiEditMenu,
+  uiFeatureInfo, uiFlash, uiFullScreen, uiGeolocate, uiIcon,
+  uiInfo, uiIntro, uiIssuesInfo, uiLoading, uiMapInMap,
+  uiMap3dViewer, uiPhotoViewer, uiRapidServiceLicense,
+  uiRapidWhatsNew, uiRapidSplash, uiRestore, uiScale, uiShortcuts,
+  uiSidebar, uiSourceSwitch, uiSpinner, uiStatus, uiTooltip,
+  uiTopToolbar, uiVersion, uiZoom, uiZoomToSelection, uiCmd,
+} from '../ui';
+
+import {
+  uiPaneBackground, uiPaneHelp, uiPaneIssues, uiPaneMapData, uiPanePreferences
+} from '../ui/panes';
+
+
+/**
+ * `UiSystem` maintains the user interface
+ */
+export class UiSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  `context`   Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'ui';
+
+    this.authModal = null;
+    this.defs = null;
+    this.flash = null;
+    this.editMenu = null;
+    this.info = null;
+    this.sidebar = null;
+    this.photoviewer = null;
+    this.shortcuts = null;
+
+    this._didRender = false;
+    this._needWidth = {};
+    this._loadPromise = null;
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    // (This is also necessary when using `d3-selection.call`)
+    this.render = this.render.bind(this);
+    this.resize = this.resize.bind(this);
+    this._clickBugLink = this._clickBugLink.bind(this);
+  }
 
-    let browser = `${detected.browser} v${detected.version}`;
-    let os = `${detected.os}`;
-    let userAgent = navigator.userAgent;
 
-    link.searchParams.append('browser', browser);
-    link.searchParams.append('os', os);
-    link.searchParams.append('useragent', userAgent);
-    link.searchParams.append('URL', window.location.href);
-    link.searchParams.append('version', context.version);
+  /**
+   * init
+   * Called one time after all objects have been instantiated.
+   */
+  init() {
+    const context = this.context;
+
+    this.authModal = uiLoading(context).blocking(true);
+    this.defs = new UiDefs(context);
+    this.flash = uiFlash(context);
+    this.editMenu = uiEditMenu(context);
+    // this.info = uiInfo(context);
+    this.sidebar = uiSidebar(context);
+    this.photoviewer = uiPhotoViewer(context);
+    this.shortcuts = uiShortcuts(context);
+
+    // Setup event handlers
+    window.addEventListener('beforeunload', () => context.save());
+    window.addEventListener('unload', () => context.editSystem().unlock());
+    window.addEventListener('resize', this.resize);
+
+    const l10n = this.context.localizationSystem();
+    l10n.initAsync()
+      .then(() => {
+        this.authModal.message(l10n.tHtml('loading_auth'));
+
+        const osm = context.services.get('osm');
+        if (osm) {
+          osm
+            .on('authLoading', () => context.container()?.call(this.authModal))
+            .on('authDone', () => this.authModal.close());
+        }
 
-    window.open(link.toString(), '_blank');
-  };
+        context.keybinding()
+          .on('⌫', e => e.preventDefault())
+          .on([l10n.t('sidebar.key'), '`', '²', '@'], this.sidebar.toggle)   // iD#5663, iD#6864 - common QWERTY, AZERTY
+          .on(uiCmd('⌘' + l10n.t('background.key')), e => {
+            if (e) {
+              e.stopImmediatePropagation();
+              e.preventDefault();
+            }
+            const imagerySystem = context.imagerySystem();
+            const storageSystem = context.storageSystem();
+            const previousBackground = imagerySystem.findSource(storageSystem.getItem('background-last-used-toggle'));
+            if (previousBackground) {
+              const currentBackground = imagerySystem.baseLayerSource();
+              storageSystem.setItem('background-last-used-toggle', currentBackground.id);
+              storageSystem.setItem('background-last-used', previousBackground.id);
+              imagerySystem.baseLayerSource(previousBackground);
+            }
+          });
+      });
 
-  let controls;
-  function render(container) {
+// not sure what these were for
 //    container.on('click.ui', d3_event => {
 //      if (d3_event.button !== 0) return;  // we're only concerned with the primary mouse button
 //      if (!d3_event.composedPath) return;
@@ -102,28 +136,40 @@ export function uiInit(context) {
 //      });
 //    }
 
+  }
+
+
+
+  render(container) {
+// this is a bit non-standard for how our ui components usually render, but for now
+// we'll guard so that this code can only happen one time to set everything up..
+if (this._didRender) return;  // one time only
+this.didRender = true;
+
+    const context = this.context;
+    const l10n = context.localizationSystem();
 
     container
-      .attr('lang', localizer.localeCode())
-      .attr('dir', localizer.textDirection());
+      .attr('lang', l10n.localeCode())
+      .attr('dir', l10n.textDirection());
 
     // setup fullscreen keybindings (no button shown at this time)
     container
       .call(uiFullScreen(context));
 
-    const map = context.map();
+    const map = context.mapSystem();
     map.redrawEnabled = false;  // don't draw until we've set zoom/lat/long
 
     container
       .append('svg')
       .attr('id', 'rapid-defs')
-      .call(ui.defs.render);
+      .call(this.defs.render);
 
     // Sidebar
     container
       .append('div')
       .attr('class', 'sidebar')
-      .call(ui.sidebar);
+      .call(this.sidebar);
 
     const content = container
       .append('div')
@@ -163,7 +209,7 @@ export function uiInit(context) {
       .call(uiMapInMap(context));
 
     overMap
-      .call(ui3DMap(context));
+      .call(uiMap3dViewer(context));
 
     overMap
       .append('div')
@@ -172,7 +218,7 @@ export function uiInit(context) {
 
 
     // Map controls
-    controls = overMap
+    const controls = overMap
       .append('div')
       .attr('class', 'map-controls');
 
@@ -206,28 +252,28 @@ export function uiInit(context) {
       uiPaneHelp(context)
     ];
 
-    uiPanes.forEach(pane => {
+    for (const component of uiPanes) {
       controls
         .append('div')
-        .attr('class', `map-control map-pane-control ${pane.id}-control`)
-        .call(pane.renderToggleButton);
+        .attr('class', `map-control map-pane-control ${component.id}-control`)
+        .call(component.renderToggleButton);
 
       panes
-        .call(pane.renderPane);
-    });
+        .call(component.renderPane);
+    }
 
-    ui.info = uiInfo(context);
 
     // Info Panels
+    this.info = uiInfo(context);
     overMap
-      .call(ui.info);
+      .call(this.info);
 
     overMap
       .append('div')
       .attr('class', 'photoviewer')
       .classed('al', true)       // 'al'=left,  'ar'=right
       .classed('hide', true)
-      .call(ui.photoviewer);
+      .call(this.photoviewer);
 
     overMap
       .append('div')
@@ -258,9 +304,9 @@ export function uiInit(context) {
       .attr('class', 'main-footer-wrap footer-show');
 
     footerWrap
-        .append('div')
-        .attr('class', 'scale-block')
-        .call(uiScale(context));
+      .append('div')
+      .attr('class', 'scale-block')
+      .call(uiScale(context));
 
     let aboutList = footerWrap
       .append('div')
@@ -277,9 +323,9 @@ export function uiInit(context) {
       .append('li')
       .attr('class', 'fb-road-license')
       .attr('tabindex', -1)
-      .call(uiRapidServiceLicense());
+      .call(uiRapidServiceLicense(context));
 
-    const apiConnections = context.apiConnections();
+    const apiConnections = context.apiConnections;
     if (apiConnections && apiConnections.length > 1) {
       aboutList
         .append('li')
@@ -304,16 +350,16 @@ export function uiInit(context) {
       .append('button')
       .attr('class', 'bugnub')
       .attr('tabindex', -1)
-      .on('click', generateBugLink)
+      .on('click', this._clickBugLink)
       .call(uiIcon('#rapid-icon-bug', 'bugnub'))
-      .call(uiTooltip().title(t.html('report_a_bug')).placement('top'));
+      .call(uiTooltip(context).title(l10n.tHtml('report_a_bug')).placement('top'));
 
     issueLinks
       .append('a')
       .attr('target', '_blank')
       .attr('href', 'https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating')
       .call(uiIcon('#rapid-icon-translate', 'light'))
-      .call(uiTooltip().title(t.html('help_translate')).placement('top'));
+      .call(uiTooltip(context).title(l10n.tHtml('help_translate')).placement('top'));
 
     aboutList
       .append('li')
@@ -325,163 +371,87 @@ export function uiInit(context) {
         .call(uiAccount(context));
     }
 
+    container
+      .call(this.shortcuts);
+
+
     // Setup map dimensions, and allow rendering..
     // This should happen after .main-content and toolbars exist.
-    ui.onResize();
+    this.resize();
     map.redrawEnabled = true;
 
-    // Bind events
-    window.onbeforeunload = function() {
-      return context.save();
-    };
-    window.onunload = function() {
-      context.history().unlock();
-    };
-
-    d3_select(window)
-      .on('resize.editor', function() {
-        ui.onResize();
-      });
-
-
-    context.keybinding()
-      .on('⌫', function(d3_event) { d3_event.preventDefault(); })
-      .on([t('sidebar.key'), '`', '²', '@'], ui.sidebar.toggle)   // #5663, #6864 - common QWERTY, AZERTY
-      .on(uiCmd('⌘' + t('background.key')), function quickSwitch(d3_event) {
-        if (d3_event) {
-          d3_event.stopImmediatePropagation();
-          d3_event.preventDefault();
-        }
-        const previousBackground = context.imagery().findSource(prefs('background-last-used-toggle'));
-        if (previousBackground) {
-          const currentBackground = context.imagery().baseLayerSource();
-          prefs('background-last-used-toggle', currentBackground.id);
-          prefs('background-last-used', previousBackground.id);
-          context.imagery().baseLayerSource(previousBackground);
-        }
-      })
-      .on(t('area_fill.wireframe.key'), function toggleWireframe(d3_event) {
-        d3_event.preventDefault();
-        d3_event.stopPropagation();
-        const map = context.map();
-        map.wireframeMode = !map.wireframeMode;
-      })
-      .on(uiCmd('⌥' + t('area_fill.wireframe.key')), function toggleOsmData(d3_event) {
-        d3_event.preventDefault();
-        d3_event.stopPropagation();
-
-        // Don't allow layer changes while drawing - #6584
-        const mode = context.mode();
-        if (mode && /^draw/.test(mode.id)) return;
-
-        context.scene().toggleLayers('osm');
-        context.enter('browse');
-      })
-      .on(t('map_data.highlight_edits.key'), function toggleHighlightEdited(d3_event) {
-        d3_event.preventDefault();
-        map.highlightEdits = !map.highlightEdits;
-      });
-
-
     context.enter('browse');
 
-    const osm = context.connection();
-    const startWalkthrough = context.urlhash().initialHashParams.get('walkthrough') === 'true';
-
-    if (!_initCounter++) {  // first time only
-
-      if (!startWalkthrough) {
-        if (context.history().lock() && context.history().hasRestorableChanges()) {
-          context.container().call(uiRestore(context));
 
-// uiRapidSplash is a bit outdated, so just always start with uiRapidWhatsNew
-        } else {
-          context.container().call(uiRapidWhatsNew(context));
-        }
-
-//        // If users have already seen the 'welcome to Rapid' splash screen, don't also
-//        // show them the what's new screen
-//        } else if (prefs('sawRapidSplash')) {
-//          context.container().call(uiRapidWhatsNew(context));
-//
-//        } else if (osm && osm.authenticated()) {
-//          context.container().call(uiRapidSplash(context));
-//        }
-      }
+    // What to show first?
+    const editSystem = context.editSystem();
+    const urlHash = context.urlHashSystem();
+    const startWalkthrough = urlHash.initialHashParams.get('walkthrough') === 'true';
 
-// this seems wrong for it to be in !_initCounter++ block
-// if the UI is getting rebuild after a localization, the shortcuts should too?
-      context.container()
-        .call(ui.shortcuts);
-    }
+    if (startWalkthrough) {
+      container.call(uiIntro(context));   // Jump right into walkthrough..
 
-    const authModal = uiLoading(context).message(t.html('loading_auth')).blocking(true);
-    if (osm && authModal) {
-      osm
-        .on('authLoading.ui', () => context.container().call(authModal))
-        .on('authDone.ui', () => authModal.close());
-    }
+    } else if (editSystem.lock() && editSystem.hasRestorableChanges()) {
+      container.call(uiRestore(context));   // Offer to restore previous edits..
 
-    if (startWalkthrough) {
-      context.container().call(uiIntro(context));
+    } else {
+// uiRapidSplash is a bit outdated, so just always start with uiRapidWhatsNew
+//      if (context.storageSystem().getItem('sawRapidSplash')) {
+       container.call(uiRapidWhatsNew(context));    // Show "Whats New"
+//      } else {
+//        container.call(uiRapidSplash(context));      // Show "Welcome to Rapid"
+//      }
     }
-
   }
 
 
-  // ---------------------------------
-  // UI module and bootstrap code
-
-  let ui = {};
-
-  ui.defs = new UiDefs(context);
-
-  ui.flash = uiFlash(context);
-
-  ui.sidebar = uiSidebar(context);
-
-  ui.photoviewer = uiPhotoviewer(context);
+  // renders the Rapid interface into the container node
+  ensureLoaded() {
+    if (this._loadPromise) return this._loadPromise;
 
-  ui.shortcuts = uiShortcuts(context);
+    // Wait for strings and presets to be ready before rendering the UI
+    const context = this.context;
+    const l10n = context.localizationSystem();
+    const presetSystem = context.presetSystem();
 
-  // renders the Rapid interface into the container node
-  let _loadPromise;
-  ui.ensureLoaded = () => {
-    if (_loadPromise) return _loadPromise;
-
-    // Wait for strings and presets before rendering the UI
-    return _loadPromise = Promise.all([
-      localizer.ensureLoaded(),
-      presetManager.ensureLoaded()
+    return this._loadPromise = Promise.all([
+      l10n.initAsync(),
+      presetSystem.initAsync()
     ])
     .then(() => {
-      if (!context.container().empty()) {
-        render(context.container());
+      const container = context.container();
+      if (!container.empty()) {
+        this.render(container);
       }
     })
     .catch(err => console.error(err));  // eslint-disable-line
-  };
-
+  }
 
-  // `ui.restart()` will destroy and rebuild the entire Rapid interface,
-  // for example to switch the locale while Rapid is running.
-  ui.restart = function() {
-    context.keybinding().clear();
-    _loadPromise = null;
-    context.container().selectAll('*').remove();
-    ui.ensureLoaded();
-  };
 
+// Removing for now, this will not work as written (it is a good idea though)
+// For it to work, it has to live in context, and all the core systems will need to have
+// their own restart method.  They would need to do things like reload the localizations
+// and then re-init all the things, including setting up the key bindings and strings
+//  // `restart()` will destroy and rebuild the entire Rapid interface,
+//  // for example to switch the locale while Rapid is running.
+//  restart() {
+//    context.keybinding().clear();
+//    this._loadPromise = null;
+//    context.container().selectAll('*').remove();
+//    this.ensureLoaded();
+//  }
 
 
-  ui.onResize = function(offset) {
-    const map = context.map();
+  resize(offset) {
+    const context = this.context;
+    const container = context.container();
+    const map = context.mapSystem();
 
     // Recalc dimensions of map and sidebar.. (`true` = force recalc)
     // This will call `getBoundingClientRect` and trigger reflow,
     //  but the values will be cached for later use.
-    const dims = utilGetDimensions(context.container().select('.main-content'), true);
-    utilGetDimensions(context.container().select('.sidebar'), true);
+    const dims = utilGetDimensions(container.select('.main-content'), true);
+    utilGetDimensions(container.select('.sidebar'), true);
 
     // When adjusting the sidebar width, pan the map so it stays centered on the same location.
     if (offset !== undefined) {
@@ -489,56 +459,61 @@ export function uiInit(context) {
     }
 
     map.dimensions = dims;
-    ui.photoviewer.onMapResize();
+    this.photoviewer.onMapResize();
 
     // check if header or footer have overflowed
-    ui.checkOverflow('.top-toolbar');
-    ui.checkOverflow('.map-footer-bar');
+    this.checkOverflow('.top-toolbar');
+    this.checkOverflow('.map-footer-bar');
 
 // this was for the restrictions editor?
+// or any other component that needs to know when resizing is happening
 //    // Use outdated code so it works on Explorer
 //    const resizeWindowEvent = document.createEvent('Event');
 //    resizeWindowEvent.initEvent('resizeWindow', true, true);
 //    document.dispatchEvent(resizeWindowEvent);
-  };
+  }
 
 
   // Call checkOverflow when resizing or whenever the contents change.
   // I think this was to make button labels in the top bar disappear
   // when more buttons are added than the screen has available width
-  ui.checkOverflow = function(selector, reset) {
+  checkOverflow(selector, reset) {
     if (reset) {
-      delete _needWidth[selector];
+      delete this._needWidth[selector];
     }
 
-    let selection = context.container().select(selector);
+    const selection = this.context.container().select(selector);
     if (selection.empty()) return;
 
-    let scrollWidth = selection.property('scrollWidth');
-    let clientWidth = selection.property('clientWidth');
-    let needed = _needWidth[selector] || scrollWidth;
+    const scrollWidth = selection.property('scrollWidth');
+    const clientWidth = selection.property('clientWidth');
+    let needed = this._needWidth[selector] || scrollWidth;
 
     if (scrollWidth > clientWidth) {    // overflow happening
       selection.classed('narrow', true);
-      if (!_needWidth[selector]) {
-        _needWidth[selector] = scrollWidth;
+      if (!this._needWidth[selector]) {
+        this._needWidth[selector] = scrollWidth;
       }
 
     } else if (scrollWidth >= needed) {
       selection.classed('narrow', false);
     }
-  };
+  }
 
 
-  ui.togglePanes = function(showPane) {
-    let hidePanes = context.container().selectAll('.map-pane.shown');
-    let side = localizer.textDirection() === 'ltr' ? 'right' : 'left';
+  togglePanes(showPane) {
+    const context = this.context;
+    const l10n = context.localizationSystem();
+    const container = context.container();
+
+    let hidePanes = container.selectAll('.map-pane.shown');
+    const side = l10n.isRTL() ? 'left' : 'right';
 
     hidePanes
       .classed('shown', false)
       .classed('hide', true);
 
-    context.container().selectAll('.map-pane-control button')
+    container.selectAll('.map-pane-control button')
       .classed('active', false);
 
     if (showPane) {
@@ -547,7 +522,7 @@ export function uiInit(context) {
         .classed('hide', true)
         .style(side, '-500px');
 
-      context.container().selectAll('.' + showPane.attr('pane') + '-control button')
+      container.selectAll('.' + showPane.attr('pane') + '-control button')
         .classed('active', true);
 
       showPane
@@ -577,13 +552,8 @@ export function uiInit(context) {
             .classed('hide', true);
         });
     }
-  };
-
+  }
 
-  let _editMenu = uiEditMenu(context);
-  ui.editMenu = function() {
-    return _editMenu;
-  };
 
 
   /* showEditMenu
@@ -591,11 +561,13 @@ export function uiInit(context) {
    * @param  triggerType  String  'touch', 'pen', or 'rightclick' that triggered the menu
    * @param  operations   seems not passed in - code below figures it out.
    */
-  ui.showEditMenu = function(anchorPoint, triggerType, operations) {
-    _editMenu.close();   // remove any displayed menu
+  showEditMenu(anchorPoint, triggerType, operations) {
+    this.editMenu.close();   // remove any displayed menu
 
-    //TODO: Remove this after the behaviors rewrite has completed
-    if (!operations && context.mode().operations) operations = typeof context.mode().operations === 'function' ? context.mode().operations() : context.mode().operations;
+    const context = this.context;
+    const mode = context.mode();
+    //TODO: Remove this after the mode rewrite has completed
+    if (!operations && mode.operations) operations = typeof mode.operations === 'function' ? mode.operations() : mode.operations;
     if (!operations || !operations.length) return;
     if (!context.editable()) return;
 
@@ -605,39 +577,45 @@ export function uiInit(context) {
       surfaceNode.focus();
     }
 
-    operations.forEach(operation => {
-      if (operation.point) operation.point(anchorPoint);
-    });
+    for (const operation of operations) {
+      if (typeof operation.point === 'function') {
+        operation.point(anchorPoint);  // let the operation know where the menu is
+      }
+    }
 
-    _editMenu
+    this.editMenu
       .anchorLoc(context.projection.invert(anchorPoint))
       .triggerType(triggerType)
       .operations(operations);
 
     // render the menu
-    context.map().overlay.call(_editMenu);
-  };
+    context.mapSystem().overlay.call(this.editMenu);
+  }
 
 
   // remove any existing menu no matter how it was added
-  ui.closeEditMenu = function() {
-    _editMenu.close();
-  };
-
-
-  let _saveLoading = d3_select(null);
-  context.uploader()
-    .on('saveStarted.ui', () => {
-      _saveLoading = uiLoading(context)
-        .message(t.html('save.uploading'))
-        .blocking(true);
-      context.container().call(_saveLoading);  // block input during upload
-    })
-    .on('saveEnded.ui', () => {
-      _saveLoading.close();
-      _saveLoading = d3_select(null);
-    });
+  closeEditMenu() {
+    this.editMenu.close();
+  }
+
+
+  _clickBugLink() {
+    let link = new URL('https://github.com/facebook/Rapid/issues/new');
+
+    // From the template we set up at https://github.com/facebook/Rapid/blob/main/.github/ISSUE_TEMPLATE/bug_report.yml
+    link.searchParams.append('template', 'bug_report.yml');
+    const detected = utilDetect();
+    const browser = `${detected.browser} v${detected.version}`;
+    const os = `${detected.os}`;
+    const userAgent = navigator.userAgent;
+
+    link.searchParams.append('browser', browser);
+    link.searchParams.append('os', os);
+    link.searchParams.append('useragent', userAgent);
+    link.searchParams.append('URL', window.location.href);
+    link.searchParams.append('version', this.context.version);
 
+    window.open(link.toString(), '_blank');
+  }
 
-  return ui;
 }
diff --git a/modules/core/UploaderSystem.js b/modules/core/UploaderSystem.js
new file mode 100644
index 0000000000..de800c0b77
--- /dev/null
+++ b/modules/core/UploaderSystem.js
@@ -0,0 +1,449 @@
+import { utilArrayUnion, utilArrayUniq } from '@rapid-sdk/util';
+
+import { AbstractSystem } from './AbstractSystem';
+import { actionDiscardTags } from '../actions/discard_tags';
+import { actionMergeRemoteChanges } from '../actions/merge_remote_changes';
+import { actionNoop } from '../actions/noop';
+import { actionRevert } from '../actions/revert';
+import { Graph } from './lib';
+
+
+
+/**
+ * `UploaderSystem` handles the process of submitting a changeset to OSM
+ *  and dealing with any conflicts that might occur
+ *
+ * Events available:
+ *   // Start and end events are dispatched exactly once each per legitimate outside call to `save`
+ *   'saveStarted'        // dispatched as soon as a call to `save` has been deemed legitimate
+ *   'saveEnded'          // dispatched after the result event has been dispatched
+ *   'willAttemptUpload'  // dispatched before the actual upload call occurs, if it will
+ *   'progressChanged'
+ *
+ *   // Each save results in one of these outcomes:
+ *   'resultNoChanges'   // upload wasn't attempted since there were no edits
+ *   'resultErrors'      // upload failed due to errors
+ *   'resultConflicts'   // upload failed due to data conflicts
+ *   'resultSuccess'     // upload completed without errors
+ */
+export class UploaderSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  `context`   Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'uploader';
+
+    this.changeset = null;    // uiCommit will create it
+
+    this._origChanges = null;
+    this._discardTags = {};
+    this._isSaving = false;
+
+    // variables for conflict checking
+    this._localGraph = null;
+    this._remoteGraph = null;
+    this._toCheckIDs = new Set();
+    this._toLoadIDs = new Set();
+    this._loadedIDs = new Set();
+    this._conflicts = [];
+    this._errors = [];
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this._loadedSome = this._loadedSome.bind(this);
+    this._uploadCallback = this._uploadCallback.bind(this);
+  }
+
+
+  /**
+   * init
+   * Called one time after all objects have been instantiated.
+   */
+  init() {
+    this.context.dataLoaderSystem().get('discarded')
+      .then(d => this._discardTags = d)
+      .catch(() => { /* ignore */ });
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    this.changeset = null;
+  }
+
+
+  /**
+   * isSaving
+   */
+  isSaving() {
+    return this._isSaving;
+  }
+
+
+  /**
+   * save
+   */
+  save(tryAgain, checkConflicts) {
+    // Guard against accidentally entering save code twice - iD#4641
+    if (this._isSaving && !tryAgain) return;
+
+    const context = this.context;
+    const osm = context.services.get('osm');
+    if (!osm) return;
+
+    // If user somehow got logged out mid-save, try to reauthenticate..
+    // This can happen if they were logged in from before, but the tokens are no longer valid.
+    if (!osm.authenticated()) {
+      osm.authenticate(err => {
+        if (!err) {
+          this.save(tryAgain, checkConflicts);  // continue where we left off..
+        }
+      });
+      return;
+    }
+
+    if (!this._isSaving) {
+      this._isSaving = true;
+      this.emit('saveStarted');
+    }
+
+    // reset variables
+    this._localGraph = null;
+    this._remoteGraph = null;
+    this._toCheckIDs = new Set();
+    this._toLoadIDs = new Set();
+    this._loadedIDs = new Set();
+    this._conflicts = [];
+    this._errors = [];
+
+    // Store original changes, in case user wants to download them as an .osc file
+    const editSystem = context.editSystem();
+    this._origChanges = editSystem.changes(actionDiscardTags(editSystem.difference(), this._discardTags));
+
+    // First time, `perform` a no-op action.
+    // Any conflict resolutions will be done as `replace`
+    // Remember to pop this later if needed
+    if (!tryAgain) {
+      editSystem.perform(actionNoop());
+    }
+
+    // Attempt a fast upload first.. If there are conflicts, re-enter with `checkConflicts = true`
+    if (!checkConflicts) {
+      this._tryUpload();
+    } else {
+      this._startConflictCheck();
+    }
+  }
+
+
+  /**
+   * _startConflictCheck
+   */
+  _startConflictCheck() {
+    const context = this.context;
+    const osm = context.services.get('osm');
+    const editSystem = context.editSystem();
+    const summary = editSystem.difference().summary();
+    const graph = context.graph();
+
+    this._localGraph = graph;
+    this._remoteGraph = new Graph(editSystem.base(), true);
+
+    // Gather entityIDs to check
+    // We will load these from the OSM API into the `remoteGraph`
+    this._toCheckIDs = new Set();
+
+    for (const [entityID, item] of summary) {
+      if (item.changeType === 'modified') {
+        const entity = graph.entity(entityID);
+        this._toCheckIDs.add(entityID);   // The modified entity
+
+        for (const child of graph.childNodes(entity)) {  // and any children
+          if (child.version !== undefined) {
+            this._toCheckIDs.add(child.id);
+          }
+        }
+      }
+    }
+
+    this._toLoadIDs = new Set(this._toCheckIDs);
+    this._loadedIDs = new Set();
+
+    if (osm && this._toLoadIDs.size) {
+      this.emit('progressChanged', this._loadedIDs.size, this._toCheckIDs.size);
+      osm.loadMultiple(Array.from(this._toLoadIDs), this._loadedSome);
+    } else {
+      this._tryUpload();
+    }
+  }
+
+
+  // `loadedSome` callback may be called multiple times.
+  // Here we load a batch of remote entities into `remoteGraph`,
+  // then expand the search set if needed and schedule more loading.
+  _loadedSome(err, result) {
+    if (this._errors.length) return;   // give up if there are errors
+
+    if (err) {
+      this._errors.push({
+        msg: err.message || err.responseText,
+        details: [ this.context.t('save.status_code', { code: err.status }) ]
+      });
+      this._didResultInErrors();
+      return;
+    }
+
+    let loadMoreIDs = new Set();
+
+    for (const entity of result.data) {
+      this._remoteGraph.replace(entity);
+      this._loadedIDs.add(entity.id);
+      this._toLoadIDs.delete(entity.id);
+
+      if (!entity.visible) continue;
+
+      // Because `loadMultiple` doesn't download `/full` like `loadEntity`,
+      // expand `_toCheck` set to include children that aren't already being checked..
+      if (entity.type === 'way') {
+        for (const childID of entity.nodes) {
+          if (!this._toCheckIDs.has(childID)) {
+            this._toCheckIDs.add(childID);
+            this._toLoadIDs.add(childID);
+            loadMoreIDs.add(childID);
+          }
+        }
+      } else if (entity.type === 'relation' && entity.isMultipolygon()) {
+        for (const member of entity.members) {
+          if (!this._toCheckIDs.has(member.id)) {
+            this._toCheckIDs.add(member.id);
+            this._toLoadIDs.add(member.id);
+            loadMoreIDs.add(member.id);
+          }
+        }
+      }
+    }
+
+    this.emit('progressChanged', this._loadedIDs.size, this._toCheckIDs.size);
+
+    const osm = this.context.services.get('osm');
+    if (osm && loadMoreIDs.size) {
+      osm.loadMultiple(Array.from(loadMoreIDs), this._loadedSome);
+
+    } else if (!this._toLoadIDs.size) {  // we have loaded everything, continue to the next step
+      this._detectConflicts();
+      this._tryUpload();
+    }
+  }
+
+
+  // Test everything in `_toCheckIDs` for conflicts
+  _detectConflicts() {
+    const l10n = this.context.localizationSystem();
+    const editSystem = this.context.editSystem();
+    const osm = this.context.services.get('osm');
+    if (!osm) return;
+
+    const localGraph = this._localGraph;
+    const remoteGraph = this._remoteGraph;
+
+    for (const entityID of this._toCheckIDs) {
+      const local = localGraph.entity(entityID);
+      const remote = remoteGraph.entity(entityID);
+
+      if (sameVersions(local, remote)) continue;
+
+      // Try a safe merge first
+      const actionSafe = actionMergeRemoteChanges(entityID, {
+        localGraph: localGraph,
+        remoteGraph: remoteGraph,
+        discardTags: this._discardTags,
+        formatUser: formatUser,
+        localize: l10n.t,
+        strategy: 'safe'
+      });
+
+      editSystem.replace(actionSafe);
+
+      const mergeConflicts = actionSafe.conflicts();
+      if (!mergeConflicts.length) continue;  // merged safely
+
+      // present options for destructive merging
+      const actionForceLocal = actionMergeRemoteChanges(entityID, {
+        localGraph: localGraph,
+        remoteGraph: remoteGraph,
+        discardTags: this._discardTags,
+        formatUser: formatUser,
+        localize: l10n.t,
+        strategy: 'force_local'
+      });
+
+      const actionForceRemote = actionMergeRemoteChanges(entityID, {
+        localGraph: localGraph,
+        remoteGraph: remoteGraph,
+        discardTags: this._discardTags,
+        formatUser: formatUser,
+        localize: l10n.t,
+        strategy: 'force_remote'
+      });
+
+      const keepMine = l10n.t('save.conflict.' + (remote.visible ? 'keep_local' : 'restore'));
+      const keepTheirs = l10n.t('save.conflict.' + (remote.visible ? 'keep_remote' : 'delete'));
+
+      this._conflicts.push({
+        id: entityID,
+        name: entityName(local),
+        details: mergeConflicts,
+        chosen: 1,
+        choices: [
+          { id: entityID, text: keepMine, action: () => editSystem.replace(actionForceLocal) },
+          { id: entityID, text: keepTheirs, action: () => editSystem.replace(actionForceRemote) }
+        ]
+      });
+    }
+
+
+    function formatUser(d) {
+      return '<a href="' + osm.userURL(d) + '" target="_blank">' + d + '</a>';
+    }
+
+    function entityName(entity) {
+      return l10n.displayName(entity) || (l10n.displayType(entity.id) + ' ' + entity.id);
+    }
+
+    function sameVersions(local, remote) {
+      if (local.version !== remote.version) return false;
+      if (local.type === 'way') {
+        for (const childID of utilArrayUnion(local.nodes, remote.nodes)) {
+          const a = localGraph.hasEntity(childID);
+          const b = remoteGraph.hasEntity(childID);
+          if (a && b && a.version !== b.version) return false;
+        }
+      }
+      return true;
+    }
+
+  }
+
+
+  // This is called when we are ready to attempt a changeset upload.
+  // If conflicts or errors exist, present them to the user instead.
+  _tryUpload() {
+    const context = this.context;
+    const osm = context.services.get('osm');
+    if (!osm) {
+      this._errors.push({ msg: 'No OSM Service' });
+    }
+    if (!this.changeset) {  // shouldn't happen
+      this._errors.push({ msg: 'No OSM Changeset' });
+    }
+
+    if (this._conflicts.length) {
+      this._didResultInConflicts();
+
+    } else if (this._errors.length) {
+      this._didResultInErrors();
+
+    } else {
+      const editSystem = context.editSystem();
+      const changes = editSystem.changes(actionDiscardTags(editSystem.difference(), this._discardTags));
+      if (changes.modified.length || changes.created.length || changes.deleted.length) {
+        this.emit('willAttemptUpload');
+        osm.putChangeset(this.changeset, changes, this._uploadCallback);
+      } else {
+        // changes were insignificant or reverted by user
+        this._didResultInNoChanges();
+      }
+    }
+  }
+
+
+  _uploadCallback(err, updatedChangeset) {
+    if (updatedChangeset) {
+      this.changeset = updatedChangeset;  // it may have a changeset id now
+    }
+
+    if (err) {
+      if (err.status === 409) {  // 409 Conflict
+        this.save(true, true);  // tryAgain = true, checkConflicts = true
+      } else {
+        this._errors.push({
+          msg: err.message || err.responseText,
+          details: [ this.context.t('save.status_code', { code: err.status }) ]
+        });
+        this._didResultInErrors();
+      }
+
+    } else {
+      this._didResultInSuccess();
+    }
+  }
+
+
+  _didResultInNoChanges() {
+    this.emit('resultNoChanges');
+    this._endSave();
+    this.context.reset();
+  }
+
+
+  _didResultInErrors() {
+    this.context.editSystem().pop();
+    this.emit('resultErrors', this._errors);
+    this._endSave();
+  }
+
+
+  _didResultInConflicts() {
+    this._conflicts.sort((a, b) => b.id.localeCompare(a.id));
+    this.emit('resultConflicts', this.changeset, this._conflicts, this._origChanges);
+    this._endSave();
+  }
+
+
+  _didResultInSuccess() {
+    // delete the edit stack cached to local storage
+    this.context.editSystem().clearSaved();
+    this.emit('resultSuccess', this.changeset);
+
+    // Add delay to allow for postgres replication iD#1646 iD#2678
+    window.setTimeout(() => {
+      this._endSave();
+      this.context.reset();   // will call this.reset() and delete `this.changeset`
+    }, 2500);
+  }
+
+
+  _endSave() {
+    this._isSaving = false;
+    this.emit('saveEnded');
+  }
+
+
+  cancelConflictResolution() {
+    this.context.editSystem().pop();
+  }
+
+
+  processResolvedConflicts() {
+    const editSystem = this.context.editSystem();
+
+    for (const conflict of this._conflicts) {
+      if (conflict.chosen === 1) {   // user chose "use theirs"
+        const entity = this.context.hasEntity(conflict.id);
+        if (entity?.type === 'way') {
+          for (const child of utilArrayUniq(entity.nodes)) {
+            editSystem.replace(actionRevert(child));
+          }
+        }
+        editSystem.replace(actionRevert(conflict.id));
+      }
+    }
+
+    this.save(true, false);  // tryAgain = true, checkConflicts = false
+  }
+}
diff --git a/modules/core/UrlHash.js b/modules/core/UrlHashSystem.js
similarity index 89%
rename from modules/core/UrlHash.js
rename to modules/core/UrlHashSystem.js
index 29fce6936d..916de5d909 100644
--- a/modules/core/UrlHash.js
+++ b/modules/core/UrlHashSystem.js
@@ -1,14 +1,11 @@
-import { EventEmitter } from '@pixi/utils';
 import { utilArrayIdentical, utilObjectOmit, utilQsString, utilStringQs } from '@rapid-sdk/util';
 import throttle from 'lodash-es/throttle';
 
-import { t } from '../core/localizer';
-import { modeSelect } from '../modes/select';
-import { utilDisplayLabel } from '../util';
+import { AbstractSystem } from './AbstractSystem';
 
 
 /**
- * `UrlHash` is responsible for managing the url hash and query parameters.
+ * `UrlHashSystem` is responsible for managing the url hash and query parameters.
  * It updates the `window.location.hash` and document title
  * It also binds to the hashchange event and responds to changes made by the user directly to the url
  *
@@ -20,15 +17,15 @@ import { utilDisplayLabel } from '../util';
  * Events available:
  *   `hashchange`     Fires on hashchange and when enable is called, receives an Object with the current hash params
  */
-export class UrlHash extends EventEmitter {
+export class UrlHashSystem extends AbstractSystem {
 
   /**
    * @constructor
    * @param  `context`  Global shared application context
    */
   constructor(context) {
-    super();
-    this.context = context;
+    super(context);
+    this.id = 'urlhash';
 
     this.doUpdateTitle = true;
     this.titleBase = 'Rapid';
@@ -120,8 +117,8 @@ export class UrlHash extends EventEmitter {
 
     this._prevHash = null;
 
-    this.context.history().on('change.UrlHash', this.deferredUpdateTitle);
-    this.context.on('enter.UrlHash', this.deferredUpdateAll);
+    this.context.editSystem().on('change', this.deferredUpdateTitle);
+    this.context.on('modechange', this.deferredUpdateAll);
     window.addEventListener('hashchange', this.parseHash);
 
     this.parseHash();
@@ -142,8 +139,8 @@ export class UrlHash extends EventEmitter {
     this.deferredUpdateHash.cancel();
     this.deferredUpdateTitle.cancel();
 
-    this.context.history().on('change.UrlHash', null);
-    this.context.on('enter.UrlHash', null);
+    this.context.editSystem().off('change', this.deferredUpdateTitle);
+    this.context.off('modechange', this.deferredUpdateAll);
     window.removeEventListener('hashchange', this.parseHash);
   }
 
@@ -211,7 +208,7 @@ export class UrlHash extends EventEmitter {
     const toOmit = ['id', 'comment', 'source', 'hashtags', 'walkthrough'];
     let params = utilObjectOmit(Object.fromEntries(this._currParams), toOmit);
 
-    // update id  (this shouldn't be here, move to modeSelect?)
+    // update id  (this shouldn't be here, move to select mode?)
     const selectedIDs = context.selectedIDs().filter(id => context.hasEntity(id));
     if (selectedIDs.length) {
       params.id = selectedIDs.join(',');
@@ -234,15 +231,17 @@ export class UrlHash extends EventEmitter {
     if (!this.doUpdateTitle) return;
 
     const context = this.context;
-    const changeCount = context.history().difference().summary().size;
+    const l10n = context.localizationSystem();
+    const editSystem = context.editSystem();
+    const changeCount = editSystem.difference().summary().size;
 
     // Currently only support OSM ids
     let selected;
     const selectedIDs = context.selectedIDs().filter(id => context.hasEntity(id));
     if (selectedIDs.length) {
-      const firstLabel = utilDisplayLabel(context.entity(selectedIDs[0]), context.graph());
+      const firstLabel = l10n.displayLabel(context.entity(selectedIDs[0]), context.graph());
       if (selectedIDs.length > 1) {
-        selected = t('title.labeled_and_more', { labeled: firstLabel, count: selectedIDs.length - 1 });
+        selected = l10n.t('title.labeled_and_more', { labeled: firstLabel, count: selectedIDs.length - 1 });
       } else {
         selected = firstLabel;
       }
@@ -259,7 +258,7 @@ export class UrlHash extends EventEmitter {
 
     let title;
     if (format) {
-      title = t(format, { changes: changeCount, base: this.titleBase, context: selected });
+      title = context.t(format, { changes: changeCount, base: this.titleBase, context: selected });
     } else {
       title = this.titleBase;
     }
@@ -287,8 +286,8 @@ export class UrlHash extends EventEmitter {
     if (typeof q.id === 'string') {
       const ids = q.id.split(',').filter(id => context.hasEntity(id));
       const mode = context.mode();
-      if (ids.length && (mode?.id === 'browse' || (mode?.id === 'select' && !utilArrayIdentical(mode.selectedIDs(), ids)))) {
-        context.enter(modeSelect(context, ids));
+      if (ids.length && (mode?.id === 'browse' || (mode?.id === 'select-osm' && !utilArrayIdentical(mode.selectedIDs(), ids)))) {
+        context.enter('select-osm', { selectedIDs: ids });
       }
     }
 
diff --git a/modules/core/ValidationSystem.js b/modules/core/ValidationSystem.js
new file mode 100644
index 0000000000..886bbd859b
--- /dev/null
+++ b/modules/core/ValidationSystem.js
@@ -0,0 +1,915 @@
+import { Extent } from '@rapid-sdk/math';
+import { utilArrayChunk, utilArrayGroupBy, utilEntityAndDeepMemberIDs } from '@rapid-sdk/util';
+
+import { AbstractSystem } from './AbstractSystem';
+import { Difference } from './lib/Difference';
+import * as Validations from '../validations/index';
+
+const RETRY = 5000;    // wait 5 sec before revalidating provisional entities
+
+
+/**
+ * `ValidationSystem` manages all the validation rules and maintains two caches
+ * containing the validation results:
+ *   `base` is the results of validating the base graph (before user edits)
+ *   `head` is the results of validating the head graph (with user edits applied)
+ *
+ * We do both because that's the only way to know whether to credit a user with
+ * fixing something (or breaking it).  This means that every feaature downloaded
+ * from OSM gets validated.  This system maintains a work queue so that validation
+ * is performed in the backkground during browser idle times.
+ *
+ * It would be even better to do this in a worker process, but workers don't
+ * have easy access to things like the Graph or Edits/History.
+ *
+ * Events available:
+ *   `validated`     Fires after some validation has occurred
+ */
+export class ValidationSystem extends AbstractSystem {
+
+  /**
+   * @constructor
+   * @param  context  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'validator';
+
+    this._rules = new Map();    // Map(ruleID -> validator)
+    this._base = new ValidationCache('base');   // issues before any user edits
+    this._head = new ValidationCache('head');   // issues after all user edits
+
+    this._disabledRuleIDs = new Set();
+    this._ignoredIssueIDs = new Set();
+    this._resolvedIssueIDs = new Set();
+    this._completeDiff = new Map();    // complete diff base -> head of what the user changed
+    this._headIsCurrent = false;
+    this._deferredRIC = new Map();   // Deferred `requestIdleCallback` - Map(handle -> Promise.reject)
+    this._deferredST = new Set();    // Deferred `setTimeout` - Set(handles)
+    this._headPromise = null;        // Promise fulfilled when validation is performed up to headGraph snapshot
+    this._errorOverrides = [];
+    this._warningOverrides = [];
+    this._disableOverrides = [];
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this.validate = this.validate.bind(this);
+    this.validateAsync = this.validateAsync.bind(this);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    // Allow validation severity to be overridden by url queryparams...
+    // See: https://github.com/openstreetmap/iD/pull/8243
+    //
+    // Each param should contain a urlencoded comma separated list of
+    // `type/subtype` rules.  `*` may be used as a wildcard..
+    // Examples:
+    //  `validationError=disconnected_way/*`
+    //  `validationError=disconnected_way/highway`
+    //  `validationError=crossing_ways/bridge*`
+    //  `validationError=crossing_ways/bridge*,crossing_ways/tunnel*`
+    const context = this.context;
+    this._errorOverrides = this._parseHashParam(context.initialHashParams.validationError);
+    this._warningOverrides = this._parseHashParam(context.initialHashParams.validationWarning);
+    this._disableOverrides = this._parseHashParam(context.initialHashParams.validationDisable);
+
+    Object.values(Validations).forEach(validation => {
+      if (typeof validation !== 'function') return;
+      const fn = validation(context);
+      this._rules.set(fn.type, fn);
+    });
+
+    const prefs = context.storageSystem();
+    const disabledRules = prefs.getItem('validate-disabledRules');
+    if (disabledRules) {
+      const ruleIDs = disabledRules.split(',').map(s => s.trim()).filter(Boolean);
+      this._disabledRuleIDs = new Set(ruleIDs);
+    }
+
+
+    // register event handlers:
+
+    // WHEN TO RUN VALIDATION:
+    // When edits occur:
+    context.editSystem()
+      .on('restore', this.validate)   // on restore saved history
+      .on('undone', this.validate)    // on undo
+      .on('redone', this.validate);   // on redo
+
+// todo: find another way to reset this
+//      .on('reset', () => {            // on reset - happens after save, or enter/exit walkthrough
+//        this.reset(false);   // cached issues aren't valid any longer if the history has been reset
+//        this.validateAsync();
+//      });
+      // but not on 'change' (e.g. while drawing)
+
+    // When user changes editing modes (to catch recent changes e.g. drawing)
+    context
+      .on('modechange', this.validate);
+
+    // When merging fetched data, validate base graph:
+    context.editSystem()
+      .on('merge', entityIDs => {
+        if (!entityIDs) return;
+
+        // Make sure the caches have graphs assigned to them.
+        // (we don't do this in `reset` because context is still resetting things and `base()` is unstable then)
+        const baseGraph = context.editSystem().base();
+        if (!this._head.graph) this._head.graph = baseGraph;
+        if (!this._base.graph) this._base.graph = baseGraph;
+
+        entityIDs = this._base.withAllRelatedEntities(entityIDs);  // expand set
+        this._validateEntitiesAsync(entityIDs, this._base);
+      });
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    this._reset(true);
+  }
+
+
+  /**
+   * _parseHashParam
+   * Converts hash parameters for severity overrides to regex matchers
+   * @param   val   the value retrieved, e.g. `crossing_ways/bridge*,crossing_ways/tunnel*`
+   * @return  Array of Objects like { type: RegExp, subtype: RegExp }
+   */
+  _parseHashParam(val = '') {
+    let result = [];
+    const rules = val.split(',').map(s => s.trim()).filter(Boolean);
+    for (const rule of rules) {
+      const parts = rule.split('/', 2);  // "type/subtype"
+      const type = parts[0];
+      const subtype = parts[1] ?? '*';
+      if (!type || !subtype) continue;
+      result.push({ type: makeRegExp(type), subtype: makeRegExp(subtype) });
+    }
+    return result;
+
+    function makeRegExp(str) {
+      const escaped = str
+        .replace(/[-\/\\^$+?.()|[\]{}]/g, '\\$&')   // escape all reserved chars except for the '*'
+        .replace(/\*/g, '.*');                      // treat a '*' like '.*'
+      return new RegExp(`^${escaped}$`);
+    }
+  }
+
+
+  /**
+   * _reset
+   * Cancels deferred work and resets all caches
+   * @param   resetIgnored    `true` to also clear the list of user-ignored issues
+   */
+  _reset(resetIgnored = false) {
+    // empty queues
+    this._base.queue = [];
+    this._head.queue = [];
+
+    // cancel deferred work and reject any pending promise
+    for (const [handle, reject] of this._deferredRIC) {
+      window.cancelIdleCallback(handle);
+      reject();
+    }
+    this._deferredRIC.clear();
+
+    for (const handle of this._deferredST) {
+      window.clearTimeout(handle);
+    }
+    this._deferredST.clear();
+
+    // clear caches
+    if (resetIgnored) this._ignoredIssueIDs.clear();
+    this._resolvedIssueIDs.clear();
+    this._base = new ValidationCache('base');
+    this._head = new ValidationCache('head');
+    this._completeDiff = new Map();
+    this._headIsCurrent = false;
+  }
+
+
+
+  /**
+   * resetIgnoredIssues
+   * Clears out the `_ignoredIssueIDs` Set
+   */
+  resetIgnoredIssues() {
+    this._ignoredIssueIDs.clear();
+    this.emit('validated');   // redraw UI
+  }
+
+
+  /**
+   * revalidateUnsquare
+   * Called whenever the user changes the unsquare threshold
+   * It reruns just the "unsquare_way" validation on all buildings.
+   */
+  revalidateUnsquare() {
+    const checkUnsquareWay = this._rules.get('unsquare_way');
+    if (typeof checkUnsquareWay !== 'function') return;
+
+    const revalidate = (cache) => {
+      if (!cache.graph) return;
+
+      cache.uncacheIssuesOfType('unsquare_way');   // uncache existing
+
+      // rerun for all buildings
+      const tree = this.context.editSystem().tree();
+      const buildings = tree.intersects(new Extent([-180,-90],[180, 90]), cache.graph)  // everywhere
+        .filter(entity => (entity.type === 'way' && entity.tags.building && entity.tags.building !== 'no'));
+
+      for (const entity of buildings) {
+        const detected = checkUnsquareWay(entity, cache.graph);
+        if (!detected.length) continue;
+        cache.cacheIssues(detected);
+      }
+    };
+
+    revalidate(this._head);
+    revalidate(this._base);
+    this.emit('validated');
+  }
+
+
+  /**
+   * getIssues
+   * Gets all issues that match the given options
+   * This is called by many other places
+   *
+   * @param  `options` Object like:
+   *   {
+   *     what: 'all',                  // 'all' or 'edited'
+   *     where: 'all',                 // 'all' or 'visible'
+   *     includeIgnored: false,        // true, false, or 'only'
+   *     includeDisabledRules: false   // true, false, or 'only'
+   *   }
+   *
+   * @return  An Array containing the issues
+   */
+  getIssues(options) {
+    const opts = Object.assign({ what: 'all', where: 'all', includeIgnored: false, includeDisabledRules: false }, options);
+    const context = this.context;
+    const view = context.mapSystem().extent();
+    let seen = new Set();
+    let results = [];
+
+    // Filter the issue set to include only what the calling code wants to see.
+    // Note that we use `context.graph()`/`context.hasEntity()` here, not `cache.graph`,
+    // because that is the graph that the calling code will be using.
+    const filter = (issue) => {
+      if (!issue) return false;
+      if (seen.has(issue.id)) return false;
+      if (this._resolvedIssueIDs.has(issue.id)) return false;
+      if (opts.includeDisabledRules === 'only' && !this._disabledRuleIDs.has(issue.type)) return false;
+      if (!opts.includeDisabledRules && this._disabledRuleIDs.has(issue.type)) return false;
+
+      if (opts.includeIgnored === 'only' && !this._ignoredIssueIDs.has(issue.id)) return false;
+      if (!opts.includeIgnored && this._ignoredIssueIDs.has(issue.id)) return false;
+
+      // This issue may involve an entity that doesn't exist in context.graph()
+      // This can happen because validation is async and rendering the issue lists is async.
+      if ((issue.entityIds || []).some(id => !context.hasEntity(id))) return false;
+
+      if (opts.where === 'visible') {
+        const extent = issue.extent(context.graph());
+        if (!view.intersects(extent)) return false;
+      }
+
+      return true;
+    };
+
+
+    // collect head issues - present in the user edits
+    if (this._head.graph && this._head.graph !== this._base.graph) {
+      const issues = [ ...this._head.issues.values() ];
+      for (const issue of issues) {
+        // In the head cache, only count features that the user is responsible for - iD#8632
+        // For example, a user can undo some work and an issue will still present in the
+        // head graph, but we don't want to credit the user for causing that issue.
+        const userModified = (issue.entityIds || []).some(entityID => this._completeDiff.has(entityID));
+        if (opts.what === 'edited' && !userModified) continue;   // present in head but user didn't touch it
+
+        if (!filter(issue)) continue;
+        seen.add(issue.id);
+        results.push(issue);
+      }
+    }
+
+    // collect base issues - present before user edits
+    if (opts.what === 'all') {
+      const issues = [ ...this._base.issues.values() ];
+      for (const issue of issues) {
+        if (!filter(issue)) continue;
+        seen.add(issue.id);
+        results.push(issue);
+      }
+    }
+
+    return results;
+  }
+
+
+  /**
+   * getResolvedIssues
+   * Gets the issues that have been fixed by the user.
+   * Resolved issues are tracked in the `_resolvedIssueIDs` Set,
+   * and they should all be issues that exist in the base cache.
+   *
+   * @return  An Array containing the issues
+   */
+  getResolvedIssues() {
+    return Array.from(this._resolvedIssueIDs)
+      .map(issueID => this._base.issues.get(issueID))
+      .filter(Boolean);
+  }
+
+
+  /**
+   * focusIssue
+   * Adjusts the map to focus on the given issue.
+   * (requires the issue to have a reasonable extent defined)
+   * @param   The Issue to focus on
+   */
+  focusIssue(issue) {
+    // Note that we use `context.graph()`/`context.hasEntity()` here, not `cache.graph`,
+    // because that is the graph that the calling code will be using.
+    const context = this.context;
+    const graph = context.graph();
+    let selectID;
+    let focusCenter;
+
+    // Try to focus the map at the center of the issue..
+    const issueExtent = issue.extent(graph);
+    if (issueExtent) {
+      focusCenter = issueExtent.center();
+    }
+
+    // Try to select the first entity in the issue..
+    if (issue.entityIds && issue.entityIds.length) {
+      selectID = issue.entityIds[0];
+
+      // If a relation, focus on one of its members instead.
+      // Otherwise we might be focusing on a part of map where the relation is not visible.
+      if (selectID && selectID.charAt(0) === 'r') {   // relation
+        const ids = utilEntityAndDeepMemberIDs([selectID], graph);
+        let nodeID = ids.find(id => id.charAt(0) === 'n' && graph.hasEntity(id));
+
+        if (!nodeID) {  // relation has no downloaded nodes to focus on
+          const wayID = ids.find(id => id.charAt(0) === 'w' && graph.hasEntity(id));
+          if (wayID) {
+            nodeID = graph.entity(wayID).first();   // focus on the first node of this way
+          }
+        }
+
+        if (nodeID) {
+          focusCenter = graph.entity(nodeID).loc;
+        }
+      }
+    }
+
+    if (focusCenter) {  // Adjust the view
+      const setZoom = Math.max(context.mapSystem().zoom(), 19);
+      context.mapSystem().centerZoomEase(focusCenter, setZoom);
+    }
+
+    if (selectID) {  // Enter select mode
+      window.setTimeout(() => {
+        context.enter('select-osm', { selectedIDs: [selectID] });
+        this.emit('focusedIssue', issue);
+      }, 250);  // after ease
+    }
+  }
+
+
+  /**
+   * getIssuesBySeverity
+   * Gets the issues then groups them by error/warning
+   * (This just calls `getIssues`, then puts issues in groups)
+   * @param   options  - see `getIssues`
+   * @return  Object result like:
+   *   {
+   *     error:    Array of errors,
+   *     warning:  Array of warnings
+   *   }
+   */
+  getIssuesBySeverity(options) {
+    let groups = utilArrayGroupBy(this.getIssues(options), 'severity');
+    groups.error = groups.error ?? [];
+    groups.warning = groups.warning ?? [];
+    return groups;
+  }
+
+
+  /**
+   * getSharedEntityIssues
+   * Gets the issues that the given entityIDs have in common, matching the given options
+   * (This just calls `getIssues`, then filters for the given entity IDs)
+   * The issues are sorted for relevance
+   *
+   * @param   entityIDs  Array or Set of entityIDs to get issues for
+   * @param   options  - see `getIssues`
+   * @return  An Array containing the issues
+   */
+  getSharedEntityIssues(entityIDs, options) {
+    const orderedIssueTypes = [                 // Show some issue types in a particular order:
+      'missing_tag', 'missing_role',            // - missing data first
+      'outdated_tags', 'mismatched_geometry',   // - identity issues
+      'crossing_ways', 'almost_junction',       // - geometry issues where fixing them might solve connectivity issues
+      'disconnected_way', 'impossible_oneway'   // - finally connectivity issues
+    ];
+
+    const allIssues = this.getIssues(options);
+    const forEntityIDs = new Set(entityIDs);
+
+    return allIssues
+      .filter(issue => (issue.entityIds ?? []).some(entityID => forEntityIDs.has(entityID)))
+      .sort((issue1, issue2) => {
+        if (issue1.type === issue2.type) {             // issues of the same type, sort deterministically
+          return issue1.id < issue2.id ? -1 : 1;
+        }
+        const index1 = orderedIssueTypes.indexOf(issue1.type);
+        const index2 = orderedIssueTypes.indexOf(issue2.type);
+        if (index1 !== -1 && index2 !== -1) {          // both issue types have explicit sort orders
+          return index1 - index2;
+        } else if (index1 === -1 && index2 === -1) {   // neither issue type has an explicit sort order, sort by type
+          return issue1.type < issue2.type ? -1 : 1;
+        } else {                                       // order explicit types before everything else
+          return index1 !== -1 ? -1 : 1;
+        }
+      });
+  }
+
+
+  /**
+   * getEntityIssues
+   * This just calls `getSharedEntityIssues` for the given entityID
+   *
+   * @param   entityID  entityID to get issues for
+   * @param   options  - see `getIssues`
+   * @return  An Array containing the issues
+   */
+  getEntityIssues(entityID, options) {
+    return this.getSharedEntityIssues([entityID], options);
+  }
+
+
+  /**
+   * getRuleKeys
+   * @return  An Array containing the rule keys
+   */
+  getRuleKeys() {
+    return [...this._rules.keys()];
+  }
+
+
+  /**
+   * isRuleEnabled
+   * @param   ruleID  the ruleID (e.g. 'crossing_ways')
+   * @return  true/false
+   */
+  isRuleEnabled(ruleID) {
+    return !this._disabledRuleIDs.has(ruleID);
+  }
+
+
+  /**
+   * toggleRule
+   * Toggles a single validation rule,
+   * then reruns the validation so that the user sees something happen in the UI
+   * @param   ruleID  the rule to toggle (e.g. 'crossing_ways')
+   */
+  toggleRule(ruleID) {
+    if (this._disabledRuleIDs.has(ruleID)) {
+      this._disabledRuleIDs.delete(ruleID);
+    } else {
+      this._disabledRuleIDs.add(ruleID);
+    }
+
+    const prefs = this.context.storageSystem();
+    prefs.setItem('validate-disabledRules', [...this._disabledRuleIDs].join(','));
+    this.validateAsync();
+  }
+
+
+  /**
+   * disableRules
+   * Disables given validation rules,
+   * then reruns the validation so that the user sees something happen in the UI
+   * @param   ruleIDs  Complete set of rules that should be disabled
+   */
+  disableRules(ruleIDs = []) {
+    this._disabledRuleIDs = new Set(ruleIDs);
+
+    const prefs = this.context.storageSystem();
+    prefs.setItem('validate-disabledRules', [...this._disabledRuleIDs].join(','));
+    this.validateAsync();
+  }
+
+
+  /**
+   * ignoreIssue
+   * Don't show the given issue in lists
+   * @param   issueID   the issueID to ignore
+   */
+  ignoreIssue(issueID) {
+    this._ignoredIssueIDs.add(issueID);
+  }
+
+
+  /**
+   * validateAsync
+   * Validates anything that has changed in the head graph since the last time it was run.
+   * (head graph contains user's edits)
+   * Returns a Promise fulfilled when the validation has completed and then emits a `validated` event.
+   * This may take time but happen in the background during browser idle time.
+   * @return  Promise fulfilled when validation is completed.
+   */
+  validateAsync() {
+    // Make sure the caches have graphs assigned to them.
+    // (we don't do this in `reset` because context is still resetting things and `base()` is unstable then)
+    const context = this.context;
+    const baseGraph = context.editSystem().base();
+    if (!this._head.graph) this._head.graph = baseGraph;
+    if (!this._base.graph) this._base.graph = baseGraph;
+
+    const prevGraph = this._head.graph;
+    const currGraph = context.graph();
+
+    if (currGraph === prevGraph) {   // this._head.graph is current - we are caught up
+      this._headIsCurrent = true;
+      this.emit('validated');
+      return Promise.resolve();
+    }
+
+    if (this._headPromise) {         // Validation already in process, but we aren't caught up to current
+      this._headIsCurrent = false;   // We will need to catch up after the validation promise fulfills
+      return this._headPromise;
+    }
+
+    // If we get here, its time to start validating stuff.
+    this._head.graph = currGraph;  // take snapshot
+    this._completeDiff = context.editSystem().difference().complete();
+    const incrementalDiff = new Difference(prevGraph, currGraph);
+    let entityIDs = [...incrementalDiff.complete().keys()];
+    entityIDs = this._head.withAllRelatedEntities(entityIDs);  // expand set
+
+    if (!entityIDs.size) {
+      this.emit('validated');
+      return Promise.resolve();
+    }
+
+    this._headPromise = this._validateEntitiesAsync(entityIDs, this._head)
+      .then(() => this._updateResolvedIssues(entityIDs))
+      .then(() => this.emit('validated'))
+      .catch(e => console.error(e))  // eslint-disable-line
+      .then(() => {
+        this._headPromise = null;
+        if (!this._headIsCurrent) {
+          this.validateAsync();   // run it again to catch up to current graph
+        }
+      });
+
+    return this._headPromise;
+  }
+
+
+  /**
+   * validate
+   * Legacy name - `validate` was always an async Promise-returning function.
+   * We now name these things like `validateAsync()`, but legacy code may still call `validate()`
+   * @return  Promise fulfilled when validation is completed.
+   */
+  validate() {
+    return this.validateAsync();
+  }
+
+
+  /**
+   * _validateEntity
+   * Runs all validation rules on a single entity.
+   * Some things to note:
+   *  - Graph is passed in from whenever the validation was started.  Validators shouldn't use
+   *   `context.graph()` because this all happens async, and the graph might have changed
+   *   (for example, nodes getting deleted before the validation can run)
+   *  - Validator functions may still be waiting on something and return a "provisional" result.
+   *    In this situation, we will schedule to revalidate the entity sometime later.
+   *
+   * @param  entity   The entity
+   * @param  graph    graph containing the entity
+   * @return Object result like:
+   *   {
+   *     issues:       Array of detected issues
+   *     provisional:  `true` if provisional result, `false` if final result
+   *   }
+   */
+  _validateEntity(entity, graph) {
+
+    // If there are any override rules that match the issue type/subtype,
+    // adjust severity (or disable it) and keep/discard as quickly as possible.
+    const applySeverityOverrides = (issue) => {
+      const type = issue.type;
+      const subtype = issue.subtype ?? '';
+
+      for (const error of this._errorOverrides) {
+        if (error.type.test(type) && error.subtype.test(subtype)) {
+          issue.severity = 'error';
+          return true;
+        }
+      }
+      for (const warning of this._warningOverrides) {
+        if (warning.type.test(type) && warning.subtype.test(subtype)) {
+          issue.severity = 'warning';
+          return true;
+        }
+      }
+      for (const disable of this._disableOverrides) {
+        if (disable.type.test(type) && disable.subtype.test(subtype)) {
+          return false;
+        }
+      }
+      return true;
+    };
+
+
+    let result = { issues: [], provisional: false };
+    for (const [key, rule] of this._rules) {   // run all validators
+      if (typeof rule !== 'function') {
+        console.error(`no such validation rule = ${key}`);  // eslint-disable-line no-console
+        continue;
+      }
+      let detected = rule(entity, graph);
+      if (detected.provisional) {  // this validation should be run again later
+        result.provisional = true;
+      }
+
+      detected = detected.filter(applySeverityOverrides);
+      result.issues = result.issues.concat(detected);
+    }
+
+    return result;
+  }
+
+
+  /**
+   * _updateResolvedIssues
+   * Determine if any issues were resolved for the given entities.
+   * This is called by `validateAsync()` after validation of the head graph
+   *
+   * Give the user credit for fixing an issue if:
+   * - the issue is in the base cache
+   * - the issue is not in the head cache
+   * - the user did something to one of the entities involved in the issue
+   *
+   * @param  entityIDs  Array or Set containing entity IDs.
+   */
+  _updateResolvedIssues(entityIDs = []) {
+    for (const entityID of entityIDs) {
+      const issues = this._base.entityIssueIDs.get(entityID) ?? [];
+      for (const issueID of issues) {
+        // Check if the user did something to one of the entities involved in this issue.
+        // (This issue could involve multiple entities, e.g. disconnected routable features)
+        const issue = this._base.issues.get(issueID);
+        const userModified = (issue?.entityIds || []).some(entityID => this._completeDiff.has(entityID));
+
+        if (userModified && !this._head.issues.has(issueID)) {  // issue seems fixed
+          this._resolvedIssueIDs.add(issueID);
+        } else {                                   // issue still not resolved
+          this._resolvedIssueIDs.delete(issueID);  // (did undo, or possibly fixed and then re-caused the issue)
+        }
+      }
+    }
+  }
+
+
+  /**
+   * _validateEntitiesAsync
+   * Schedule validation for many entities.
+   *
+   * @param  entityIDs  Array or Set containing entityIDs.
+   * @param  graph      the graph to validate that contains those entities
+   * @param  cache      the cache to store results in (_head or _base)
+   *
+   * Returns
+   *   A Promise fulfilled when the validation has completed.
+   *   This may take time but happen in the background during browser idle time.
+   */
+  _validateEntitiesAsync(entityIDs, cache) {
+    // Enqueue the work
+    const jobs = Array.from(entityIDs).map(entityID => {
+      if (cache.queuedEntityIDs.has(entityID)) return null;  // queued already
+      cache.queuedEntityIDs.add(entityID);
+
+      // Clear caches for existing issues related to this entity
+      cache.uncacheEntityID(entityID);
+
+      return () => {
+        cache.queuedEntityIDs.delete(entityID);
+
+        const graph = cache.graph;
+        if (!graph) return;  // was reset?
+
+        const entity = graph.hasEntity(entityID);   // Sanity check: don't validate deleted entities
+        if (!entity) return;
+
+        // detect new issues and update caches
+        const result = this._validateEntity(entity, graph);
+        if (result.provisional) {                       // provisional result
+          cache.provisionalEntityIDs.add(entityID);     // we'll need to revalidate this entity again later
+        }
+
+        cache.cacheIssues(result.issues);   // update cache
+      };
+
+    }).filter(Boolean);
+
+
+    // Perform the work in chunks.
+    // Because this will happen during idle callbacks, we want to choose a chunk size
+    // that won't make the browser stutter too badly.
+    cache.queue = cache.queue.concat(utilArrayChunk(jobs, 50));
+
+    // Perform the work
+    if (cache.queuePromise) return cache.queuePromise;
+
+    cache.queuePromise = this._processQueue(cache)
+      .then(() => this._revalidateProvisionalEntities(cache))
+      .catch(e => console.error(e))  // eslint-disable-line
+      .finally(() => cache.queuePromise = null);
+
+    return cache.queuePromise;
+  }
+
+
+  /**
+   * _revalidateProvisionalEntities
+   * Sometimes a validator will return a "provisional" result.
+   * In this situation, we'll need to revalidate the entity later.
+   * This function waits a delay, then places them back into the validation queue.
+   *
+   * @param  cache  The cache (_head or _base)
+   */
+  _revalidateProvisionalEntities(cache) {
+    if (!cache.provisionalEntityIDs.size) return;  // nothing to do
+
+    const handle = window.setTimeout(() => {
+      this._deferredST.delete(handle);
+      if (!cache.provisionalEntityIDs.size) return;  // nothing to do
+      this._validateEntitiesAsync(cache.provisionalEntityIDs, cache);
+    }, RETRY);
+
+    this._deferredST.add(handle);
+  }
+
+
+  /**
+   * _processQueue
+   * Process the next chunk of deferred validation work
+   * @param   cache   The cache (_head or _base)
+   * @return  A Promise fulfilled when the validation has completed.
+   *   This may take time but happen in the background during browser idle time.
+   */
+  _processQueue(cache) {
+    // console.log(`${cache.which} queue length ${cache.queue.length}`);
+
+    if (!cache.queue.length) return Promise.resolve();  // we're done
+    const chunk = cache.queue.pop();
+
+    return new Promise((resolve, reject) => {
+        const handle = window.requestIdleCallback(() => {
+          this._deferredRIC.delete(handle);
+          // const t0 = performance.now();
+          chunk.forEach(job => job());
+          // const t1 = performance.now();
+          // console.log('chunk processed in ' + (t1 - t0) + ' ms');
+          resolve();
+        });
+        this._deferredRIC.set(handle, reject);
+      })
+      .then(() => { // dispatch an event sometimes to redraw various UI things
+        if (cache.queue.length % 100 === 0) {
+          this.emit('validated');
+        }
+      })
+      .then(() => this._processQueue(cache));
+  }
+}
+
+
+
+/**
+ * `ValidationCache`
+ * Creates a cache to store validation state
+ * We create 2 of these:
+ *   `base` for validation on the base graph (unedited)
+ *   `head` for validation on the head graph (user edits applied)
+ */
+class ValidationCache {
+
+  /**
+   * @constructor
+   * @param  which String 'base' or 'head' to keep track of it
+   */
+  constructor(which) {
+    this.which = which;
+    this.graph = null;
+    this.queue = [];
+    this.queuePromise = null;
+    this.queuedEntityIDs = new Set();
+    this.provisionalEntityIDs = new Set();
+    this.issues = new Map();          // Map(issue.id -> issue)
+    this.entityIssueIDs = new Map();  // Map(entity.id -> Set(issue.id))
+  }
+
+
+  cacheIssue(issue) {
+    for (const entityID of issue.entityIds ?? []) {
+      let issueIDs = this.entityIssueIDs.get(entityID);
+      if (!issueIDs) {
+        issueIDs = new Set();
+        this.entityIssueIDs.set(entityID, issueIDs);
+      }
+      issueIDs.add(issue.id);
+    }
+    this.issues.set(issue.id, issue);
+  }
+
+
+  uncacheIssue(issue) {
+    for (const entityID of issue.entityIds ?? []) {
+      let issueIDs = this.entityIssueIDs.get(entityID);
+      if (issueIDs) {
+        issueIDs.delete(issue.id);
+        if (!issueIDs.size) {
+          this.entityIssueIDs.delete(entityID);
+        }
+      }
+    }
+    this.issues.delete(issue.id);
+  }
+
+
+  cacheIssues(issues = []) {
+    for (const issue of issues) {
+      this.cacheIssue(issue);
+    }
+  }
+
+
+  uncacheIssues(issues = []) {
+    for (const issue of issues) {
+      this.uncacheIssue(issue);
+    }
+  }
+
+
+  uncacheIssuesOfType(type) {
+    const issues = [ ...this.issues.values() ];
+    const issuesOfType = issues.filter(issue => issue.type === type);
+    this.uncacheIssues(issuesOfType);
+  }
+
+
+  // Remove a single entity and all its related issues from the caches
+  uncacheEntityID(entityID) {
+    const issueIDs = this.entityIssueIDs.get(entityID) ?? [];
+    for (const issueID of issueIDs) {
+      const issue = this.issues.get(issueID);
+      if (issue) {
+        this.uncacheIssue(issue);
+      }
+    }
+
+    this.entityIssueIDs.delete(entityID);
+    this.provisionalEntityIDs.delete(entityID);
+  }
+
+
+  // Return the expandeded set of entityIDs related to issues for the given entityIDs
+  // @param   entityIDs  Array or Set containing entityIDs.
+  // @return  Set of entityIDs related to the given entityIDs
+  withAllRelatedEntities(entityIDs = []) {
+    let results = new Set();
+    for (const entityID of entityIDs) {
+      results.add(entityID);  // include self
+
+      const issueIDs = this.entityIssueIDs.get(entityID) ?? [];
+      for (const issueID of issueIDs) {
+        const issue = this.issues.get(issueID);
+        const relatedEntityIDs = issue?.entityIDs ?? [];
+        for (const relatedEntityID of relatedEntityIDs) {
+          results.add(relatedEntityID);
+        }
+      }
+    }
+
+    return results;
+  }
+}
diff --git a/modules/core/context.js b/modules/core/context.js
deleted file mode 100644
index c3bc280054..0000000000
--- a/modules/core/context.js
+++ /dev/null
@@ -1,733 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { select as d3_select } from 'd3-selection';
-import { Projection, geoScaleToZoom } from '@rapid-sdk/math';
-import { utilStringQs, utilUnicodeCharsTruncated } from '@rapid-sdk/util';
-import _debounce from 'lodash-es/debounce';
-
-import { t } from '../core/localizer';
-import { coreRapidContext } from './rapid_context';
-import { fileFetcher } from './file_fetcher';
-import { localizer } from './localizer';
-import { prefs } from './preferences';
-import { coreHistory } from './history';
-import { coreValidator } from './validator';
-import { coreUploader } from './uploader';
-import { UrlHash } from './UrlHash';
-
-import { BehaviorDrag } from '../behaviors/BehaviorDrag';
-import { BehaviorDraw } from '../behaviors/BehaviorDraw';
-import { BehaviorHover } from '../behaviors/BehaviorHover';
-import { BehaviorLasso } from '../behaviors/BehaviorLasso';
-import { BehaviorMapInteraction } from '../behaviors/BehaviorMapInteraction';
-import { BehaviorMapNudging } from '../behaviors/BehaviorMapNudging';
-import { BehaviorPaste } from '../behaviors/BehaviorPaste';
-import { BehaviorSelect } from '../behaviors/BehaviorSelect';
-
-import { ModeAddNote } from '../modes/ModeAddNote';
-import { ModeAddPoint } from '../modes/ModeAddPoint';
-import { ModeBrowse } from '../modes/ModeBrowse';
-import { ModeDragNode } from '../modes/ModeDragNode';
-import { ModeDrawArea } from '../modes/ModeDrawArea';
-import { ModeDrawLine } from '../modes/ModeDrawLine';
-import { ModeMove } from '../modes/ModeMove';
-import { ModeRotate } from '../modes/ModeRotate';
-import { ModeSave } from '../modes/ModeSave';
-import { ModeSelect } from '../modes/ModeSelect';  // new
-import { modeSelect } from '../modes/select';      // legacy
-
-import { presetManager } from '../presets';
-import { rendererFeatures, RendererImagery, RendererMap, RendererPhotos } from '../renderer';
-import { services } from '../services';
-import { uiInit } from '../ui/init';
-import { utilKeybinding, utilRebind } from '../util';
-
-
-
-export function coreContext() {
-  const dispatch = d3_dispatch('enter', 'exit');
-  let context = utilRebind({}, dispatch, 'on');
-  let _deferred = new Set();
-
-  context.version = '2.0.3';
-  context.privacyVersion = '20201202';
-
-  // `context.initialHashParams` is older, try to use `context.urlhash()` instead
-  context.initialHashParams = window.location.hash ? utilStringQs(window.location.hash) : {};
-  context.isFirstSession = !prefs('sawSplash') && !prefs('sawPrivacyVersion');
-
-  /* Changeset */
-  // An osmChangeset object. Not loaded until needed.
-  context.changeset = null;
-
-  let _defaultChangesetComment = context.initialHashParams.comment;
-  let _defaultChangesetSource = context.initialHashParams.source;
-  let _defaultChangesetHashtags = context.initialHashParams.hashtags;
-  context.defaultChangesetComment = function(val) {
-    if (!arguments.length) return _defaultChangesetComment;
-    _defaultChangesetComment = val;
-    return context;
-  };
-  context.defaultChangesetSource = function(val) {
-    if (!arguments.length) return _defaultChangesetSource;
-    _defaultChangesetSource = val;
-    return context;
-  };
-  context.defaultChangesetHashtags = function(val) {
-    if (!arguments.length) return _defaultChangesetHashtags;
-    _defaultChangesetHashtags = val;
-    return context;
-  };
-
-
-  /* User interface and keybinding */
-  let _ui;
-  context.ui = () => _ui;
-  // AFAICT `lastPointerType` is just used to localize the intro? for now - instead get this from pixi?
-  // context.lastPointerType = () => _ui.lastPointerType();
-  context.lastPointerType = () => 'mouse';
-
-  let _keybinding = utilKeybinding('context');
-  context.keybinding = () => _keybinding;
-  d3_select(document).call(_keybinding);
-
-
-  // Assign `connection` here because it doesn't require passing in
-  // `context` and it's needed for pre-init calls like `preauth`
-  let _connection = services.osm;
-  let _history;
-  let _uploader;
-  let _urlhash;
-  let _validator;
-  context.connection = () => _connection;
-  context.history = () => _history;
-  context.uploader = () => _uploader;
-  context.urlhash = () => _urlhash;
-  context.validator = () => _validator;
-
-  /* Connection */
-  context.preauth = (options) => {
-    if (_connection) {
-      _connection.switch(options);
-    }
-    return context;
-  };
-
-  /* connection options for source switcher (optional) */
-  let _apiConnections;
-  context.apiConnections = function(val) {
-    if (!arguments.length) return _apiConnections;
-    _apiConnections = val;
-    return context;
-  };
-
-
-  // A String or Array of locale codes to prefer over the browser's settings
-  context.locale = function(locale) {
-    if (!arguments.length) return localizer.localeCode();
-    localizer.preferredLocaleCodes(locale);
-    return context;
-  };
-
-
-  function afterLoad(cid, callback) {
-    return (err, result) => {
-      if (err) {
-        // 400 Bad Request, 401 Unauthorized, 403 Forbidden..
-        if (err.status === 400 || err.status === 401 || err.status === 403) {
-          if (_connection) {
-            _connection.logout();
-          }
-        }
-        if (typeof callback === 'function') {
-          callback(err);
-        }
-        return;
-
-      } else if (_connection && _connection.getConnectionId() !== cid) {
-        if (typeof callback === 'function') {
-          callback({ message: 'Connection Switched', status: -1 });
-        }
-        return;
-
-      } else {
-        _history.merge(result.data, result.seenIDs);
-        if (typeof callback === 'function') {
-          callback(err, result);
-        }
-        return;
-      }
-    };
-  }
-
-
-  context.loadTiles = (projection, callback) => {
-    const MINZOOM = 15;
-    const TILESIZE = 256;
-
-    const z = geoScaleToZoom(projection.scale(), TILESIZE);
-    if (z < MINZOOM) return;  // this would fire off too many API requests
-
-    const handle = window.requestIdleCallback(() => {
-      _deferred.delete(handle);
-
-      // `projection` may have changed in the time it took to requestIdleCallback!
-      // Double-check that user hasn't zoomed out more in that time.
-      const z = geoScaleToZoom(projection.scale(), TILESIZE);
-      if (z < MINZOOM) return;  // this would fire off too many API requests
-
-      if (_connection && context.editable()) {
-        const cid = _connection.getConnectionId();
-        _connection.loadTiles(projection, afterLoad(cid, callback));
-      }
-    });
-    _deferred.add(handle);
-  };
-
-  context.loadTileAtLoc = (loc, callback) => {
-    const handle = window.requestIdleCallback(() => {
-      _deferred.delete(handle);
-      if (_connection && context.editable()) {
-        const cid = _connection.getConnectionId();
-        _connection.loadTileAtLoc(loc, afterLoad(cid, callback));
-      }
-    });
-    _deferred.add(handle);
-  };
-
-  // Download the full entity and its parent relations. The callback may be called multiple times.
-  context.loadEntity = (entityID, callback) => {
-    if (_connection) {
-      const cid = _connection.getConnectionId();
-      _connection.loadEntity(entityID, afterLoad(cid, callback));
-      // We need to fetch the parent relations separately.
-      _connection.loadEntityRelations(entityID, afterLoad(cid, callback));
-    }
-  };
-
-  context.zoomToEntity = (entityID, zoomTo) => {
-    let entity = context.hasEntity(entityID);
-
-    if (entity) {   // have it already
-      context.enter(modeSelect(context, [entityID]));
-      if (zoomTo !== false) {
-        _map.zoomTo(entity);
-      }
-
-    } else {   // need to load it first
-      context.loadEntity(entityID, (err, result) => {
-        if (err) return;
-        const entity = result.data.find(e => e.id === entityID);
-        if (!entity) return;
-
-        context.enter(modeSelect(context, [entityID]));
-        if (zoomTo !== false) {
-          _map.zoomTo(entity);
-        }
-      });
-    }
-  };
-
-
-  // String length limits in Unicode characters, not JavaScript UTF-16 code units
-  context.maxCharsForTagKey = () => 255;
-  context.maxCharsForTagValue = () => 255;
-  context.maxCharsForRelationRole = () => 255;
-
-  function cleanOsmString(val, maxChars) {
-    // be lenient with input
-    if (val === undefined || val === null) {
-      val = '';
-    } else {
-      val = val.toString();
-    }
-
-    // remove whitespace
-    val = val.trim();
-
-    // use the canonical form of the string
-    if (val.normalize) val = val.normalize('NFC');
-
-    // trim to the number of allowed characters
-    return utilUnicodeCharsTruncated(val, maxChars);
-  }
-  context.cleanTagKey = (val) => cleanOsmString(val, context.maxCharsForTagKey());
-  context.cleanTagValue = (val) => cleanOsmString(val, context.maxCharsForTagValue());
-  context.cleanRelationRole = (val) => cleanOsmString(val, context.maxCharsForRelationRole());
-
-
-  /* History */
-  let _inIntro = false;
-  context.inIntro = function(val) {
-    if (!arguments.length) return _inIntro;
-
-    _inIntro = val;
-
-    if (_urlhash) {
-      if (val) {
-        _urlhash.disable();
-      } else {
-        _urlhash.enable();
-      }
-    }
-    return context;
-  };
-
-
-  // Immediately save the user's history to localstorage, if possible
-  // This is called sometimes, but also on the `window.onbeforeunload` handler
-  context.save = () => {
-    // no history save, no message onbeforeunload
-    if (_inIntro || context.container().select('.modal').size()) return;
-
-    let canSave;
-    if (context._currMode && context._currMode.id === 'save') {
-      canSave = false;
-
-      // Attempt to prevent user from creating duplicate changes - see #5200
-      if (services.osm && services.osm.isChangesetInflight()) {
-        _history.clearSaved();
-        return;
-      }
-
-    } else {
-      canSave = context.selectedIDs().every(id => {
-        const entity = context.hasEntity(id);
-        return entity && !entity.isDegenerate();
-      });
-    }
-
-    if (canSave) {
-      _history.save();
-    }
-    if (_history.hasChanges()) {
-      return t('save.unsaved_changes');
-    }
-  };
-
-  // Debounce save, since it's a synchronous localStorage write,
-  // and history changes can happen frequently (e.g. when dragging).
-  context.debouncedSave = _debounce(context.save, 350);
-
-  function withDebouncedSave(fn) {
-    return function() {
-      const result = fn.apply(_history, arguments);
-      context.debouncedSave();
-      return result;
-    };
-  }
-
-
-  /* Modes */
-  // "Modes" are editing tasks that the user are allowed to perform.
-  // Each mode is exclusive, i.e only one mode can be active at a time.
-  context.modes = new Map();  // Map (mode.id -> mode)
-
-  // The current mode (`null` until ui.render initializes the map and enters browse mode)
-  context._currMode = null;
-  context.mode = () => context._currMode;
-
-  /**
-   * `enter`
-   * Enters the given mode, with an optional bunch of features selected.
-   * If the mode could not be entered for whatever reason, falls back to entering browse mode.
-   *
-   * @param   `modeOrModeID`  `Object` or `String` identifying the mode to enter
-   * @param   `options`        Optional `Object` of options passed to the new mode
-   * @return  The mode that got entered
-   */
-  context.enter = (modeOrModeID, options) => {
-    const currMode = context._currMode;
-    let newMode;
-
-    if (typeof modeOrModeID === 'string') {
-      newMode = context.modes.get(modeOrModeID);
-    } else {
-      newMode = modeOrModeID;
-    }
-    if (!newMode) {
-      console.error(`context.enter: no such mode: ${modeOrModeID}`);  // eslint-disable-line no-console
-      newMode = context.modes.get('browse');  // fallback
-    }
-
-    // Exit current mode, if any
-    if (currMode) {
-      currMode.exit();
-      _container.classed(`mode-${currMode.id}`, false);
-      dispatch.call('exit', this, currMode);
-    }
-
-    // Try to enter the new mode, fallback to 'browse' mode
-    context._currMode = newMode;
-    const didEnter = context._currMode.enter(options);
-    if (!didEnter) {
-      context._currMode = context.modes.get('browse');
-      context._currMode.enter();
-    }
-    _container.classed(`mode-${context._currMode.id}`, true);
-    dispatch.call('enter', this, context._currMode);
-    return context._currMode;
-  };
-
-  /**
-   * `selectedData`
-   * Returns a Map containing the current selected features.  It can contain
-   * multiple items of various types (e.g. some OSM data, some Rapid data etc)
-   *
-   * @return  The current selected features, as a `Map(datumID -> datum)`
-   */
-  context.selectedData = () => {
-    if (!context._currMode) return new Map();
-    return context._currMode.selectedData || new Map();
-  };
-
-  /**
-   * `selectedIDs`
-   * @return  Just the keys of the `selectedData`
-   */
-  context.selectedIDs = () => {
-    if (!context._currMode) return [];
-    if (typeof context._currMode.selectedIDs === 'function') {
-      return context._currMode.selectedIDs();         // class function
-    } else {
-      return context._currMode.selectedIDs || [];     // class property
-    }
-  };
-
-
-// ...and definitely stop doing this...
-//  let _selectedNoteID;
-//  context.selectedNoteID = function(noteID) {
-//    if (!arguments.length) return _selectedNoteID;
-//    _selectedNoteID = noteID;
-//    return context;
-//  };
-//  let _selectedErrorID;
-//  context.selectedErrorID = function(errorID) {
-//    if (!arguments.length) return _selectedErrorID;
-//    _selectedErrorID = errorID;
-//    return context;
-//  };
-  context.selectedNoteID = () => {
-    console.error('deprecated: do not call context.selectedNoteID anymore');   // eslint-disable-line no-console
-    return null;
-  };
-  context.selectedErrorID = () => {
-    console.error('deprecated: do not call context.selectedErrorID anymore');   // eslint-disable-line no-console
-    return null;
-  };
-
-
-  /* Behaviors */
-  // "Behaviors" are bundles of event handlers that we can
-  // enable and disable depending on what the user is doing.
-  context.behaviors = new Map();  // Map (behavior.id -> behavior)
-
-  /**
-   * `enableBehaviors`
-   * The given behaviorIDs will be enabled, all others will be disabled
-   * @param   `enableIDs`  `Array` or `Set` containing behaviorIDs to keep enabled
-   */
-  context.enableBehaviors = function(enableIDs) {
-    if (!(enableIDs instanceof Set)) {
-      enableIDs = new Set([].concat(enableIDs));  // coax ids into a Set
-    }
-
-    context.behaviors.forEach((behavior, behaviorID) => {
-      if (enableIDs.has(behaviorID)) {  // should be enabled
-        if (!behavior.enabled) {
-          behavior.enable();
-        }
-      } else {  // should be disabled
-        if (behavior.enabled) {
-          behavior.disable();
-        }
-      }
-    });
-  };
-
-  context.install = () => {
-    console.error('deprecated: do not call context.install anymore');   // eslint-disable-line no-console
-  };
-  context.uninstall = () => {
-    console.error('deprecated: do not call context.uninstall anymore');   // eslint-disable-line no-console
-  };
-//old redo on every mode change
-//  context.install = (behavior) => {
-//    if (typeof behavior.enable === 'function') {
-//      behavior.enable();
-//    }
-//  };
-//  context.uninstall = (behavior) => {
-//    if (typeof behavior.disable === 'function') {
-//      behavior.disable();
-//    }
-//  };
-//  // context.install = (behavior) =>  { return; };
-//  // context.uninstall = (behavior) => { return; };
-//  // context.install = (behavior) => context.surface().call(behavior);
-//  // context.uninstall = (behavior) => context.surface().call(behavior.off);
-
-
-  /* Copy/Paste */
-  let _copyGraph;
-  context.copyGraph = () => _copyGraph;
-
-  let _copyIDs = [];
-  context.copyIDs = function(val) {
-    if (!arguments.length) return _copyIDs;
-    _copyIDs = val;
-    _copyGraph = _history.graph();
-    return context;
-  };
-
-  let _copyLoc;
-  context.copyLoc = function(val) {
-    if (!arguments.length) return _copyLoc;
-    _copyLoc = val;
-    return context;
-  };
-
-
-  /* Imagery */
-  let _imagery;
-  context.imagery = () => _imagery;
-  context.background = () => _imagery;   // legacy name
-
-
-  /* Features */
-  let _features;
-  context.features = () => _features;
-  context.hasHiddenConnections = (id) => {
-    const graph = _history.graph();
-    const entity = graph.entity(id);
-    return _features.hasHiddenConnections(entity, graph);
-  };
-
-
-  /* Photos */
-  let _photos;
-  context.photos = () => _photos;
-
-
-  /* Map */
-  let _map;
-  context.map = () => _map;
-  context.scene = () => _map.scene;
-  context.surface = () => _map.surface;
-  context.surfaceRect = () => _map.surface.node().getBoundingClientRect();
-  context.editable = () => {
-    const mode = context.mode();
-    if (!mode || mode.id === 'save') return false;   // don't allow editing during save
-    return true;  // _map.editableDataEnabled();     // todo: disallow editing if OSM layer is off
-  };
-
-
-  /* Debug */
-  let _debugFlags = {
-    tile: false,        // tile boundaries
-    label: false,       // label placement
-    imagery: false,     // imagery bounding polygons
-    target: false,      // touch targets
-    downloaded: false   // downloaded data from osm
-  };
-  context.debugFlags = () => _debugFlags;
-  context.getDebug = (flag) => flag && _debugFlags[flag];
-  context.setDebug = function(flag, val = true) {
-    _debugFlags[flag] = val;
-    if (_map) {
-      _map.immediateRedraw();
-    }
-    return context;
-  };
-
-
-  /* Container */
-  let _container = d3_select(null);
-  context.container = function(val) {
-    if (!arguments.length) return _container;
-    _container = val;
-    _container.classed('ideditor', true);
-    return context;
-  };
-  context.containerNode = function(val) {
-    if (!arguments.length) return context.container().node();
-    context.container(d3_select(val));
-    return context;
-  };
-
-  let _embed;
-  context.embed = function(val) {
-    if (!arguments.length) return _embed;
-    _embed = val;
-    return context;
-  };
-
-
-  /* Assets */
-  let _assetPath = '';
-  context.assetPath = function(val) {
-    if (!arguments.length) return _assetPath;
-    _assetPath = val;
-    fileFetcher.assetPath(val);
-    return context;
-  };
-
-  let _assetMap = {};
-  context.assetMap = function(val) {
-    if (!arguments.length) return _assetMap;
-    _assetMap = val;
-    fileFetcher.assetMap(val);
-    return context;
-  };
-
-  context.asset = (val) => {
-    if (/^http(s)?:\/\//i.test(val)) return val;
-    const filename = _assetPath + val;
-    return _assetMap[filename] || filename;
-  };
-
-  context.imagePath = (val) => {
-    console.error('deprecated: do not call context.imagePath anymore');   // eslint-disable-line no-console
-    return context.asset(`img/${val}`);
-  };
-
-
-  /* reset (aka flush) */
-  context.reset = context.flush = () => {
-    context.debouncedSave.cancel();
-
-    Array.from(_deferred).forEach(handle => {
-      window.cancelIdleCallback(handle);
-      _deferred.delete(handle);
-    });
-
-    Object.values(services).forEach(service => {
-      if (service && typeof service.reset === 'function') {
-        service.reset(context);
-      }
-    });
-
-    context.changeset = null;
-
-    _rapidContext.reset();
-    _validator.reset();
-    _features.reset();
-    _history.reset();
-    _uploader.reset();
-
-    // don't leave stale state in the inspector
-    context.container().select('.inspector-wrap *').remove();
-
-    return context;
-  };
-
-
-  /* Projection */
-  context.projection = new Projection();
-
-  /* Rapid */
-  let _rapidContext;
-  context.rapidContext = () => _rapidContext;
-
-  /* Init */
-  context.init = () => {
-    instantiateInternal();
-    initializeDependents();
-    return context;
-
-
-    // Load variables and properties. No property of `context` should be accessed
-    // until this is complete since load statuses are indeterminate. The order
-    // of instantiation shouldn't matter.
-    function instantiateInternal() {
-      _history = coreHistory(context);
-      context.graph = _history.graph;
-      context.hasEntity = (id) => _history.graph().hasEntity(id);
-      context.entity = (id) => _history.graph().entity(id);
-      context.pauseChangeDispatch = _history.pauseChangeDispatch;
-      context.resumeChangeDispatch = _history.resumeChangeDispatch;
-      context.perform = withDebouncedSave(_history.perform);
-      context.replace = withDebouncedSave(_history.replace);
-      context.pop = withDebouncedSave(_history.pop);
-      context.overwrite = withDebouncedSave(_history.overwrite);
-      context.undo = withDebouncedSave(_history.undo);
-      context.redo = withDebouncedSave(_history.redo);
-
-      // Instantiate core classes
-      _validator = coreValidator(context);
-      _uploader = coreUploader(context);
-      _imagery = new RendererImagery(context);
-      _features = rendererFeatures(context);
-      _map = new RendererMap(context);
-      _photos = new RendererPhotos(context);
-      _rapidContext = coreRapidContext(context);
-      _urlhash = new UrlHash(context);
-      _ui = uiInit(context);
-
-      // Instantiate Behaviors
-      [
-        new BehaviorDrag(context),
-        new BehaviorDraw(context),
-        new BehaviorHover(context),
-        new BehaviorLasso(context),
-        new BehaviorMapInteraction(context),
-        new BehaviorMapNudging(context),
-        new BehaviorPaste(context),
-        new BehaviorSelect(context)
-      ].forEach(behavior => context.behaviors.set(behavior.id, behavior));
-
-      // Instantiate Modes
-      [
-        new ModeAddNote(context),
-        new ModeAddPoint(context),
-        new ModeBrowse(context),
-        new ModeDragNode(context),
-        new ModeDrawArea(context),
-        new ModeDrawLine(context),
-        new ModeMove(context),
-        new ModeRotate(context),
-        new ModeSave(context),
-        new ModeSelect(context)
-      ].forEach(mode => context.modes.set(mode.id, mode));
-    }
-
-    // Set up objects that might need to access properties of `context`. The order
-    // might matter if dependents make calls to each other. Be wary of async calls.
-    function initializeDependents() {
-      if (context.initialHashParams.presets) {
-        presetManager.addablePresetIDs(new Set(context.initialHashParams.presets.split(',')));
-      }
-      if (context.initialHashParams.locale) {
-        localizer.preferredLocaleCodes(context.initialHashParams.locale);
-      }
-
-      // kick off some async work
-      localizer.ensureLoaded();
-      presetManager.ensureLoaded();
-
-      // Run initializers - this is where code should be that establishes event listeners
-      Object.values(services).forEach(service => {
-        if (service && typeof service.init === 'function') {
-          service.init();
-        }
-      });
-
-      _validator.init();
-      _imagery.init();
-      _features.init();
-      _map.init();         // watch out - init doesn't actually create the renderer :(
-      _rapidContext.init();
-
-      // If the container isn't available, e.g. when testing, don't load the UI
-      if (!context.container().empty()) {
-        _ui.ensureLoaded()
-          .then(() => {
-            _photos.init();
-            _urlhash.init();  // tries to adjust map transform
-          });
-      }
-    }
-  };
-
-  return context;
-}
diff --git a/modules/core/file_fetcher.js b/modules/core/file_fetcher.js
deleted file mode 100644
index 7a6f55c732..0000000000
--- a/modules/core/file_fetcher.js
+++ /dev/null
@@ -1,110 +0,0 @@
-let _mainFileFetcher = coreFileFetcher(); // singleton
-
-export { _mainFileFetcher as fileFetcher };
-
-//
-// coreFileFetcher asynchronously fetches data from JSON files
-//
-export function coreFileFetcher() {
-  let _this = {};
-  let _inflight = {};
-  let _fileMap = {
-    'address_formats': 'data/address_formats.min.json',
-    'deprecated': 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/deprecated.min.json',
-    'discarded': 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/discarded.min.json',
-    'imagery': 'data/imagery.min.json',
-    'intro_graph': 'data/intro_graph.min.json',
-    'intro_rapid_graph': 'data/intro_rapid_graph.min.json',
-    'keepRight': 'data/keepRight.min.json',
-    'languages': 'data/languages.min.json',
-    'locales': 'locales/index.min.json',
-    'oci_defaults': 'https://cdn.jsdelivr.net/npm/osm-community-index@5.5/dist/defaults.min.json',
-    'oci_features': 'https://cdn.jsdelivr.net/npm/osm-community-index@5.5/dist/featureCollection.min.json',
-    'oci_resources': 'https://cdn.jsdelivr.net/npm/osm-community-index@5.5/dist/resources.min.json',
-    'preset_categories': 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/preset_categories.min.json',
-    'preset_defaults': 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/preset_defaults.min.json',
-    'preset_fields': 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/fields.min.json',
-    'preset_presets': 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/presets.min.json',
-    'phone_formats': 'data/phone_formats.min.json',
-    'qa_data': 'data/qa_data.min.json',
-    'shortcuts': 'data/shortcuts.min.json',
-    'territory_languages': 'data/territory_languages.min.json',
-    'wmf_sitematrix': 'https://cdn.jsdelivr.net/npm/wmf-sitematrix@0.1/wikipedia.min.json'
-  };
-
-  let _cachedData = {};
-  // expose the cache; useful for tests
-  _this.cache = () => _cachedData;
-
-
-  // Returns a Promise to fetch data
-  // (resolved with the data if we have it already)
-  _this.get = (which) => {
-    if (_cachedData[which]) {
-      return Promise.resolve(_cachedData[which]);
-    }
-
-    const file = _fileMap[which];
-    const url = file && _this.asset(file);
-    if (!url) {
-      return Promise.reject(`Unknown data file for "${which}"`);
-    }
-
-    let prom = _inflight[url];
-    if (!prom) {
-      _inflight[url] = prom = fetch(url)
-        .then(response => {
-          // fetch in PhantomJS tests may return ok=false and status=0 even if it's okay
-          if ((!response.ok && response.status !== 0) || !response.json) {
-            throw new Error(response.status + ' ' + response.statusText);
-          }
-          if (response.status === 204 || response.status === 205) return;  // No Content, Reset Content
-          return response.json();
-        })
-        .then(result => {
-          delete _inflight[url];
-          if (!result) {
-            throw new Error(`No data loaded for "${which}"`);
-          }
-          _cachedData[which] = result;
-          return result;
-        })
-        .catch(err => {
-          delete _inflight[url];
-          throw err;
-        });
-    }
-
-    return prom;
-  };
-
-
-  // Accessor for the file map
-  _this.fileMap = function(val) {
-    if (!arguments.length) return _fileMap;
-    _fileMap = val;
-    return _this;
-  };
-
-  let _assetPath = '';
-  _this.assetPath = function(val) {
-    if (!arguments.length) return _assetPath;
-    _assetPath = val;
-    return _this;
-  };
-
-  let _assetMap = {};
-  _this.assetMap = function(val) {
-    if (!arguments.length) return _assetMap;
-    _assetMap = val;
-    return _this;
-  };
-
-  _this.asset = (val) => {
-    if (/^http(s)?:\/\//i.test(val)) return val;
-    const filename = _assetPath + val;
-    return _assetMap[filename] || filename;
-  };
-
-  return _this;
-}
diff --git a/modules/core/history.js b/modules/core/history.js
deleted file mode 100644
index 2cdaaae1ed..0000000000
--- a/modules/core/history.js
+++ /dev/null
@@ -1,791 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { easeLinear as d3_easeLinear } from 'd3-ease';
-import { select as d3_select } from 'd3-selection';
-import { utilArrayDifference, utilArrayGroupBy, utilArrayUnion, utilObjectOmit, utilSessionMutex } from '@rapid-sdk/util';
-
-import { Graph } from './Graph';
-import { Difference } from './Difference';
-import { osmEntity } from '../osm/entity';
-import { prefs } from './preferences';
-import { Tree } from './Tree';
-import { uiLoading } from '../ui/loading';
-import { utilRebind } from '../util';
-
-
-export function coreHistory(context) {
-    var dispatch = d3_dispatch('reset', 'change', 'merge', 'restore', 'undone', 'redone', 'storage_error');
-    var lock = utilSessionMutex('lock');
-
-    // restorable if Rapid is not open in another window/tab and a saved history exists in localStorage
-    var _hasUnresolvedRestorableChanges = lock.lock() && !!prefs(getKey('saved_history'));
-
-    var duration = 150;
-    var _imageryUsed = [];
-    var _photoOverlaysUsed = [];
-    var _checkpoints = {};
-    var _pausedGraph;
-    var _stack;
-    var _index;
-    var _tree;
-
-
-    // internal _act, accepts list of actions and eased time
-    function _act(actions, t) {
-        actions = Array.prototype.slice.call(actions);
-
-        var annotation;
-        if (typeof actions[actions.length - 1] !== 'function') {
-            annotation = actions.pop();
-        }
-
-        var graph = _stack[_index].graph;
-        for (var i = 0; i < actions.length; i++) {
-            graph = actions[i](graph, t);
-        }
-
-        return {
-            graph: graph,
-            annotation: annotation,
-            imageryUsed: _imageryUsed,
-            photoOverlaysUsed: _photoOverlaysUsed,
-            transform: context.projection.transform(),
-            selectedIDs: context.selectedIDs()
-        };
-    }
-
-
-    // internal _perform with eased time
-    function _perform(args, t) {
-        var previous = _stack[_index].graph;
-        _stack = _stack.slice(0, _index + 1);
-        var actionResult = _act(args, t);
-        _stack.push(actionResult);
-        _index++;
-        return change(previous);
-    }
-
-
-    // internal _replace with eased time
-    function _replace(args, t) {
-        var previous = _stack[_index].graph;
-        // assert(_index == _stack.length - 1)
-        var actionResult = _act(args, t);
-        _stack[_index] = actionResult;
-        return change(previous);
-    }
-
-
-    // internal _overwrite with eased time
-    function _overwrite(args, t) {
-        var previous = _stack[_index].graph;
-        if (_index > 0) {
-            _index--;
-            _stack.pop();
-        }
-        _stack = _stack.slice(0, _index + 1);
-        var actionResult = _act(args, t);
-        _stack.push(actionResult);
-        _index++;
-        return change(previous);
-    }
-
-
-    // determine difference and dispatch a change event
-    function change(previous) {
-        var difference = new Difference(previous, history.graph());
-        if (!_pausedGraph) {
-            dispatch.call('change', this, difference);
-        }
-        return difference;
-    }
-
-
-    // Rapid uses namespaced keys so multiple installations do not conflict
-    function getKey(n) {
-        return 'Rapid_' + window.location.origin + '_' + n;
-    }
-
-
-    var history = {
-
-        graph: function() {
-            return _stack[_index].graph;
-        },
-
-
-        tree: function() {
-            return _tree;
-        },
-
-
-        base: function() {
-            return _stack[0].graph;
-        },
-
-
-        peekAnnotation: function() {
-            return _stack[_index].annotation;
-        },
-
-
-        peekAllAnnotations: function() {
-            var result = [];
-            for (var i = 0; i <= _index; i++) {
-                if (_stack[i].annotation) {
-                    result.push(_stack[i].annotation);
-                }
-            }
-            return result;
-        },
-
-
-        /**
-         *  merge
-         *  Merge new entities into the history.  This function is called
-         *  when we have parsed a new tile of OSM data, we will receive the
-         *  new entities and a list of all entity ids that the tile contains.
-         *  Can also be called in other situations, like restoring history from
-         *  storage, or loading specific entities from the OSM API.
-         *
-         *  @param  entities   Entities to merge into the history (usually only the new ones)
-         *  @param  seenIDs?   Optional - All entity IDs on the tile (including previously seen ones)
-         */
-        merge: function(entities, seenIDs) {
-          const baseGraph = this.base();
-          const headGraph = this.graph();
-
-          if (!(seenIDs instanceof Set)) {
-            seenIDs = new Set(entities.map(entity => entity.id));
-          }
-
-          // Which ones are really new (not in the base graph)?
-          const newIDs = new Set();
-          for (const entity of entities) {
-            if (!baseGraph.hasEntity(entity.id)) {  // not merged in yet.
-              newIDs.add(entity.id);
-            }
-          }
-
-          // If we are merging in new relation members, bump the relation's version.
-          for (const id of seenIDs) {
-            const entity = headGraph.hasEntity(id);
-            if (entity?.type !== 'relation') continue;
-
-            for (const member of entity.members) {
-              if (newIDs.has(member.id)) {
-                entity.touch();  // bump version in place
-              }
-            }
-          }
-
-          const graphs = _stack.map(state => state.graph);
-          baseGraph.rebase(entities, graphs, false);
-          _tree.rebase(entities, false);
-
-          dispatch.call('merge', this, seenIDs);
-        },
-
-
-        perform: function() {
-            // complete any transition already in progress
-            d3_select(document).interrupt('history.perform');
-
-            var transitionable = false;
-            var action0 = arguments[0];
-
-            if (arguments.length === 1 ||
-                (arguments.length === 2 && (typeof arguments[1] !== 'function'))) {
-                transitionable = !!action0.transitionable;
-            }
-
-            if (transitionable) {
-                var origArguments = arguments;
-                d3_select(document)
-                    .transition('history.perform')
-                    .duration(duration)
-                    .ease(d3_easeLinear)
-                    .tween('history.tween', function() {
-                        return function(t) {
-                            if (t < 1) _overwrite([action0], t);
-                        };
-                    })
-                    .on('start', function() {
-                        _perform([action0], 0);
-                    })
-                    .on('end interrupt', function() {
-                        _overwrite(origArguments, 1);
-                    });
-
-            } else {
-                return _perform(arguments);
-            }
-        },
-
-
-        replace: function() {
-            d3_select(document).interrupt('history.perform');
-            return _replace(arguments, 1);
-        },
-
-
-        // Same as calling pop and then perform
-        overwrite: function() {
-            d3_select(document).interrupt('history.perform');
-            return _overwrite(arguments, 1);
-        },
-
-
-        pop: function(n) {
-            d3_select(document).interrupt('history.perform');
-
-            var previous = _stack[_index].graph;
-            if (isNaN(+n) || +n < 0) {
-                n = 1;
-            }
-            while (n-- > 0 && _index > 0) {
-                _index--;
-                _stack.pop();
-            }
-            return change(previous);
-        },
-
-
-        // Back to the previous annotated state or _index = 0.
-        undo: function() {
-            d3_select(document).interrupt('history.perform');
-
-            var previousStack = _stack[_index];
-            var previous = previousStack.graph;
-            while (_index > 0) {
-                _index--;
-                if (_stack[_index].annotation) break;
-            }
-
-            dispatch.call('undone', this, _stack[_index], previousStack);
-            return change(previous);
-        },
-
-
-        // Forward to the next annotated state.
-        redo: function() {
-            d3_select(document).interrupt('history.perform');
-
-            var previousStack = _stack[_index];
-            var previous = previousStack.graph;
-            var tryIndex = _index;
-            while (tryIndex < _stack.length - 1) {
-                tryIndex++;
-                if (_stack[tryIndex].annotation) {
-                    _index = tryIndex;
-                    dispatch.call('redone', this, _stack[_index], previousStack);
-                    break;
-                }
-            }
-
-            return change(previous);
-        },
-
-
-        pauseChangeDispatch: function() {
-            if (!_pausedGraph) {
-                _pausedGraph = _stack[_index].graph;
-            }
-        },
-
-
-        resumeChangeDispatch: function() {
-            if (_pausedGraph) {
-                var previous = _pausedGraph;
-                _pausedGraph = null;
-                return change(previous);
-            }
-        },
-
-
-        undoAnnotation: function() {
-            var i = _index;
-            while (i >= 0) {
-                if (_stack[i].annotation) return _stack[i].annotation;
-                i--;
-            }
-        },
-
-
-        redoAnnotation: function() {
-            var i = _index + 1;
-            while (i <= _stack.length - 1) {
-                if (_stack[i].annotation) return _stack[i].annotation;
-                i++;
-            }
-        },
-
-
-        // Returns the entities from the active graph with bounding boxes
-        // overlapping the given `extent`.
-        intersects: function(extent) {
-            return _tree.intersects(extent, _stack[_index].graph);
-        },
-
-
-        difference: function() {
-            var base = _stack[0].graph;
-            var head = _stack[_index].graph;
-            return new Difference(base, head);
-        },
-
-
-        changes: function(action) {
-            var base = _stack[0].graph;
-            var head = _stack[_index].graph;
-
-            if (action) {
-                head = action(head);
-            }
-
-            var difference = new Difference(base, head);
-
-            return {
-                modified: difference.modified(),
-                created: difference.created(),
-                deleted: difference.deleted()
-            };
-        },
-
-
-        hasChanges: function() {
-            return this.difference().changes.size > 0;
-        },
-
-
-        imageryUsed: function(sources) {
-            if (sources) {
-                _imageryUsed = sources;
-                return history;
-            } else {
-                var s = new Set();
-                _stack.slice(1, _index + 1).forEach(function(state) {
-                    state.imageryUsed.forEach(function(source) {
-                        if (source !== 'Custom') {
-                            s.add(source);
-                        }
-                    });
-                });
-                return Array.from(s);
-            }
-        },
-
-
-        photoOverlaysUsed: function(sources) {
-            if (sources) {
-                _photoOverlaysUsed = sources;
-                return history;
-            } else {
-                var s = new Set();
-                _stack.slice(1, _index + 1).forEach(function(state) {
-                    if (state.photoOverlaysUsed && Array.isArray(state.photoOverlaysUsed)) {
-                        state.photoOverlaysUsed.forEach(function(photoOverlay) {
-                            s.add(photoOverlay);
-                        });
-                    }
-                });
-                return Array.from(s);
-            }
-        },
-
-
-        // save the current history state
-        checkpoint: function(key) {
-            _checkpoints[key] = {
-                stack: _stack,
-                index: _index
-            };
-            return history;
-        },
-
-
-        // restore history state to a given checkpoint or reset completely
-        reset: function(key) {
-          d3_select(document).interrupt('history.perform');
-
-          if (key !== undefined && _checkpoints.hasOwnProperty(key)) {  // reset to given key
-            const fromGraph = _stack[_index].graph;
-
-            _stack = _checkpoints[key].stack;
-            _index = _checkpoints[key].index;
-
-            const toGraph = _stack[_index].graph;
-            const difference = new Difference(fromGraph, toGraph);
-            dispatch.call('reset');
-            dispatch.call('change', this, difference);
-            dispatch.call('restore');
-
-          } else {  // full reset
-            _stack = [{graph: new Graph()}];
-            _index = 0;
-            _tree = new Tree(_stack[0].graph);
-            _checkpoints = {};
-            dispatch.call('reset');
-            dispatch.call('change');
-            dispatch.call('restore');
-          }
-
-          return history;
-        },
-
-
-        // `toIntroGraph()` is used to export the intro graph used by the walkthrough.
-        //
-        // To use it:
-        //  1. Start the walkthrough.
-        //  2. Get to a "free editing" tutorial step
-        //  3. Make your edits to the walkthrough map
-        //  4. In your browser dev console run:
-        //        `id.history().toIntroGraph()`
-        //  5. This outputs stringified JSON to the browser console
-        //  6. Copy it to `data/intro_graph.json` and prettify it in your code editor
-        toIntroGraph: function() {
-          let nextID = { n: 0, r: 0, w: 0 };
-          let permIDs = {};
-          let graph = this.graph();
-          let result = new Map;   // Map(entityID -> Entity)
-
-          // Copy base entities..
-          for (const entity of graph.base.entities.values()) {
-            const copy = _copyIntroEntity(entity);
-            result.set(copy.id, copy);
-          }
-
-          // Replace base entities with head entities..
-          for (const [entityID, entity] of graph.local.entities) {
-            if (entity) {
-              const copy = _copyIntroEntity(entity);
-              result.set(copy.id, copy);
-            } else {
-              result.delete(entityID);
-            }
-          }
-
-          // Swap ids in node and member lists..
-          for (let entity of result.values()) {
-            if (Array.isArray(entity.nodes)) {
-              entity.nodes = entity.nodes.map(nodeID => {
-                return permIDs[nodeID] ?? nodeID;
-              });
-            }
-            if (Array.isArray(entity.members)) {
-              entity.members = entity.members.map(member => {
-                member.id = permIDs[member.id] || member.id;
-                return member;
-              });
-            }
-          }
-
-          // Convert to Object so we can stringify it.
-          let obj = {};
-          for (const [k, v] of result) { obj[k] = v; }
-          return JSON.stringify({ dataIntroGraph: obj });
-
-
-          function _copyIntroEntity(entity) {
-            let copy = utilObjectOmit(entity, ['type', 'user', 'v', 'version', 'visible']);
-
-            // Note: the copy is no longer an osmEntity, so it might not have `tags`
-            if (copy.tags && !Object.keys(copy.tags)) {
-              delete copy.tags;
-            }
-
-            if (Array.isArray(copy.loc)) {
-              copy.loc[0] = +copy.loc[0].toFixed(6);
-              copy.loc[1] = +copy.loc[1].toFixed(6);
-            }
-
-            const match = entity.id.match(/([nrw])-\d*/);  // temporary id
-            if (match !== null) {
-              let nrw = match[1];
-              let permID;
-              do { permID = nrw + (++nextID[nrw]); }
-              while (result.has(permID));
-
-              permIDs[entity.id] = permID;
-              copy.id = permID;
-            }
-            return copy;
-          }
-
-        },
-
-
-        //
-        //
-        //
-        toJSON: function() {
-          if (!this.hasChanges()) return;
-
-          const modifiedEntities = new Map();  // Map(Entity.key -> Entity)
-          const allEntityIDs = new Set();
-          const stackData = [];
-
-          // Preserve the users stack of edits..
-          for (const s of _stack) {
-            const currGraph = s.graph;   // edit done at this point in time
-            let modified = [];
-            let deleted = [];
-
-            // watch out: for modified entities we index on "key" - e.g. "n1v1"
-            for (const [entityID, entity] of currGraph.local.entities) {
-              allEntityIDs.add(entityID);
-              if (entity) {
-                const key = osmEntity.key(entity);
-                modifiedEntities.set(key, entity);
-                modified.push(key);
-              } else {
-                deleted.push(entityID);
-              }
-            }
-
-            const item = {};
-            if (modified.length)      item.modified = modified;
-            if (deleted.length)       item.deleted = deleted;
-            if (s.imageryUsed)        item.imageryUsed = s.imageryUsed;
-            if (s.photoOverlaysUsed)  item.photoOverlaysUsed = s.photoOverlaysUsed;
-            if (s.annotation)         item.annotation = s.annotation;
-            if (s.transform)          item.transform = s.transform;
-            if (s.selectedIDs)        item.selectedIDs = s.selectedIDs;
-            stackData.push(item);
-          }
-
-          // Preserve the originals of edited Entities.
-          // If user restores their edits, we need these Entities to look the same too.
-          const baseGraph = this.base();   // The initial unedited graph
-          let baseEntities = new Map();    // Map(entityID -> entity)
-
-          for (const entityID of allEntityIDs) {
-            const original = baseGraph.hasEntity(entityID);
-            if (!original || baseEntities.has(entityID)) continue;
-
-            baseEntities.set(entityID, original);
-
-            // Preserve originals of child nodes
-            for (const child of baseGraph.childNodes(original)) {
-              baseEntities.set(child.id, child);
-            }
-            // Preserve originals of parent entities too
-            for (const parent of baseGraph.parentWays(original)) {
-              baseEntities.set(parent.id, parent);
-            }
-          }
-
-          return JSON.stringify({
-            version: 3,
-            entities: [...modifiedEntities.values()],
-            baseEntities: [...baseEntities.values()],
-            stack: stackData,
-            nextIDs: osmEntity.id.next,
-            index: _index,
-            timestamp: (new Date()).getTime()
-          });
-        },
-
-
-        //
-        //
-        //
-        fromJSON: function(json, loadChildNodes) {
-          const baseGraph = this.base();   // The initial unedited graph
-          const hist = JSON.parse(json);
-          let loadComplete = true;
-
-          osmEntity.id.next = hist.nextIDs;
-          _index = hist.index;
-
-          if (hist.version !== 2 && hist.version !== 3) {
-            throw new Error(`History version ${hist.version} not supported.`);
-          }
-
-          // Instantiate the modified entities
-          const modifiedEntities = new Map;  // Map(Entity.key -> Entity)
-          for (const e of hist.entities) {
-            modifiedEntities.set(osmEntity.key(e), osmEntity(e));
-          }
-
-          if (hist.version >= 3) {
-            // If v3+, instantiate base entities too.
-            const baseEntities = hist.baseEntities.map(e => osmEntity(e));
-
-            // Merge originals into base graph, note that the force parameter is `true` here
-            // to replace any that might have been loaded from the API.
-            const graphs = _stack.map(s => s.graph);
-            baseGraph.rebase(baseEntities, graphs, true);
-            _tree.rebase(baseEntities, true);
-
-            // When we restore a modified way, we also need to fetch any missing
-            // childnodes that would normally have been downloaded with it.. #2142
-            if (loadChildNodes) {
-              const osm = context.connection();
-              const baseWays = baseEntities.filter(entity => entity.type === 'way');
-              const nodeIDs = baseWays.reduce(function(acc, way) { return utilArrayUnion(acc, way.nodes); }, []);
-              let missing = nodeIDs.filter(nodeID => !baseGraph.hasEntity(nodeID));
-
-              if (missing.length && osm) {
-                loadComplete = false;
-                context.map().redrawEnabled = false;
-
-                const loading = uiLoading(context).blocking(true);
-                context.container().call(loading);
-
-                var _childNodesLoaded = function(err, result) {
-                  if (!err) {
-                    const visibleGroups = utilArrayGroupBy(result.data, 'visible');
-                    const visibles = visibleGroups.true || [];      // alive nodes
-                    const invisibles = visibleGroups.false || [];   // deleted nodes
-
-                    if (visibles.length) {
-                      const visibleIDs = visibles.map(entity => entity.id);
-                      const graphs = _stack.map(s => s.graph);
-                      missing = utilArrayDifference(missing, visibleIDs);
-                      baseGraph.rebase(visibles, graphs, true);   // force = true
-                      _tree.rebase(visibles, true);               // force = true
-                    }
-
-                    // fetch older versions of nodes that were deleted..
-                    invisibles.forEach(function(entity) {
-                      osm.loadEntityVersion(entity.id, +entity.version - 1, _childNodesLoaded);
-                    });
-                  }
-
-                  if (err || !missing.length) {
-                    loading.close();
-                    context.map().redrawEnabled = true;
-                    dispatch.call('change');
-                    dispatch.call('restore', this);
-                  }
-                };
-
-                osm.loadMultiple(missing, _childNodesLoaded);
-              }
-            }
-          }   // end v3+
-
-
-          // Replace the history stack.
-          _stack = hist.stack.map((s, index) => {
-            // Leave base graph alone, this first entry should have nothing in it.
-            if (index === 0) return _stack[0];
-
-            let entities = {};
-
-            if (Array.isArray(s.modified)) {
-              s.modified.forEach(key => {
-                const entity = modifiedEntities.get(key);
-                entities[entity.id] = entity;
-              });
-            }
-
-            if (Array.isArray(s.deleted)) {
-              s.deleted.forEach(entityID => {
-                entities[entityID] = undefined;
-              });
-            }
-
-            // restore Rapid sources
-            if (s.annotation && s.annotation.type === 'rapid_accept_feature') {
-              const rapidContext = context.rapidContext();
-              const sourceTag = s.annotation.source;
-              rapidContext.sources.add('mapwithai');      // always add 'mapwithai'
-              if (sourceTag && /^esri/.test(sourceTag)) {
-                rapidContext.sources.add('esri');       // add 'esri' for esri sources
-              }
-            }
-
-            return {
-              graph: new Graph(baseGraph).load(entities),
-              annotation: s.annotation,
-              imageryUsed: s.imageryUsed,
-              photoOverlaysUsed: s.photoOverlaysUsed,
-              transform: s.transform,
-              selectedIDs: s.selectedIDs
-            };
-          });
-
-
-          const transform = _stack[_index].transform;
-          if (transform) {
-            context.map().transform(transform);
-          }
-
-          if (loadComplete) {
-            dispatch.call('change');
-            dispatch.call('restore', this);
-          }
-
-          return history;
-        },
-
-
-        lock: function() {
-            return lock.lock();
-        },
-
-
-        unlock: function() {
-            lock.unlock();
-        },
-
-
-        save: function() {
-            if (lock.locked() &&
-                // don't overwrite existing, unresolved changes
-                !_hasUnresolvedRestorableChanges) {
-                const success = prefs(getKey('saved_history'), history.toJSON() || null);
-
-                if (!success) dispatch.call('storage_error');
-            }
-            return history;
-        },
-
-
-        // delete the history version saved in localStorage
-        clearSaved: function() {
-            context.debouncedSave.cancel();
-            if (lock.locked()) {
-                _hasUnresolvedRestorableChanges = false;
-                prefs(getKey('saved_history'), null);
-
-                // clear the changeset metadata associated with the saved history
-                prefs('comment', null);
-                prefs('hashtags', null);
-                prefs('source', null);
-            }
-            return history;
-        },
-
-
-        savedHistoryJSON: function() {
-            return prefs(getKey('saved_history'));
-        },
-
-
-        hasRestorableChanges: function() {
-            return _hasUnresolvedRestorableChanges;
-        },
-
-
-        // load history from a version stored in localStorage
-        restore: function() {
-            if (lock.locked()) {
-                _hasUnresolvedRestorableChanges = false;
-                var json = this.savedHistoryJSON();
-                if (json) history.fromJSON(json, true);
-            }
-        },
-
-
-        _getKey: getKey
-
-    };
-
-
-    history.reset();
-
-    return utilRebind(history, dispatch, 'on');
-}
diff --git a/modules/core/index.js b/modules/core/index.js
index 0d69739c69..d40b84c095 100644
--- a/modules/core/index.js
+++ b/modules/core/index.js
@@ -1,13 +1,62 @@
-export { coreContext } from './context';
-export { coreFileFetcher, fileFetcher } from './file_fetcher';
-export { coreHistory } from './history';
-export { coreRapidContext } from './rapid_context';
-export { coreLocalizer, t, localizer } from './localizer';
-export { prefs } from './preferences';
-export { coreUploader } from './uploader';
-export { coreValidator } from './validator';
-
-export { Difference } from './Difference';
-export { Graph } from './Graph';
-export { LocationManager, locationManager } from './LocationManager';
-export { Tree } from './Tree';
+export * from './lib/index';
+
+import { AbstractSystem } from './AbstractSystem';
+import { DataLoaderSystem } from './DataLoaderSystem';
+import { EditSystem } from './EditSystem';
+import { FilterSystem } from './FilterSystem';
+import { ImagerySystem } from './ImagerySystem';
+import { LocalizationSystem } from './LocalizationSystem';
+import { LocationSystem } from './LocationSystem';
+import { MapSystem } from './MapSystem';
+import { Map3dSystem } from './Map3dSystem';
+import { PhotoSystem } from './PhotoSystem';
+import { PresetSystem } from './PresetSystem';
+import { RapidSystem } from './RapidSystem';
+import { StorageSystem } from './StorageSystem';
+import { UiSystem } from './UiSystem';
+import { UploaderSystem } from './UploaderSystem';
+import { UrlHashSystem } from './UrlHashSystem';
+import { ValidationSystem } from './ValidationSystem';
+
+export {
+  AbstractSystem,
+  DataLoaderSystem,
+  EditSystem,
+  FilterSystem,
+  ImagerySystem,
+  LocalizationSystem,
+  LocationSystem,
+  MapSystem,
+  Map3dSystem,
+  PhotoSystem,
+  PresetSystem,
+  RapidSystem,
+  StorageSystem,
+  UiSystem,
+  UploaderSystem,
+  UrlHashSystem,
+  ValidationSystem
+};
+
+// At init time, we will instantiate any that are in the 'available' collection.
+export const systems = {
+  available:    new Map(),   // Map (id -> System constructor)
+  instantiated: new Map()    // Map (id -> System instance)
+};
+
+systems.available.set('data', DataLoaderSystem);
+systems.available.set('edits', EditSystem);
+systems.available.set('filters', FilterSystem);
+systems.available.set('imagery', ImagerySystem);
+systems.available.set('l10n', LocalizationSystem);
+systems.available.set('locations', LocationSystem);
+systems.available.set('map', MapSystem);
+systems.available.set('map3d', Map3dSystem);
+systems.available.set('photos', PhotoSystem);
+systems.available.set('presets', PresetSystem);
+systems.available.set('rapid', RapidSystem);
+systems.available.set('storage', StorageSystem);
+systems.available.set('ui', UiSystem);
+systems.available.set('uploader', UploaderSystem);
+systems.available.set('urlhash', UrlHashSystem);
+systems.available.set('validator', ValidationSystem);
diff --git a/modules/core/lib/Category.js b/modules/core/lib/Category.js
new file mode 100644
index 0000000000..694e2091f6
--- /dev/null
+++ b/modules/core/lib/Category.js
@@ -0,0 +1,113 @@
+import { utilObjectOmit, utilSafeString } from '@rapid-sdk/util';
+
+import { Collection } from './Collection';
+
+
+/**
+ *  Category
+ */
+export class Category {
+
+  /**
+   * @constructor
+   * @param  context       Global shared application context
+   * @param  categoryID    String unique ID for this field
+   * @param  categoryData  Object containing the original properties for this field
+   * @param  allPresets    Object reference to the index of all the presets
+   */
+  constructor(context, categoryID, categoryData, allPresets = {}) {
+    this.context = context;
+
+    this.id = categoryID;
+    this.safeid = utilSafeString(categoryID);    // for use in classes, element ids, css selectors
+    this.allPresets = allPresets;
+
+    // Preserve and cleanup all original properties..
+    this.orig = {};
+    this.orig.name = categoryData.name ?? '';
+    this.orig.icon = categoryData.icon;
+    this.orig.matchScore = -1;
+    this.orig.members = categoryData.members ?? [];
+
+    // Convert some `categoryData` properties to class properties.. (others will become class functions)
+    Object.assign(this, utilObjectOmit(this.orig, ['name', 'matchScore', 'members']));
+
+    const presets = this.orig.members.map(presetID => allPresets[presetID]).filter(Boolean);
+    this.members = new Collection(context, presets);
+
+    this.geometry = presets
+      .reduce((acc, preset) => {
+        for (let i in preset.geometry) {
+          const geometry = preset.geometry[i];
+          if (acc.indexOf(geometry) === -1) {
+            acc.push(geometry);
+          }
+        }
+        return acc;
+      }, []);
+
+    // caches
+    this._searchName = null;
+    this._searchNameStripped = null;
+  }
+
+
+  matchGeometry(geom) {
+    return this.geometry.includes(geom);
+  }
+
+  matchAllGeometry(geometries) {
+    return this.members.array.some(preset => preset.matchAllGeometry(geometries));
+  }
+
+  matchScore() {
+    return -1;
+  }
+
+  name() {
+    return this.context.t(`_tagging.presets.categories.${this.id}.name`, { 'default': this.id });
+  }
+
+  nameLabel() {
+    return this.context.tHtml(`_tagging.presets.categories.${this.id}.name`, { 'default': this.id });
+  }
+
+  terms() {
+    return [];
+  }
+
+  searchName() {
+    if (!this._searchName) {
+      this._searchName = this.name().toLowerCase();
+    }
+    return this._searchName;
+  }
+
+  searchNameStripped() {
+    if (!this._searchNameStripped) {
+      this._searchNameStripped = this._stripDiacritics(this.searchName());
+    }
+    return this._searchNameStripped;
+  }
+
+  searchAliases() {
+    return [];
+  }
+
+  searchAliasesStripped() {
+    return [];
+  }
+
+  isFallback() {
+    return false;
+  }
+
+  _stripDiacritics(s) {
+    // split combined diacritical characters into their parts
+    if (s.normalize) s = s.normalize('NFD');
+    // remove diacritics
+    s = s.replace(/[\u0300-\u036f]/g, '');
+    return s;
+  }
+
+}
diff --git a/modules/presets/collection.js b/modules/core/lib/Collection.js
similarity index 70%
rename from modules/presets/collection.js
rename to modules/core/lib/Collection.js
index 689fcf49ba..9afa30d5d4 100644
--- a/modules/presets/collection.js
+++ b/modules/core/lib/Collection.js
@@ -1,54 +1,58 @@
 import { utilArrayUniq, utilEditDistance } from '@rapid-sdk/util';
 
-import { locationManager } from '../core/LocationManager';
-
-
-//
-// `presetCollection` is a wrapper around an `Array` of presets `collection`,
-// and decorated with some extra methods for searching and matching geometry
-//
-export function presetCollection(collection) {
-  const MAXRESULTS = 50;
-  let _this = {};
-  let _memo = {};
-
-  _this.collection = collection;
-
-  _this.item = (id) => {
-    if (_memo[id]) return _memo[id];
-    const found = _this.collection.find(d => d.id === id);
-    if (found) _memo[id] = found;
+const MAXRESULTS = 50;
+
+
+/**
+ * Collection
+ * Collection is a wrapper around an `Array` of presets
+ * and decorated with some extra methods for searching and matching geometry
+ */
+export class Collection {
+
+  /**
+   * @constructor
+   * @param  context   Global shared application context
+   * @param  arr       An Array
+   */
+  constructor(context, arr) {
+    this.context = context;
+    this.array = arr;
+    this._memo = new Map();  // Map(id -> item)
+  }
+
+
+  item(id) {
+    let found = this._memo.get(id);
+    if (found) return found;
+
+    found = this.array.find(d => d.id === id);
+    if (found) this._memo.set(id, found);
     return found;
-  };
-
-  _this.index = (id) => _this.collection.findIndex(d => d.id === id);
+  }
 
-  _this.matchGeometry = (geometry) => {
-    return presetCollection(
-      _this.collection.filter(d => d.matchGeometry(geometry))
-    );
-  };
+  index(id) {
+    return this.array.findIndex(d => d.id === id);
+  }
 
-  _this.matchAllGeometry = (geometries) => {
-    return presetCollection(
-      _this.collection.filter(d => d && d.matchAllGeometry(geometries))
-    );
-  };
+  matchGeometry(geometry) {
+    const result = this.array.filter(d => d.matchGeometry(geometry));
+    return new Collection(this.context, result);
+  }
 
-  _this.matchAnyGeometry = (geometries) => {
-    return presetCollection(
-      _this.collection.filter(d => geometries.some(geom => d.matchGeometry(geom)))
-    );
-  };
+  matchAllGeometry(geometries) {
+    const result = this.array.filter(d => d && d.matchAllGeometry(geometries));
+    return new Collection(this.context, result);
+  }
 
-  _this.fallback = (geometry) => {
+  fallback(geometry) {
     let id = geometry;
     if (id === 'vertex') id = 'point';
-    return _this.item(id);
-  };
+    return this.item(id);
+  }
 
-  _this.search = (value, geometry, loc) => {
-    if (!value) return _this;
+  search(value, geometry, loc) {
+    if (!value) return this;
 
     // don't remove diacritical characters since we're assuming the user is being intentional
     value = value.toLowerCase().trim();
@@ -75,7 +79,7 @@ export function presetCollection(collection) {
         if (value === bCompare) return 1;
 
         // priority for higher matchScore
-        let i = b.originalScore - a.originalScore;
+        let i = b.orig.matchScore - a.orig.matchScore;
         if (i !== 0) return i;
 
         // priority if search string appears earlier in preset name
@@ -87,9 +91,10 @@ export function presetCollection(collection) {
       };
     }
 
-    let pool = _this.collection;
+    let pool = this.array;
     if (Array.isArray(loc)) {
-      const validHere = locationManager.locationSetsAt(loc);
+      const locationSystem = this.context.locationSystem();
+      const validHere = locationSystem.locationSetsAt(loc);
       pool = pool.filter(a => !a.locationSetID || validHere[a.locationSetID]);
     }
 
@@ -159,17 +164,14 @@ export function presetCollection(collection) {
       similarTerms
     ).slice(0, MAXRESULTS - 1);
 
-    if (geometry) {
-      if (typeof geometry === 'string') {
-        results.push(_this.fallback(geometry));
-      } else {
-        geometry.forEach(geom => results.push(_this.fallback(geom)));
+    if (typeof geometry === 'string') {
+      const fallback = this.fallback(geometry);
+      if (fallback) {
+        results.push(fallback);
       }
     }
 
-    return presetCollection(utilArrayUniq(results));
-  };
-
+    return new Collection(this.context, utilArrayUniq(results));
+  }
 
-  return _this;
 }
diff --git a/modules/core/Difference.js b/modules/core/lib/Difference.js
similarity index 100%
rename from modules/core/Difference.js
rename to modules/core/lib/Difference.js
diff --git a/modules/core/lib/Field.js b/modules/core/lib/Field.js
new file mode 100644
index 0000000000..9bbe034208
--- /dev/null
+++ b/modules/core/lib/Field.js
@@ -0,0 +1,123 @@
+import { utilObjectOmit, utilSafeString } from '@rapid-sdk/util';
+
+
+/**
+ *  Field
+ *  A field associated with a presert
+ */
+export class Field {
+
+  /**
+   * @constructor
+   * @param  context    Global shared application context
+   * @param  fieldID    String unique ID for this field
+   * @param  fieldData  Object containing the original properties for this field
+   * @param  allFields  Object reference to the index of all the fields
+   */
+  constructor(context, fieldID, fieldData, allFields = {}) {
+    this.context = context;
+
+    this.id = fieldID;
+    this.safeid = utilSafeString(fieldID);    // for use in classes, element ids, css selectors
+    this.allFields = allFields;
+
+    // Preserve and cleanup all original properties..
+    this.orig = {};
+    this.orig.autoSuggestions = fieldData.autoSuggestions ?? true;
+    this.orig.caseSensitive = fieldData.caseSensitive ?? false;
+    this.orig.customValues = fieldData.customValues ?? true;
+    this.orig.default = fieldData.default;
+    this.orig.geometry = fieldData.geometry;
+    this.orig.icon = fieldData.icon;
+    this.orig.increment = fieldData.increment ?? 1;
+    this.orig.key = fieldData.key;
+    this.orig.keys = fieldData.keys ?? [fieldData.key];
+    this.orig.label = fieldData.label ?? '';
+    this.orig.locationSet = fieldData.locationSet;
+    this.orig.maxValue = fieldData.maxValue;
+    this.orig.minValue = fieldData.minValue;
+    this.orig.options = fieldData.options;
+    this.orig.pattern = fieldData.pattern;
+    this.orig.placeholder = fieldData.placeholder ?? '';
+    this.orig.prerequisiteTag = fieldData.prerequisiteTag;
+    this.orig.reference = fieldData.reference;
+    this.orig.snake_case = fieldData.snake_case ?? true;
+    this.orig.strings = fieldData.strings;
+    this.orig.terms = (fieldData.terms ?? []).join();
+    this.orig.type = fieldData.type;
+    this.orig.universal = fieldData.universal ?? false;
+    this.orig.urlFormat = fieldData.urlFormat;
+    this.orig.usage = fieldData.usage;
+
+    // Convert some `fieldData` properties to class properties.. (others will become class functions)
+    Object.assign(this, utilObjectOmit(this.orig, ['increment', 'label', 'placeholder', 'terms']));
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    // (This is also necessary when using `d3-selection.call`)
+    this.title = this.title.bind(this);
+    this.label = this.label.bind(this);
+    this.placeholder = this.placeholder.bind(this);
+    this.terms = this.terms.bind(this);
+  }
+
+  increment() {
+    return this.type === 'number' ? this.increment : undefined;
+  }
+
+  title() {
+    return this._resolveReference('label').t('label', { 'default': this.id });
+  }
+
+  label() {
+    return this._resolveReference('label').tHtml('label', { 'default': this.id });
+  }
+  // _this.label = () => _this._resolveReference('label').t.append('label', { 'default': this.id });  // someday?
+
+  placeholder() {
+    return this._resolveReference('placeholder').t('placeholder', { 'default': this.orig.placeholder });
+  }
+
+  terms() {
+    return this._resolveReference('terms').t('terms', { 'default': this.orig.terms })
+      .toLowerCase().trim().split(/\s*,+\s*/);
+  }
+
+  matchGeometry(geom) {
+    return !this.geometry || this.geometry.indexOf(geom) !== -1;
+  }
+
+  matchAllGeometry(geometries) {
+    return !this.geometry || geometries.every(geom => this.geometry.indexOf(geom) !== -1);
+  }
+
+  t(scope, options) {
+    return this.context.t(`_tagging.presets.fields.${this.id}.${scope}`, options);
+  }
+
+  tHtml(scope, options) {
+    return this.context.tHtml(`_tagging.presets.fields.${this.id}.${scope}`, options);
+  }
+
+  tAppend(scope, options) {
+    return this.context.tAppend(`_tagging.presets.fields.${this.id}.${scope}`, options);
+  }
+
+  hasTextForStringID(scope) {
+    const l10n = this.context.localizationSystem();
+    return l10n.hasTextForStringID(`_tagging.presets.fields.${this.id}.${scope}`);
+  }
+
+  _resolveReference(prop) {
+    const val = this.orig[prop] || '';    // always lookup original properties, don't use the functions
+    const match = val.match(/^\{(.*)\}$/);
+    if (match) {
+      const field = this.allFields[match[1]];
+      if (field) {
+        return field;
+      }
+      console.error(`Unable to resolve referenced field: ${match[1]}`);  // eslint-disable-line no-console
+    }
+    return this;
+  }
+
+}
diff --git a/modules/core/Graph.js b/modules/core/lib/Graph.js
similarity index 100%
rename from modules/core/Graph.js
rename to modules/core/lib/Graph.js
diff --git a/modules/renderer/RendererImagerySource.js b/modules/core/lib/ImagerySource.js
similarity index 89%
rename from modules/renderer/RendererImagerySource.js
rename to modules/core/lib/ImagerySource.js
index 31f58e60ea..104c0b1e71 100644
--- a/modules/renderer/RendererImagerySource.js
+++ b/modules/core/lib/ImagerySource.js
@@ -3,21 +3,22 @@ import { json as d3_json } from 'd3-fetch';
 import { utilAesDecrypt, utilQsString, utilStringQs } from '@rapid-sdk/util';
 import { geoSphericalDistance } from '@rapid-sdk/math';
 
-import { t, localizer } from '../core/localizer';
-
 
 /**
- * `RendererImagerySource` maintains the state of a single tiled imagery source.
+ * `ImagerySource` maintains the state of a single tiled imagery source.
  */
-export class RendererImagerySource {
+export class ImagerySource {
 
   /**
    * @constructor
-   * @param  `src`   source Object describing the imagery source
+   * @param  `context`  Global shared application context
+   * @param  `src`      source Object describing the imagery source
    */
-  constructor(src) {
+  constructor(context, src) {
+    this.context = context;
+
     this._id = src.id;
-    this._idtx = src.id.replace(/\./g, '<TX_DOT>');  // replace '.' in ids, so localizer can handle them
+    this._idtx = src.id.replace(/\./g, '<TX_DOT>');  // replace '.' in ids, so localization system can handle them
     this._name = src.name;
     this._description = src.description;
     this._template = src.encrypted ? utilAesDecrypt(src.template) : src.template;
@@ -51,15 +52,15 @@ export class RendererImagerySource {
   }
 
   get name() {
-    return t(`imagery.${this._idtx}.name`, { default: this._name });
+    return this.context.t(`imagery.${this._idtx}.name`, { default: this._name });
   }
 
   get label() {
-    return t.html(`imagery.${this._idtx}.name`, { default: this._name });
+    return this.context.tHtml(`imagery.${this._idtx}.name`, { default: this._name });
   }
 
   get description() {
-    return t.html(`imagery.${this._idtx}.description`, { default: this._description });
+    return this.context.tHtml(`imagery.${this._idtx}.description`, { default: this._description });
   }
 
   get imageryUsed() {
@@ -230,7 +231,9 @@ export class RendererImagerySource {
     const options = { day: 'numeric', month: 'short', year: 'numeric' };
     const d = new Date(s);
     if (isNaN(d.getTime())) return null;
-    return d.toLocaleDateString(localizer.localeCode(), options);
+
+    const localeCode = this.context.localizationSystem.localeCode();
+    return d.toLocaleDateString(localeCode, options);
   }
 
 
@@ -249,18 +252,18 @@ export class RendererImagerySource {
 
 
 /**
- * `RendererImagerySourceNone`
+ * `ImagerySourceNone`
  * A special imagery source for when the user has imagery disabled.
  */
-export class RendererImagerySourceNone extends RendererImagerySource {
-  constructor() {
-    super({ id: 'none', template: '' });
+export class ImagerySourceNone extends ImagerySource {
+  constructor(context) {
+    super(context, { id: 'none', template: '' });
   }
   get name() {
-    return t('background.none');
+    return this.context.t('background.none');
   }
   get label() {
-    return t.html('background.none');
+    return this.context.tHtml('background.none');
   }
   get area() {
     return -1;  // sources in background pane are sorted by area
@@ -272,19 +275,19 @@ export class RendererImagerySourceNone extends RendererImagerySource {
 
 
 /**
- * `RendererImagerySourceCustom`
+ * `ImagerySourceCustom`
  * A special imagery source for when the user has custom imagery.
  * Overrides the imageryUsed method, also allows the url template to be changed.
  */
-export class RendererImagerySourceCustom extends RendererImagerySource {
-  constructor() {
-    super({ id: 'custom', template: '' });
+export class ImagerySourceCustom extends ImagerySource {
+  constructor(context, template = '') {
+    super(context, { id: 'custom', template: template });
   }
   get name() {
-    return t('background.custom');
+    return this.context.t('background.custom');
   }
   get label() {
-    return t.html('background.custom');
+    return this.context.tHtml('background.custom');
   }
   get area() {
     return -2;  // sources in background pane are sorted by area
@@ -323,16 +326,16 @@ export class RendererImagerySourceCustom extends RendererImagerySource {
 
 
 /**
- * `RendererImagerySourceBing`
+ * `ImagerySourceBing`
  * A special imagery source for the Bing imagery source.
  * There should be more overrides in here, but they aren't currently working.
  *   https://docs.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata
  *   https://docs.microsoft.com/en-us/bingmaps/rest-services/directly-accessing-the-bing-maps-tiles
  *   See also https://github.com/openstreetmap/iD/pull/9133
  */
-export class RendererImagerySourceBing extends RendererImagerySource {
-  constructor(src) {
-    super(src);
+export class ImagerySourceBing extends ImagerySource {
+  constructor(context, src) {
+    super(context, src);
 
     // missing tile image strictness param (n=)
     // * n=f -> (Fail) returns a 404
@@ -345,13 +348,13 @@ export class RendererImagerySourceBing extends RendererImagerySource {
 
 
 /**
- * `RendererImagerySourceEsri`
+ * `ImagerySourceEsri`
  * A special imagery source for the Esri imagery sources
  * Overrides the getMetadata function to get more imagery metadata.
  */
-export class RendererImagerySourceEsri extends RendererImagerySource {
-  constructor(src) {
-    super(src);
+export class ImagerySourceEsri extends ImagerySource {
+  constructor(context, src) {
+    super(context, src);
 
     // In addition to using the tilemap at zoom level 20, overzoom real tiles
     //  #4327 (deprecated technique, but it works)
@@ -409,7 +412,7 @@ export class RendererImagerySourceEsri extends RendererImagerySource {
     const tileID = tileCoord.slice(0, 3).join('/');
     const zoom = Math.min(tileCoord[2], this.zoomExtent[1]);
     const centerPoint = center[0] + ',' + center[1];  // long, lat (as it should be)
-    const unknown = t('info_panels.background.unknown');
+    const unknown = this.context.t('info_panels.background.unknown');
 
     if (this._inflight[tileID]) return;
 
@@ -484,7 +487,7 @@ export class RendererImagerySourceEsri extends RendererImagerySource {
           }
 
           // pass through the discrete capture date from metadata
-          var captureDate = this._localeDateString(result.features[0].attributes.SRC_DATE2);
+          const captureDate = this._localeDateString(result.features[0].attributes.SRC_DATE2);
           vintage = {
             start: captureDate,
             end: captureDate,
diff --git a/modules/core/lib/Preset.js b/modules/core/lib/Preset.js
new file mode 100644
index 0000000000..a6f6ba92e6
--- /dev/null
+++ b/modules/core/lib/Preset.js
@@ -0,0 +1,372 @@
+import { utilArrayUniq, utilObjectOmit, utilSafeString } from '@rapid-sdk/util';
+
+import { osmAreaKeys } from '../../osm/tags';
+
+
+/**
+ *  Preset
+ */
+export class Preset {
+
+  /**
+   * @constructor
+   * @param  context     Global shared application context
+   * @param  presetID    String unique ID for this field
+   * @param  presetData  Object containing the original properties for this field
+   * @param  allFields   Object reference to the index of all the fields
+   * @param  allPresets  Object reference to the index of all the presets
+   */
+  constructor(context, presetID, presetData, allFields = {}, allPresets = {}) {
+    this.context = context;
+
+    this.id = presetID;
+    this.safeid = utilSafeString(presetID);    // for use in classes, element ids, css selectors
+    this.allFields = allFields;
+    this.allPresets = allPresets;
+
+    // Preserve and cleanup all original properties..
+    this.orig = {};
+    this.orig.addTags = presetData.addTags ?? presetData.tags ?? {};
+    this.orig.aliases = presetData.aliases ?? [];
+    this.orig.fields = presetData.fields ?? [];
+    this.orig.geometry = presetData.geometry ?? [];
+    this.orig.icon = presetData.icon;
+    this.orig.imageURL = presetData.imageURL;
+    this.orig.locationSet = presetData.locationSet;
+    this.orig.matchScore = presetData.matchScore ?? 1;
+    this.orig.moreFields = presetData.moreFields ?? [];
+    this.orig.name = presetData.name ?? '';
+    this.orig.reference = presetData.reference ?? {};
+    this.orig.removeTags = presetData.removeTags ?? presetData.addTags ?? presetData.tags ?? {};
+    this.orig.replacement = presetData.replacement;
+    this.orig.searchable = presetData.searchable ?? true;
+    this.orig.suggestion = presetData.suggestion;  // warning - not in the schema, but code uses it
+    this.orig.tags = presetData.tags ?? {};
+    this.orig.terms = (presetData.terms ?? []).join();
+
+    // Convert some `presetData` properties to class properties.. (others will become class functions)
+    Object.assign(this, utilObjectOmit(this.orig, ['aliases', 'fields', 'matchScore', 'moreFields', 'name', 'reference', 'terms']));
+
+    // caches
+    this._resolved = { fields: null, moreFields: null };
+    this._searchName = null;
+    this._searchNameStripped = null;
+    this._searchAliases = null;
+    this._searchAliasesStripped = null;
+  }
+
+
+  aliases() {
+    return this._resolveName('name')
+      .t('aliases', { 'default': this.orig.aliases }).trim().split(/\s*[\r\n]+\s*/);
+  }
+
+  name() {
+    return this._resolveName('name').t('name', { 'default': this.orig.name || this.id });
+  }
+
+  nameLabel() {
+    return this._resolveName('name').tHtml('name', { 'default': this.orig.name || this.id });
+    // return this._resolveName('name').t.append('name', { 'default': this.orig.name || this.id });  // someday?
+  }
+
+  fields() {
+    return this._resolved.fields || (this._resolved.fields = this._resolveFields('fields'));
+  }
+
+  moreFields() {
+    return this._resolved.moreFields || (this._resolved.moreFields = this._resolveFields('moreFields'));
+  }
+
+  resetFields() {
+    return this._resolved = { fields: null, moreFields: null };
+  }
+
+  matchGeometry(geom) {
+    return this.geometry.includes(geom);
+  }
+
+  matchAllGeometry(geometries) {
+    return geometries.every(geom => this.matchGeometry(geom));
+  }
+
+  matchScore(entityTags) {
+    const tags = this.tags;
+    let seen = {};
+    let score = 0;
+
+    // match on tags
+    for (let k in tags) {
+      seen[k] = true;
+      if (entityTags[k] === tags[k]) {
+        score += this.orig.matchScore;
+      } else if (tags[k] === '*' && k in entityTags) {
+        score += this.orig.matchScore / 2;
+      } else {
+        return -1;
+      }
+    }
+
+    // boost score for additional matches in addTags - iD#6802
+    const addTags = this.addTags;
+    for (let k in addTags) {
+      if (!seen[k] && entityTags[k] === addTags[k]) {
+        score += this.orig.matchScore;
+      }
+    }
+
+    return score;
+  }
+
+
+  t(scope, options) {
+    return this.context.t(`_tagging.presets.presets.${this.id}.${scope}`, options);
+  }
+
+  tHtml(scope, options) {
+    return this.context.tHtml(`_tagging.presets.presets.${this.id}.${scope}`, options);
+  }
+
+  tAppend (scope, options) {
+    return this.context.tAppend(`_tagging.presets.presets.${this.id}.${scope}`, options);
+  }
+
+  subtitle() {
+    if (this.suggestion) {
+      let path = this.id.split('/');
+      path.pop();  // remove brand name
+      return this.context.t('_tagging.presets.presets.' + path.join('/') + '.name');
+    }
+    return null;
+  }
+
+  subtitleLabel() {
+    if (this.suggestion) {
+      let path = this.id.split('/');
+      path.pop();  // remove brand name
+      return this.context.tHtml('_tagging.presets.presets.' + path.join('/') + '.name');
+    }
+    return null;
+  }
+
+
+  terms() {
+    return this._resolveName('name')
+      .t('terms', { 'default': this.orig.terms })
+      .toLowerCase().trim().split(/\s*,+\s*/);
+  }
+
+
+  searchName() {
+    if (!this._searchName) {
+      this._searchName = (this.suggestion ? this.orig.name : this.name()).toLowerCase();
+    }
+    return this._searchName;
+  }
+
+
+  searchNameStripped() {
+    if (!this._searchNameStripped) {
+      this._searchNameStripped = this._stripDiacritics(this.searchName());
+    }
+    return this._searchNameStripped;
+  }
+
+
+  searchAliases() {
+    if (!this._searchAliases) {
+      this._searchAliases = this.aliases().map(alias => alias.toLowerCase());
+    }
+    return this._searchAliases;
+  }
+
+
+  searchAliasesStripped() {
+    if (!this._searchAliasesStripped) {
+      this._searchAliasesStripped = this.searchAliases().map(this._stripDiacritics);
+    }
+    return this._searchAliasesStripped;
+  }
+
+
+  isFallback() {
+    return ['point', 'line', 'area', 'relation'].includes(this.id);
+//    const tagCount = Object.keys(this.tags).length;
+//    return tagCount === 0 || (tagCount === 1 && this.tags.hasOwnProperty('area'));
+  }
+
+
+  reference() {
+    // Lookup documentation on Wikidata...
+    const qid = (
+      this.tags.wikidata ||
+      this.tags['flag:wikidata'] ||
+      this.tags['brand:wikidata'] ||
+      this.tags['network:wikidata'] ||
+      this.tags['operator:wikidata']
+    );
+    if (qid) {
+      return { qid: qid };
+    }
+
+    // Lookup documentation on OSM Wikibase...
+    const key = this.orig.reference.key || Object.keys(utilObjectOmit(this.tags, 'name'))[0];
+    const value = this.orig.reference.value || this.tags[key];
+
+    if (value === '*') {
+      return { key: key };
+    } else {
+      return { key: key, value: value };
+    }
+  }
+
+
+  unsetTags(tags, geometry, ignoringKeys, skipFieldDefaults) {
+    // allow manually keeping some tags
+    const removeTags = ignoringKeys ? utilObjectOmit(this.removeTags, ignoringKeys) : this.removeTags;
+    tags = utilObjectOmit(tags, Object.keys(removeTags));
+
+    if (geometry && !skipFieldDefaults) {
+      this.fields().forEach(field => {
+        if (field.matchGeometry(geometry) && field.key && field.default === tags[field.key]) {
+          delete tags[field.key];
+        }
+      });
+    }
+
+    delete tags.area;
+    return tags;
+  }
+
+
+  setTags(tags, geometry, skipFieldDefaults) {
+    const addTags = this.addTags;
+    tags = Object.assign({}, tags);   // shallow copy
+
+    for (let k in addTags) {
+      if (addTags[k] === '*') {
+        // if this tag is ancillary, don't override an existing value since any value is okay
+        if (this.tags[k] || !tags[k] || tags[k] === 'no') {
+          tags[k] = 'yes';
+        }
+      } else {
+        tags[k] = addTags[k];
+      }
+    }
+
+    // Add area=yes if necessary.
+    // This is necessary if the geometry is already an area (e.g. user drew an area) AND any of:
+    // 1. chosen preset could be either an area or a line (`barrier=city_wall`)
+    // 2. chosen preset doesn't have a key in osmAreaKeys (`railway=station`)
+    if (!addTags.hasOwnProperty('area')) {
+      delete tags.area;
+      if (geometry === 'area') {
+        let needsAreaTag = true;
+        if (this.geometry.indexOf('line') === -1) {
+          for (let k in addTags) {
+            if (k in osmAreaKeys) {
+              needsAreaTag = false;
+              break;
+            }
+          }
+        }
+        if (needsAreaTag) {
+          tags.area = 'yes';
+        }
+      }
+    }
+
+    if (geometry && !skipFieldDefaults) {
+      this.fields().forEach(field => {
+        if (field.matchGeometry(geometry) && field.key && !tags[field.key] && field.default) {
+          tags[field.key] = field.default;
+        }
+      });
+    }
+
+    return tags;
+  }
+
+
+  _stripDiacritics(s) {
+    // split combined diacritical characters into their parts
+    if (s.normalize) s = s.normalize('NFD');
+    // remove diacritics
+    s = s.replace(/[\u0300-\u036f]/g, '');
+    return s;
+  }
+
+  // For a preset without its own name, use names from another preset.
+  // Replace {presetID} placeholders with the name of the specified presets.
+  _resolveName(prop) {
+    const val = this.orig[prop] || '';    // always lookup original properties, don't use the functions
+    const match = val.match(/^\{(.*)\}$/);
+    if (match) {
+      const preset = this.allPresets[match[1]];
+      if (preset) {
+        return preset;
+      } else {
+        console.warn(`Unable to resolve referenced preset: ${match[1]}.${prop}`);  // eslint-disable-line no-console
+      }
+    }
+    return this;
+  }
+
+  // For a preset without fields, use the fields of the parent preset.
+  // Replace {presetID} placeholders with the fields of the specified presets.
+  _resolveFields(prop) {
+    const fieldIDs = this.orig[prop] || '';    // always lookup original properties, don't use the functions
+    const thiz = this;
+    let resolved = [];
+
+    for (const fieldID of fieldIDs) {
+      const match = fieldID.match(/^\{(.*)\}$/);
+      if (match !== null) {    // a presetID wrapped in braces {}
+        resolved = resolved.concat(inheritFields(match[1], prop));
+      } else if (this.allFields[fieldID]) {    // a normal fieldID
+        resolved.push(this.allFields[fieldID]);
+      } else {
+        console.warn(`Cannot resolve "${fieldID}" found in ${this.id}.${prop}`);  // eslint-disable-line no-console
+      }
+    }
+
+    // no fields resolved, so use the parent's if possible
+    if (!resolved.length) {
+      const endIndex = this.id.lastIndexOf('/');
+      const parentID = endIndex && this.id.substring(0, endIndex);
+      if (parentID) {
+        resolved = inheritFields(parentID, prop);
+      }
+    }
+
+    return utilArrayUniq(resolved);
+
+
+    // returns an array of fields to inherit from the given presetID, if found
+    function inheritFields(presetID, prop) {
+      const parent = thiz.allPresets[presetID];
+      if (!parent) return [];
+
+      if (prop === 'fields') {
+        return parent.fields().filter(shouldInherit);
+      } else if (prop === 'moreFields') {
+        return parent.moreFields();
+      } else {
+        return [];
+      }
+    }
+
+
+    // Skip `fields` for the keys which define the preset.
+    // These are usually `typeCombo` fields like `shop=*`
+    function shouldInherit(f) {
+      if (f.key && thiz.tags[f.key] !== undefined &&
+        // inherit anyway if multiple values are allowed or just a checkbox
+        f.type !== 'multiCombo' && f.type !== 'semiCombo' && f.type !== 'manyCombo' && f.type !== 'check'
+      ) return false;
+
+      return true;
+    }
+  }
+
+}
diff --git a/modules/core/Tree.js b/modules/core/lib/Tree.js
similarity index 100%
rename from modules/core/Tree.js
rename to modules/core/lib/Tree.js
diff --git a/modules/core/lib/ValidationFix.js b/modules/core/lib/ValidationFix.js
new file mode 100644
index 0000000000..5d62f93d22
--- /dev/null
+++ b/modules/core/lib/ValidationFix.js
@@ -0,0 +1,13 @@
+
+export class ValidationFix {
+  constructor(props) {
+    this.title = props.title;                     // Required
+    this.onClick = props.onClick;                 // Optional - the function to run to apply the fix
+    this.disabledReason = props.disabledReason;   // Optional - a string explaining why the fix is unavailable, if any
+    this.icon = props.icon;                       // Optional - shows 'rapid-icon-wrench' if not set
+    this.entityIds = props.entityIds || [];       // Optional - used for hover-higlighting.
+//    this.autoArgs = props.autoArgs;             // Optional - pass [actions, annotation] arglist if this fix can automatically run
+
+    this.issue = null;    // Generated link - added by ValidationIssue
+  }
+}
diff --git a/modules/core/lib/ValidationIssue.js b/modules/core/lib/ValidationIssue.js
new file mode 100644
index 0000000000..9773f7eb7d
--- /dev/null
+++ b/modules/core/lib/ValidationIssue.js
@@ -0,0 +1,96 @@
+import { Extent } from '@rapid-sdk/math';
+
+import { ValidationFix } from './ValidationFix';
+import { utilTotalExtent } from '../../util';
+
+
+export class ValidationIssue {
+
+  constructor(context, props) {
+    this.context = context;
+
+    this.type = props.type;                  // required - name of rule that created the issue (e.g. 'missing_tag')
+    this.subtype = props.subtype;            // optional - category of the issue within the type (e.g. 'relation_type' under 'missing_tag')
+    this.severity = props.severity;          // required - 'warning' or 'error'
+    this.message = props.message;            // required - function returning localized string
+    this.reference = props.reference;        // optional - function(selection) to render reference information
+    this.entityIds = props.entityIds;        // optional - array of IDs of entities involved in the issue
+    this.loc = props.loc;                    // optional - [lon, lat] to zoom in on to see the issue
+    this.data = props.data;                  // optional - object containing extra data for the fixes
+    this.dynamicFixes = props.dynamicFixes;  // optional - function(context) returning fixes
+    this.hash = props.hash;                  // optional - string to further differentiate the issue
+
+    this.id = this._generateID();            // generated - see below
+    this.key = this._generateKey();          // generated - see below (call after generating this.id)
+    this.autoArgs = props.autoArgs;          // optional - if this issue can be autofixed, supply the autofix args at issue creation
+    this.autoFix = null;                     // generated - if autofix exists, will be set below
+  }
+
+
+  extent(resolver) {
+    if (this.loc) {
+      return new Extent(this.loc);
+    }
+    if (this.entityIds && this.entityIds.length) {
+      return utilTotalExtent(this.entityIds, resolver);
+    }
+    return null;
+  }
+
+
+  fixes() {
+    // sometimes the fixes are generated dynamically
+    let fixes = (typeof this.dynamicFixes === 'function') ? this.dynamicFixes() : [];
+
+    // For warnings, create an "ignore" option
+    if (this.severity === 'warning') {
+      fixes.push(new ValidationFix({
+        title: this.context.tHtml('issues.fix.ignore_issue.title'),
+        icon: 'rapid-icon-close',
+        onClick: () => {
+          this.context.validationSystem().ignoreIssue(this.id);
+        }
+      }));
+    }
+
+    for (const fix of fixes) {
+      fix.id = fix.title;   // the id doesn't matter as long as it's unique to this issue/fix
+      fix.issue = this;     // add a reference back to this issue for use in actions
+//      if (fix.autoArgs) {
+//        this.autoFix = fix;
+//    }
+    }
+    return fixes;
+  }
+
+
+  // A unique, deterministic string hash.
+  // Issues with identical id values are considered identical.
+  _generateID() {
+    let parts = [this.type];
+
+    if (this.hash) {   // subclasses can pass in their own differentiator
+      parts.push(this.hash);
+    }
+
+    if (this.subtype) {
+      parts.push(this.subtype);
+    }
+
+    // include the entities this issue is for
+    // (sort them so the id is deterministic)
+    if (this.entityIds) {
+      const entityKeys = this.entityIds.slice().sort();
+      parts.push.apply(parts, entityKeys);
+    }
+
+    return parts.join(':');
+  }
+
+
+  // An identifier suitable for use as the second argument to d3.selection#data().
+  // (i.e. this should change whenever the data needs to be refreshed)
+  _generateKey() {
+    return this.id + ':' + Date.now().toString();  // include time of creation
+  }
+}
diff --git a/modules/core/lib/index.js b/modules/core/lib/index.js
new file mode 100644
index 0000000000..0bb8b53fd2
--- /dev/null
+++ b/modules/core/lib/index.js
@@ -0,0 +1,18 @@
+export { Category } from './Category';
+export { Collection } from './Collection';
+export { Difference } from './Difference';
+
+export {
+  ImagerySource,
+  ImagerySourceBing,
+  ImagerySourceCustom,
+  ImagerySourceEsri,
+  ImagerySourceNone
+} from './ImagerySource';
+
+export { Field } from './Field';
+export { Graph } from './Graph';
+export { Preset } from './Preset';
+export { Tree } from './Tree';
+export { ValidationFix } from './ValidationFix';
+export { ValidationIssue } from './ValidationIssue';
diff --git a/modules/core/localizer.js b/modules/core/localizer.js
deleted file mode 100644
index 637f932fc6..0000000000
--- a/modules/core/localizer.js
+++ /dev/null
@@ -1,495 +0,0 @@
-import { utilStringQs } from '@rapid-sdk/util';
-
-import { fileFetcher } from './file_fetcher';
-import { utilDetect } from '../util/detect';
-
-
-let _mainLocalizer = coreLocalizer();   // singleton
-let _t = _mainLocalizer.t;
-
-export {
-  _mainLocalizer as localizer,
-  _t as t     // export `t` function for ease-of-use
-};
-
-
-//
-// coreLocalizer manages language and locale parameters including translated strings
-//
-export function coreLocalizer() {
-
-  let localizer = {};
-
-  // `_supportedLanguages`
-  // All known language codes and their local name. This is used for the language pickers.
-  // {
-  //   "ar": { "nativeName": "العربية" },
-  //   "de": { "nativeName": "Deutsch" },
-  //   "en": { "nativeName": "English" },
-  //   …
-  // }
-  let _supportedLanguages = {};
-
-  // `_supportedLocales`
-  // All supported locale codes that we can fetch translated strings for.
-  // We generate this based on the data that we fetch from Transifex.
-  //
-  // * `rtl` - right-to-left or left-to-right text direction
-  // * `pct` - the percent of strings translated; 1 = 100%, full coverage
-  //
-  // {
-  //   "ar":    { "rtl": true, "pct": 0 },
-  //   "ar-AA": { "rtl": true, "pct": 0 },
-  //   "en":    { "rtl": false, "pct": 1 },
-  //   "en-AU": { "rtl": false, "pct": 0 },
-  //   "en-GB": { "rtl": false, "pct": 0 },
-  //   "de":    { "rtl": false, "pct": 0 },
-  //   …
-  // }
-  let _supportedLocales = {};
-
-  // `_cache`
-  // Where we keep all loaded localized string data, organized by "scope" and "locale":
-  // {
-  //   general: {
-  //     en: { icons: {…}, toolbar: {…}, modes: {…}, operations: {…}, … },
-  //     de: { icons: {…}, toolbar: {…}, modes: {…}, operations: {…}, … },
-  //     …
-  //   },
-  //   tagging: {
-  //     en: { presets: {…}, fields: {…}, … },
-  //     de: { presets: {…}, fields: {…}, … },
-  //     …
-  //   },
-  // }
-  let _cache = {};
-
-  let _preferredLocaleCodes = [];
-  let _currLocaleCode = 'en-US';            // The current locale
-  let _currLocaleCodes = ['en-US', 'en'];   // Must contain `_currLocaleCode` first, followed by fallbacks
-  let _currLanguageCode = 'en';
-  let _currTextDirection = 'ltr';
-  let _currIsMetric = false;
-  let _languageNames = {};
-  let _scriptNames = {};
-
-  // getters for the current locale parameters
-  localizer.localeCode = () => _currLocaleCode;
-  localizer.localeCodes = () => _currLocaleCodes;
-  localizer.languageCode = () => _currLanguageCode;
-  localizer.textDirection = () => _currTextDirection;
-  localizer.usesMetric = () => _currIsMetric;
-  localizer.languageNames = () => _languageNames;
-  localizer.scriptNames = () => _scriptNames;
-
-  /**
-   * preferredLocaleCodes
-   * Allows the user to manually set the locale, overriding the locales specified by the browser
-   * If you're going to use this, you must call it before `ensureLoaded` starts fetching data.
-   * @param   codes  Array or String of preferred locales
-   */
-  localizer.preferredLocaleCodes = function(codes) {
-    if (typeof codes === 'string') {
-      // Be generous and accept delimited strings as input
-      _preferredLocaleCodes = codes.split(/,|;| /gi).filter(Boolean);
-    } else {
-      _preferredLocaleCodes = codes || [];
-    }
-    return localizer;
-  };
-
-
-  /**
-   * ensureLoaded
-   * Call this before doing anything with the localizer to ensure that necessary files have been loaded
-   * @return {Promise}   A Promise resolved after the files have been loaded
-   */
-  let _loadPromise;
-  localizer.ensureLoaded = () => {
-    if (_loadPromise) return _loadPromise;
-
-    let filesToFetch = ['languages', 'locales'];
-
-    const scopes = {
-      general: 'locales',
-      tagging: 'https://cdn.jsdelivr.net/npm/@openstreetmap/id-tagging-schema@6.0/dist/translations'
-    };
-
-    let fileMap = fileFetcher.fileMap();
-    for (let scope in scopes) {
-      const key = `locales_index_${scope}`;
-      if (!fileMap[key]) {
-        fileMap[key] = scopes[scope] + '/index.min.json';
-      }
-      filesToFetch.push(key);
-    }
-
-    return _loadPromise = Promise.all(filesToFetch.map(key => fileFetcher.get(key)))
-      .then(results => {
-        _supportedLanguages = results[0];
-        _supportedLocales = results[1];
-
-        let indexes = results.slice(2);
-        let requestedLocales = (_preferredLocaleCodes || [])
-          .concat(utilDetect().browserLocales)   // List of locales preferred by the browser in priority order.
-          .concat(['en']);   // fallback to English since it's the only guaranteed complete language
-
-        _currLocaleCodes = localesToUseFrom(requestedLocales);
-        _currLocaleCode = _currLocaleCodes[0];   // First is highest priority locale; the rest are fallbacks
-
-        let loadStringsPromises = [];
-
-        indexes.forEach((index, i) => {
-//          // Will always return the index for `en` if nothing else
-//          const fullCoverageIndex = _currLocaleCodes.findIndex(function(locale) {
-//            return index[locale] && index[locale].pct === 1;
-//          });
-//          // We only need to load locales up until we find one with full coverage
-//          // _currLocaleCodes.slice(0, fullCoverageIndex + 1).forEach(code => {
-// Rapid note:
-// We always need `en` because it contains Rapid strings that are not localized to other languages.
-// This means we can't assume that a language with 100% coverage is an alternative for `en`.
-          _currLocaleCodes.forEach(code => {
-            const scope = Object.keys(scopes)[i];
-            const directory = Object.values(scopes)[i];
-            if (index[code]) {
-              loadStringsPromises.push(localizer.loadLocale(code, scope, directory));
-            }
-          });
-        });
-
-        return Promise.all(loadStringsPromises);
-      })
-      .then(() => updateForCurrentLocale())
-      .catch(e => console.error(e));  // eslint-disable-line
-  };
-
-
-  /**
-   * localesToUseFrom
-   * Returns the locales from `requestedLocales` that are actually supported
-   * @param  {Array}  requestedLocales  Array or Set of locale codes to consider
-   * @return {Array}  The locales that we can actually support
-   */
-  function localesToUseFrom(requestedLocales) {
-    let toUse = new Set();
-    requestedLocales.forEach(locale => {
-      if (_supportedLocales[locale]) {
-        toUse.add(locale);
-      }
-      // For a locale with a culture code ('es-ES'), include fallback to the base locale ('es')
-      if (locale.includes('-')) {
-        const base = locale.split('-')[0];
-        if (_supportedLocales[base]) {
-          toUse.add(base);
-        }
-      }
-    });
-    return Array.from(toUse);
-  }
-
-
-  /**
-   * updateForCurrentLocale
-   * Called after all locale files have been fetched to finalize the current state
-   */
-  function updateForCurrentLocale() {
-    if (!_currLocaleCode) return;
-
-    const [language, culture] = _currLocaleCode.toLowerCase().split('-', 2);
-    _currLanguageCode = language;
-    _currIsMetric = (culture !== 'us');
-
-    // Allow hash parameter to override the locale 'rtl' setting - useful for testing
-    const hash = utilStringQs(window.location.hash);
-    if (hash.rtl === 'true') {
-      _currTextDirection = 'rtl';
-    } else if (hash.rtl === 'false') {
-      _currTextDirection = 'ltr';
-    } else {
-      const supported = _supportedLocales[_currLocaleCode] || _supportedLocales[_currLanguageCode];
-      _currTextDirection = supported && supported.rtl ? 'rtl' : 'ltr';
-    }
-
-    // Language and Script names will appear in the local language
-    let locale = _currLocaleCode;
-    if (locale.toLowerCase() === 'en-us') {
-      locale = 'en';
-    }
-    _languageNames = _cache.general[locale].languageNames;
-    _scriptNames = _cache.general[locale].scriptNames;
-  }
-
-
-  /**
-   * loadLocale
-   * Returns a Promise to load the strings for the requested locale
-   * @param  {string}  locale     locale code to load
-   * @param  {string}  scope      one of `general`, `tagging`, etc (not clear whether this is actually used?)
-   * @param  {string}  directory  directory to include in the filename
-   * @return {Promise}
-   */
-  localizer.loadLocale = (locale, scope, directory) => {
-    if (locale.toLowerCase() === 'en-us') {   // US English is the default
-      locale = 'en';
-    }
-
-    if (_cache[scope] && _cache[scope][locale]) {    // already loaded
-      return Promise.resolve(locale);
-    }
-
-    let fileMap = fileFetcher.fileMap();
-    const key = `locale_${scope}_${locale}`;
-    if (!fileMap[key]) {
-      fileMap[key] = `${directory}/${locale}.min.json`;
-    }
-
-    return fileFetcher.get(key)
-      .then(d => {
-        if (!_cache[scope]) {
-          _cache[scope] = {};
-        }
-        _cache[scope][locale] = d[locale];
-        return locale;
-      });
-  };
-
-
-  /**
-   * pluralRule
-   * Returns the plural rule for the given `number` with the given `code`.
-   * see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/PluralRules/select
-   *
-   * @param  {number}   number      number to get the plural rule
-   * @param  {string?}  locale      locale to use (defaults to currentLocale)
-   * @return {string}   One of: `zero`, `one`, `two`, `few`, `many`, `other`
-   */
-  localizer.pluralRule = function(number, locale = _currLocaleCode) {
-    // modern browsers have this functionality built-in
-    const rules = 'Intl' in window && Intl.PluralRules && new Intl.PluralRules(locale);
-    if (rules) {
-      return rules.select(number);
-    }
-    // fallback to basic one/other, as in English
-    return (number === 1) ? 'one' : 'other';
-  };
-
-
-  /**
-   * _getString
-   * Try to find that string in `locale` or the current `_currLocaleCode` matching
-   * the given `stringId`. If no string can be found in the requested locale,
-   * we'll recurse through all the `_currLocaleCodes` until one is found.
-   *
-   * @param  {string}   stringId      string identifier
-   * @param  {object?}  replacements  token replacements and default string
-   * @param  {string?}  locale        locale to use (defaults to currentLocale)
-   * @return {object?}  result containing the localized string and chosen locale
-   */
-  localizer._getString = function(origStringId, replacements, locale) {
-    let stringId = origStringId.trim();
-    let scope = 'general';
-
-    if (stringId[0] === '_') {
-      const split = stringId.split('.');
-      scope = split[0].slice(1);
-      stringId = split.slice(1).join('.');
-    }
-
-    locale = locale || _currLocaleCode;
-
-    let path = stringId
-      .split('.')
-      .map(s => s.replace(/<TX_DOT>/g, '.'))
-      .reverse();
-
-    let stringsKey = locale;
-    // US English is the default
-    if (stringsKey.toLowerCase() === 'en-us') stringsKey = 'en';
-    let result = _cache[scope] && _cache[scope][stringsKey];
-
-    while (result !== undefined && path.length) {
-      result = result[path.pop()];
-    }
-
-    if (result !== undefined) {
-      if (replacements) {
-        if (typeof result === 'object' && Object.keys(result).length) {
-          // If plural forms are provided, dig one level deeper based on the
-          // first numeric token replacement provided.
-          const number = Object.values(replacements).find(val => (typeof val === 'number'));
-          if (number !== undefined) {
-            const rule = localizer.pluralRule(number, locale);
-            if (result[rule]) {
-              result = result[rule];
-            } else {
-              // We're pretty sure this should be a plural but no string
-              // could be found for the given rule. Just pick the first
-              // string and hope it makes sense.
-              result = Object.values(result)[0];
-            }
-          }
-        }
-
-        if (typeof result === 'string') {
-          for (let key in replacements) {
-            let value = replacements[key];
-            if (typeof value === 'number') {
-              if (value.toLocaleString) {
-                // format numbers for the locale
-                value = value.toLocaleString(locale, {
-                  style: 'decimal',
-                  useGrouping: true,
-                  minimumFractionDigits: 0
-                });
-              } else {
-                value = value.toString();
-              }
-            }
-            const token = `{${key}}`;
-            const regex = new RegExp(token, 'g');
-            result = result.replace(regex, value);
-          }
-        }
-      }
-      if (typeof result === 'string') {  // found a localized string!
-        return { text: result, locale: locale };
-      }
-    }
-    // no localized string found...
-
-    // attempt to fallback to a lower-priority language
-    let index = _currLocaleCodes.indexOf(locale);
-    if (index >= 0 && index < _currLocaleCodes.length - 1) {
-      const fallback = _currLocaleCodes[index + 1];
-      return localizer._getString(origStringId, replacements, fallback);
-    }
-
-    // Fallback to a default value if one is specified in `replacements`
-    if (replacements && 'default' in replacements) {
-      return { text: replacements.default, locale: null };
-    }
-
-    const missing = `Missing ${locale} translation: ${origStringId}`;
-    if (typeof console !== 'undefined') console.error(missing);  // eslint-disable-line
-
-    return { text: missing, locale: 'en' };
-  };
-
-
-  /**
-   * hasTextForStringId
-   * Returns true if the given string id will return a string
-   *
-   * @param  {string}   stringId      string identifier
-   * @return {boolean}  true if the given string id will return a string
-   */
-  localizer.hasTextForStringId = function(stringId) {
-    return !!localizer._getString(stringId, { default: 'nothing found'}).locale;
-  };
-
-
-  /**
-   * t
-   * Returns only the localized text, discarding the locale info
-   * @param  {string}   stringId      string identifier
-   * @param  {object?}  replacements  token replacements and default string
-   * @param  {string?}  locale        locale to use (defaults to currentLocale)
-   * @return {string?}  the localized string
-   */
-  localizer.t = function(stringId, replacements, locale) {
-    return localizer._getString(stringId, replacements, locale).text;
-  };
-
-
-  /**
-   * t.html
-   * Returns the localized text wrapped in an HTML span element encoding the locale info
-   * @param  {string}   stringId      string identifier
-   * @param  {object?}  replacements  token replacements and default string
-   * @param  {string?}  locale        locale to use (defaults to currentLocale)
-   * @return {string}   localized string wrapped in a HTML span, or empty string ''
-   */
-  localizer.t.html = function(stringId, replacements, locale) {
-    const info = localizer._getString(stringId, replacements, locale);
-    // text may be empty or undefined depending on `replacements.default`
-    return info.text ? localizer.htmlForLocalizedText(info.text, info.locale) : '';
-  };
-
-
-  /**
-   * t.append
-   * Safer version of t.html that instead uses a function that appends the localized text to the given d3 selection
-   * @param  {string}   stringId      string identifier
-   * @param  {object?}  replacements  token replacements and default string
-   * @param  {string?}  locale        locale to use (defaults to currentLocale)
-   * @return {Function} Function that accepts a d3 selection and appends the localized text
-   */
-  localizer.t.append = function(stringId, replacements, locale) {
-    const ret = function(selection) {
-      const info = localizer._getString(stringId, replacements, locale);
-      return selection.append('span')
-        .attr('class', 'localized-text')
-        .attr('lang', info.locale || 'und')
-        .text((replacements?.prefix || '') + info.text + (replacements?.suffix || ''));
-    };
-    ret.stringId = stringId;
-    return ret;
-  };
-
-
-  /**
-   * htmlForLocalizedText
-   * Just returns the given text wrapped in an HTML span element encoding the locale
-   * @param  {string}   text          the text content for the span
-   * @param  {string?}  localeCode    the locale code for the span
-   * @return {string}   text wrapped in a HTML span
-   */
-  localizer.htmlForLocalizedText = function(text, localeCode) {
-    return `<span class="localized-text" lang="${localeCode || 'unknown'}">${text}</span>`;
-  };
-
-
-  /**
-   * languageName
-   * Returns a display-ready string for a given language code
-   * @param  {string}   code          the language code (e.g. 'de')
-   * @param  {object?}  options       see below
-   * @return {string}   the language string to display (e.g. "Deutsch (de)")
-   */
-  localizer.languageName = (code, options) => {
-    if (_languageNames[code]) {     // name in locale language
-      // e.g. "German"
-      return _languageNames[code];
-    }
-
-    // sometimes we only want the local name
-    if (options && options.localOnly) return null;
-
-    const langInfo = _supportedLanguages[code];
-    if (langInfo) {
-      if (langInfo.nativeName) {  // name in native language
-        // e.g. "Deutsch (de)"
-        return localizer.t('translate.language_and_code', { language: langInfo.nativeName, code: code });
-
-      } else if (langInfo.base && langInfo.script) {
-        const base = langInfo.base;   // the code of the language this is based on
-
-        if (_languageNames[base]) {   // base language name in locale language
-          const scriptCode = langInfo.script;
-          const script = _scriptNames[scriptCode] || scriptCode;
-          // e.g. "Serbian (Cyrillic)"
-          return localizer.t('translate.language_and_code', { language: _languageNames[base], code: script });
-
-        } else if (_supportedLanguages[base] && _supportedLanguages[base].nativeName) {
-          // e.g. "српски (sr-Cyrl)"
-          return localizer.t('translate.language_and_code', { language: _supportedLanguages[base].nativeName, code: code });
-        }
-      }
-    }
-    return code;  // if not found, use the code
-  };
-
-
-  return localizer;
-}
diff --git a/modules/core/preferences.js b/modules/core/preferences.js
deleted file mode 100644
index e50f35002a..0000000000
--- a/modules/core/preferences.js
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// https://github.com/openstreetmap/iD/issues/772
-// http://mathiasbynens.be/notes/localstorage-pattern#comment-9
-let _storage;
-try { _storage = localStorage; } catch (e) {}  // eslint-disable-line no-empty
-_storage = _storage || (() => {
-  let s = {};
-  return {
-    getItem: (k) => s[k],
-    setItem: (k, v) => s[k] = v,
-    removeItem: (k) => delete s[k]
-  };
-})();
-
-
-/**
- * corePreferences
- * Interface for persisting basic key-value strings within and between Rapid sessions on the same site.
- * @param {string} k
- * @param {string?} v
- * @returns {boolean} true if the action succeeded
- */
-function corePreferences(k, v) {
-
-  try {
-    if (arguments.length === 1) return _storage.getItem(k);
-    else if (v === null) _storage.removeItem(k);
-    else _storage.setItem(k, v);
-    return true;
-  } catch (e) {
-    /* eslint-disable no-console */
-    if (typeof console !== 'undefined') {
-      console.error('localStorage quota exceeded');
-    }
-    /* eslint-enable no-console */
-    return false;
-  }
-}
-
-export { corePreferences as prefs };
diff --git a/modules/core/rapid_context.js b/modules/core/rapid_context.js
deleted file mode 100644
index 5e5e586f69..0000000000
--- a/modules/core/rapid_context.js
+++ /dev/null
@@ -1,219 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { gpx } from '@tmcw/togeojson';
-import { Extent } from '@rapid-sdk/math';
-
-import { localizer, t } from '../core/localizer';
-import { services } from '../services';
-import { utilRebind } from '../util';
-
-
-export function coreRapidContext(context) {
-  const dispatch = d3_dispatch('task_extent_set');
-  let _rapidContext = {};
-  _rapidContext.showPowerUser = context.initialHashParams.poweruser === 'true';
-
-  function distinct(value, index, self) {
-    return self.indexOf(value) === index;
-  }
-
-  /* Task extents */
-  let _taskExtent;
-  let _isTaskBoundsRect;
-
-  _rapidContext.setTaskExtentByGpxData = function(gpxData) {
-    const dom = (new DOMParser()).parseFromString(gpxData, 'text/xml');
-    const gj = gpx(dom);
-    const lineStringCount = gj.features.reduce((accumulator, currentValue) =>  {
-      return accumulator + (currentValue.geometry.type === 'LineString' ? 1 : 0);
-    }, 0);
-
-    if (gj.type === 'FeatureCollection') {
-      let minlat, minlon, maxlat, maxlon;
-
-      gj.features.forEach(f => {
-        if (f.geometry.type === 'Point') {
-          const lon = f.geometry.coordinates[0];
-          const lat = f.geometry.coordinates[1];
-          if (minlat === undefined || lat < minlat) minlat = lat;
-          if (minlon === undefined || lon < minlon) minlon = lon;
-          if (maxlat === undefined || lat > maxlat) maxlat = lat;
-          if (maxlon === undefined || lon > maxlon) maxlon = lon;
-
-        } else if (f.geometry.type === 'LineString' && lineStringCount === 1) {
-          const lats = f.geometry.coordinates.map(f => f[0]);
-          const lngs = f.geometry.coordinates.map(f => f[1]);
-          const uniqueLats = lats.filter(distinct);
-          const uniqueLngs = lngs.filter(distinct);
-          let eachLatHas2Lngs = true;
-
-          uniqueLats.forEach(lat => {
-            const lngsForThisLat = f.geometry.coordinates
-              .filter(coord => coord[0] === lat)   // Filter the coords to the ones with this lat
-              .map(coord => coord[1])              // Make an array of lngs that associate with that lat
-              .filter(distinct);                   // Finally, filter for uniqueness
-
-            if (lngsForThisLat.length !== 2) {
-              eachLatHas2Lngs = false;
-            }
-          });
-          // Check for exactly two unique latitudes, two unique longitudes,
-          // and that each latitude was associated with exactly 2 longitudes,
-          if (uniqueLats.length === 2 && uniqueLngs.length === 2 && eachLatHas2Lngs) {
-            _isTaskBoundsRect = true;
-          } else {
-            _isTaskBoundsRect = false;
-          }
-        }
-      });
-
-      _taskExtent = new Extent([minlon, minlat], [maxlon, maxlat]);
-      dispatch.call('task_extent_set');
-    }
-  };
-
-  _rapidContext.getTaskExtent = () => _taskExtent;
-
-  _rapidContext.isTaskRectangular = () => (!!_taskExtent && _isTaskBoundsRect);
-
-
-  /* Sources */
-  _rapidContext.sources = new Set();
-
-
-  /* Colors */
-  const RAPID_MAGENTA = '#da26d3';
-  const COLORS = [
-    '#ff0000',  // red
-    '#ffa500',  // orange
-    '#ffd700',  // gold
-    '#00ff00',  // lime
-    '#00ffff',  // cyan
-    '#1e90ff',  // dodgerblue
-    '#da26d3',  // rapid magenta
-    '#ffc0cb',  // pink
-    '#d3d3d3',  // lightgray
-    '#faf0e6'   // linen
-  ];
-  _rapidContext.colors = () => COLORS;
-
-
-  /* Available datasets */
-  let _datasets = {};
-  _rapidContext.datasets = () => _datasets;
-
-
-  /**
-   * init
-   * Called one time after all objects have been instantiated.
-   */
-  _rapidContext.init = () => {
-    context.urlhash().on('hashchange', _hashchange);
-
-    localizer.ensureLoaded()
-      .then(() => {
-        _datasets = {
-          // setup the built-in datasets
-          'fbRoads': {
-            id: 'fbRoads',
-            beta: false,
-            added: true,         // whether it should appear in the list
-            enabled: false,      // whether the user has checked it on
-            conflated: true,
-            service: 'fbml',
-            color: RAPID_MAGENTA,
-            label: t('rapid_feature_toggle.fbRoads.label'),
-            license_markdown: t('rapid_feature_toggle.fbRoads.license_markdown')
-          },
-          'msBuildings': {
-            id: 'msBuildings',
-            beta: false,
-            added: true,         // whether it should appear in the list
-            enabled: false,      // whether the user has checked it on
-            conflated: true,
-            service: 'fbml',
-            color: RAPID_MAGENTA,
-            label: t('rapid_feature_toggle.msBuildings.label'),
-            license_markdown: t('rapid_feature_toggle.msBuildings.license_markdown')
-          }
-        };
-      });
-  };
-
-
-  /* reset any state here */
-  _rapidContext.reset = () => {
-    _rapidContext.sources = new Set();
-  };
-
-
-  /**
-   * _hashchange
-   * Respond to any changes appearing in the url hash
-   * @param  q   Object containing key/value pairs of the current query parameters
-   */
-  function _hashchange(q) {
-    // datasets
-    let toEnable = new Set();
-    if (typeof q.datasets === 'string') {
-      toEnable = new Set(q.datasets.split(','));
-    }
-
-    // Update all known datasets
-    for (const datasetID of Object.keys(_datasets)) {
-      const dataset = _datasets[datasetID];
-      if (toEnable.has(datasetID)) {
-        dataset.enabled = true;
-        toEnable.delete(datasetID);  // delete marks it as done
-      } else {
-        dataset.enabled = false;
-      }
-    }
-
-    // If there are remaining datasets to enable, try to load them from Esri.
-    const service = services.esriData;
-    if (!service || !toEnable.size) return;
-
-    service.loadDatasets()
-      .then(results => {
-        toEnable.forEach(datasetID => {
-          const d = results[datasetID];
-          if (!d) return;  // dataset with requested id not found, fail silently
-
-          // *** Code here is copied from `rapid_view_manage_datasets.js` `toggleDataset()` ***
-          service.loadLayer(d.id);   // start fetching layer info (the mapping between attributes and tags)
-
-          const isBeta = d.groupCategories.some(cat => cat.toLowerCase() === '/categories/preview');
-          const isBuildings = d.groupCategories.some(cat => cat.toLowerCase() === '/categories/buildings');
-          const nextColor = Object.keys(_datasets).length % COLORS.length;
-
-          let dataset = {
-            id: d.id,
-            beta: isBeta,
-            added: true,       // whether it should appear in the list
-            enabled: true,     // whether the user has checked it on
-            conflated: false,
-            service: 'esri',
-            color: COLORS[nextColor],
-            label: d.title,
-            license_markdown: t('rapid_feature_toggle.esri.license_markdown')
-          };
-
-          if (d.extent) {
-            dataset.extent = new Extent(d.extent[0], d.extent[1]);
-          }
-
-          // Test running building layers through FBML conflation service
-          if (isBuildings) {
-            dataset.conflated = true;
-            dataset.service = 'fbml';
-          }
-
-          _datasets[d.id] = dataset;  // add it
-        });
-      });
-  }
-
-
-
-  return utilRebind(_rapidContext, dispatch, 'on');
-}
diff --git a/modules/core/uploader.js b/modules/core/uploader.js
deleted file mode 100644
index b55dd66dfb..0000000000
--- a/modules/core/uploader.js
+++ /dev/null
@@ -1,390 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { utilArrayUnion, utilArrayUniq } from '@rapid-sdk/util';
-
-import { fileFetcher } from './file_fetcher';
-import { actionDiscardTags } from '../actions/discard_tags';
-import { actionMergeRemoteChanges } from '../actions/merge_remote_changes';
-import { actionNoop } from '../actions/noop';
-import { actionRevert } from '../actions/revert';
-import { Graph } from '../core/Graph';
-import { t } from '../core/localizer';
-import { utilDisplayName, utilDisplayType, utilRebind } from '../util';
-
-
-export function coreUploader(context) {
-
-    var dispatch = d3_dispatch(
-        // Start and end events are dispatched exactly once each per legitimate outside call to `save`
-        'saveStarted', // dispatched as soon as a call to `save` has been deemed legitimate
-        'saveEnded',   // dispatched after the result event has been dispatched
-
-        'willAttemptUpload', // dispatched before the actual upload call occurs, if it will
-        'progressChanged',
-
-        // Each save results in one of these outcomes:
-        'resultNoChanges', // upload wasn't attempted since there were no edits
-        'resultErrors',    // upload failed due to errors
-        'resultConflicts', // upload failed due to data conflicts
-        'resultSuccess'    // upload completed without errors
-    );
-
-    var _isSaving = false;
-
-    var _conflicts = [];
-    var _errors = [];
-    var _origChanges;
-
-    var _discardTags = {};
-    fileFetcher.get('discarded')
-        .then(function(d) { _discardTags = d; })
-        .catch(function() { /* ignore */ });
-
-    var uploader = utilRebind({}, dispatch, 'on');
-
-    uploader.isSaving = function() {
-        return _isSaving;
-    };
-
-    uploader.save = function(changeset, tryAgain, checkConflicts) {
-        // Guard against accidentally entering save code twice - #4641
-        if (_isSaving && !tryAgain) {
-            return;
-        }
-
-        var osm = context.connection();
-        if (!osm) return;
-
-        // If user somehow got logged out mid-save, try to reauthenticate..
-        // This can happen if they were logged in from before, but the tokens are no longer valid.
-        if (!osm.authenticated()) {
-            osm.authenticate(function(err) {
-                if (!err) {
-                    uploader.save(changeset, tryAgain, checkConflicts);  // continue where we left off..
-                }
-            });
-            return;
-        }
-
-        if (!_isSaving) {
-            _isSaving = true;
-            dispatch.call('saveStarted', this);
-        }
-
-        var history = context.history();
-
-        _conflicts = [];
-        _errors = [];
-
-        // Store original changes, in case user wants to download them as an .osc file
-        _origChanges = history.changes(actionDiscardTags(history.difference(), _discardTags));
-
-        // First time, `history.perform` a no-op action.
-        // Any conflict resolutions will be done as `history.replace`
-        // Remember to pop this later if needed
-        if (!tryAgain) {
-            history.perform(actionNoop());
-        }
-
-        // Attempt a fast upload.. If there are conflicts, re-enter with `checkConflicts = true`
-        if (!checkConflicts) {
-            upload(changeset);
-
-        // Do the full (slow) conflict check..
-        } else {
-            performFullConflictCheck(changeset);
-        }
-
-    };
-
-
-    function performFullConflictCheck(changeset) {
-        var osm = context.connection();
-        if (!osm) return;
-
-        var history = context.history();
-
-        var localGraph = context.graph();
-        var remoteGraph = new Graph(history.base(), true);
-
-        var summary = history.difference().summary();
-        var _toCheck = [];
-        for (const [entityID, item] of summary) {
-          if (item.changeType === 'modified') {
-            _toCheck.push(entityID);
-          }
-        }
-
-        var _toLoad = withChildNodes(_toCheck, localGraph);
-        var _loaded = {};
-        var _toLoadCount = 0;
-        var _toLoadTotal = _toLoad.length;
-
-        if (_toCheck.length) {
-            dispatch.call('progressChanged', this, _toLoadCount, _toLoadTotal);
-            _toLoad.forEach(function(id) { _loaded[id] = false; });
-            osm.loadMultiple(_toLoad, loaded);
-        } else {
-            upload(changeset);
-        }
-
-        return;
-
-        function withChildNodes(ids, graph) {
-            var s = new Set(ids);
-            ids.forEach(function(id) {
-                var entity = graph.entity(id);
-                if (entity.type !== 'way') return;
-
-                graph.childNodes(entity).forEach(function(child) {
-                    if (child.version !== undefined) {
-                        s.add(child.id);
-                    }
-                });
-            });
-
-            return Array.from(s);
-        }
-
-
-        // Reload modified entities into an alternate graph and check for conflicts..
-        function loaded(err, result) {
-            if (_errors.length) return;
-
-            if (err) {
-                _errors.push({
-                    msg: err.message || err.responseText,
-                    details: [ t('save.status_code', { code: err.status }) ]
-                });
-                didResultInErrors();
-
-            } else {
-                var loadMore = [];
-
-                result.data.forEach(function(entity) {
-                    remoteGraph.replace(entity);
-                    _loaded[entity.id] = true;
-                    _toLoad = _toLoad.filter(function(val) { return val !== entity.id; });
-
-                    if (!entity.visible) return;
-
-                    // Because loadMultiple doesn't download /full like loadEntity,
-                    // need to also load children that aren't already being checked..
-                    var i, id;
-                    if (entity.type === 'way') {
-                        for (i = 0; i < entity.nodes.length; i++) {
-                            id = entity.nodes[i];
-                            if (_loaded[id] === undefined) {
-                                _loaded[id] = false;
-                                loadMore.push(id);
-                            }
-                        }
-                    } else if (entity.type === 'relation' && entity.isMultipolygon()) {
-                        for (i = 0; i < entity.members.length; i++) {
-                            id = entity.members[i].id;
-                            if (_loaded[id] === undefined) {
-                                _loaded[id] = false;
-                                loadMore.push(id);
-                            }
-                        }
-                    }
-                });
-
-                _toLoadCount += result.data.length;
-                _toLoadTotal += loadMore.length;
-                dispatch.call('progressChanged', this, _toLoadCount, _toLoadTotal);
-
-                if (loadMore.length) {
-                    _toLoad.push.apply(_toLoad, loadMore);
-                    osm.loadMultiple(loadMore, loaded);
-                }
-
-                if (!_toLoad.length) {
-                    detectConflicts();
-                    upload(changeset);
-                }
-            }
-        }
-
-
-        function detectConflicts() {
-            function choice(id, text, action) {
-                return {
-                    id: id,
-                    text: text,
-                    action: function() {
-                        history.replace(action);
-                    }
-                };
-            }
-            function formatUser(d) {
-                return '<a href="' + osm.userURL(d) + '" target="_blank">' + d + '</a>';
-            }
-            function entityName(entity) {
-                return utilDisplayName(entity) || (utilDisplayType(entity.id) + ' ' + entity.id);
-            }
-
-            function sameVersions(local, remote) {
-                if (local.version !== remote.version) return false;
-
-                if (local.type === 'way') {
-                    var children = utilArrayUnion(local.nodes, remote.nodes);
-                    for (var i = 0; i < children.length; i++) {
-                        var a = localGraph.hasEntity(children[i]);
-                        var b = remoteGraph.hasEntity(children[i]);
-                        if (a && b && a.version !== b.version) return false;
-                    }
-                }
-
-                return true;
-            }
-
-            _toCheck.forEach(function(id) {
-                var local = localGraph.entity(id);
-                var remote = remoteGraph.entity(id);
-
-                if (sameVersions(local, remote)) return;
-
-                var merge = actionMergeRemoteChanges(id, localGraph, remoteGraph, _discardTags, formatUser);
-
-                history.replace(merge);
-
-                var mergeConflicts = merge.conflicts();
-                if (!mergeConflicts.length) return;  // merged safely
-
-                var forceLocal = actionMergeRemoteChanges(id, localGraph, remoteGraph, _discardTags).withOption('force_local');
-                var forceRemote = actionMergeRemoteChanges(id, localGraph, remoteGraph, _discardTags).withOption('force_remote');
-                var keepMine = t('save.conflict.' + (remote.visible ? 'keep_local' : 'restore'));
-                var keepTheirs = t('save.conflict.' + (remote.visible ? 'keep_remote' : 'delete'));
-
-                _conflicts.push({
-                    id: id,
-                    name: entityName(local),
-                    details: mergeConflicts,
-                    chosen: 1,
-                    choices: [
-                        choice(id, keepMine, forceLocal),
-                        choice(id, keepTheirs, forceRemote)
-                    ]
-                });
-            });
-        }
-    }
-
-
-    function upload(changeset) {
-        var osm = context.connection();
-        if (!osm) {
-            _errors.push({ msg: 'No OSM Service' });
-        }
-
-        if (_conflicts.length) {
-            didResultInConflicts(changeset);
-
-        } else if (_errors.length) {
-            didResultInErrors();
-
-        } else {
-            var history = context.history();
-            var changes = history.changes(actionDiscardTags(history.difference(), _discardTags));
-            if (changes.modified.length || changes.created.length || changes.deleted.length) {
-
-                dispatch.call('willAttemptUpload', this);
-
-                osm.putChangeset(changeset, changes, uploadCallback);
-
-            } else {
-                // changes were insignificant or reverted by user
-                didResultInNoChanges();
-            }
-        }
-    }
-
-
-    function uploadCallback(err, changeset) {
-        if (err) {
-            if (err.status === 409) {  // 409 Conflict
-                uploader.save(changeset, true, true);  // tryAgain = true, checkConflicts = true
-            } else {
-                _errors.push({
-                    msg: err.message || err.responseText,
-                    details: [ t('save.status_code', { code: err.status }) ]
-                });
-                didResultInErrors();
-            }
-
-        } else {
-            didResultInSuccess(changeset);
-        }
-    }
-
-    function didResultInNoChanges() {
-        dispatch.call('resultNoChanges', this);
-        endSave();
-        context.flush();
-    }
-
-
-    function didResultInErrors() {
-        context.history().pop();
-        dispatch.call('resultErrors', this, _errors);
-        endSave();
-    }
-
-
-    function didResultInConflicts(changeset) {
-        _conflicts.sort(function(a, b) { return b.id.localeCompare(a.id); });
-        dispatch.call('resultConflicts', this, changeset, _conflicts, _origChanges);
-        endSave();
-    }
-
-
-    function didResultInSuccess(changeset) {
-        // delete the edit stack cached to local storage
-        context.history().clearSaved();
-        dispatch.call('resultSuccess', this, changeset);
-
-        // Add delay to allow for postgres replication #1646 #2678
-        window.setTimeout(function() {
-            endSave();
-            context.flush();
-        }, 2500);
-    }
-
-
-    function endSave() {
-        _isSaving = false;
-        dispatch.call('saveEnded', this);
-    }
-
-
-    uploader.cancelConflictResolution = function() {
-        context.history().pop();
-    };
-
-
-    uploader.processResolvedConflicts = function(changeset) {
-        var history = context.history();
-
-        for (var i = 0; i < _conflicts.length; i++) {
-            if (_conflicts[i].chosen === 1) {  // user chose "use theirs"
-                var entity = context.hasEntity(_conflicts[i].id);
-                if (entity && entity.type === 'way') {
-                    var children = utilArrayUniq(entity.nodes);
-                    for (var j = 0; j < children.length; j++) {
-                        history.replace(actionRevert(children[j]));
-                    }
-                }
-                history.replace(actionRevert(_conflicts[i].id));
-            }
-        }
-
-        uploader.save(changeset, true, false);  // tryAgain = true, checkConflicts = false
-    };
-
-
-    uploader.reset = function() {
-    };
-
-
-    return uploader;
-}
diff --git a/modules/core/validation/index.js b/modules/core/validation/index.js
deleted file mode 100644
index 4184805c86..0000000000
--- a/modules/core/validation/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { validationIssue, validationIssueFix } from './models';
diff --git a/modules/core/validation/models.js b/modules/core/validation/models.js
deleted file mode 100644
index 6086f8858d..0000000000
--- a/modules/core/validation/models.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Extent } from '@rapid-sdk/math';
-import { utilTotalExtent } from '../../util';
-import { t } from '../../core/localizer';
-
-export function validationIssue(attrs) {
-    this.type = attrs.type;                // required - name of rule that created the issue (e.g. 'missing_tag')
-    this.subtype = attrs.subtype;          // optional - category of the issue within the type (e.g. 'relation_type' under 'missing_tag')
-    this.severity = attrs.severity;        // required - 'warning' or 'error'
-    this.message = attrs.message;          // required - function returning localized string
-    this.reference = attrs.reference;      // optional - function(selection) to render reference information
-    this.entityIds = attrs.entityIds;      // optional - array of IDs of entities involved in the issue
-    this.loc = attrs.loc;                  // optional - [lon, lat] to zoom in on to see the issue
-    this.data = attrs.data;                // optional - object containing extra data for the fixes
-    this.dynamicFixes = attrs.dynamicFixes;// optional - function(context) returning fixes
-    this.hash = attrs.hash;                // optional - string to further differentiate the issue
-
-    this.id = generateID.apply(this);      // generated - see below
-    this.key = generateKey.apply(this);    // generated - see below (call after generating this.id)
-//    this.autoFix = null;                   // generated - if autofix exists, will be set below
-    this.autoArgs = attrs.autoArgs;        // optional - if this issue can be autofixed, supply the autofix args at issue creation
-
-    // A unique, deterministic string hash.
-    // Issues with identical id values are considered identical.
-    function generateID() {
-        var parts = [this.type];
-
-        if (this.hash) {   // subclasses can pass in their own differentiator
-            parts.push(this.hash);
-        }
-
-        if (this.subtype) {
-            parts.push(this.subtype);
-        }
-
-        // include the entities this issue is for
-        // (sort them so the id is deterministic)
-        if (this.entityIds) {
-            var entityKeys = this.entityIds.slice().sort();
-            parts.push.apply(parts, entityKeys);
-        }
-
-        return parts.join(':');
-    }
-
-    // An identifier suitable for use as the second argument to d3.selection#data().
-    // (i.e. this should change whenever the data needs to be refreshed)
-    function generateKey() {
-        return this.id + ':' + Date.now().toString();  // include time of creation
-    }
-
-
-    this.extent = function(resolver) {
-        if (this.loc) {
-            return new Extent(this.loc);
-        }
-        if (this.entityIds && this.entityIds.length) {
-            return utilTotalExtent(this.entityIds, resolver);
-        }
-        return null;
-    };
-
-    this.fixes = function(context) {
-        var fixes = this.dynamicFixes ? this.dynamicFixes(context) : [];
-        var issue = this;
-
-        if (issue.severity === 'warning') {
-            // allow ignoring any issue that's not an error
-            fixes.push(new validationIssueFix({
-                title: t.html('issues.fix.ignore_issue.title'),
-                icon: 'rapid-icon-close',
-                onClick: function() {
-                    context.validator().ignoreIssue(this.issue.id);
-                }
-            }));
-        }
-
-        fixes.forEach(function(fix) {
-            // the id doesn't matter as long as it's unique to this issue/fix
-            fix.id = fix.title;
-            // add a reference to the issue for use in actions
-            fix.issue = issue;
-//            if (fix.autoArgs) {
-//                issue.autoFix = fix;
-//            }
-        });
-        return fixes;
-    };
-
-}
-
-
-export function validationIssueFix(attrs) {
-    this.title = attrs.title;                   // Required
-    this.onClick = attrs.onClick;               // Optional - the function to run to apply the fix
-    this.disabledReason = attrs.disabledReason; // Optional - a string explaining why the fix is unavailable, if any
-    this.icon = attrs.icon;                     // Optional - shows 'rapid-icon-wrench' if not set
-    this.entityIds = attrs.entityIds || [];     // Optional - used for hover-higlighting.
-//    this.autoArgs = attrs.autoArgs;             // Optional - pass [actions, annotation] arglist if this fix can automatically run
-
-    this.issue = null;    // Generated link - added by validationIssue
-}
diff --git a/modules/core/validator.js b/modules/core/validator.js
deleted file mode 100644
index 3fab5e7ddb..0000000000
--- a/modules/core/validator.js
+++ /dev/null
@@ -1,887 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { Extent } from '@rapid-sdk/math';
-import { utilArrayChunk, utilArrayGroupBy, utilEntityAndDeepMemberIDs } from '@rapid-sdk/util';
-
-import { prefs } from './preferences';
-import { Difference } from './Difference';
-import { modeSelect } from '../modes/select';
-import { utilRebind } from '../util';
-import * as Validations from '../validations/index';
-
-
-export function coreValidator(context) {
-  let dispatch = d3_dispatch('validated', 'focusedIssue');
-  let validator = utilRebind({}, dispatch, 'on');
-
-  let _rules = {};
-  let _disabledRules = {};
-
-  let _ignoredIssueIDs = new Set();
-  let _resolvedIssueIDs = new Set();
-  let _baseCache = validationCache('base');   // issues before any user edits
-  let _headCache = validationCache('head');   // issues after all user edits
-  let _completeDiff = new Map();              // complete diff base -> head of what the user changed
-  let _headIsCurrent = false;
-
-  let _deferredRIC = {};          // Object( RequestIdleCallback handle : rejectPromise method )
-  let _deferredST = new Set();    // Set( SetTimeout handles )
-  let _headPromise;               // Promise fulfilled when validation is performed up to headGraph snapshot
-
-  const RETRY = 5000;             // wait 5sec before revalidating provisional entities
-
-
-  // Allow validation severity to be overridden by url queryparams...
-  // See: https://github.com/openstreetmap/iD/pull/8243
-  //
-  // Each param should contain a urlencoded comma separated list of
-  // `type/subtype` rules.  `*` may be used as a wildcard..
-  // Examples:
-  //  `validationError=disconnected_way/*`
-  //  `validationError=disconnected_way/highway`
-  //  `validationError=crossing_ways/bridge*`
-  //  `validationError=crossing_ways/bridge*,crossing_ways/tunnel*`
-
-  const _errorOverrides = parseHashParam(context.initialHashParams.validationError);
-  const _warningOverrides = parseHashParam(context.initialHashParams.validationWarning);
-  const _disableOverrides = parseHashParam(context.initialHashParams.validationDisable);
-
-  // `parseHashParam()`   (private)
-  // Checks hash parameters for severity overrides
-  // Arguments
-  //   `param` - a url hash parameter (`validationError`, `validationWarning`, or `validationDisable`)
-  // Returns
-  //   Array of Objects like { type: RegExp, subtype: RegExp }
-  //
-  function parseHashParam(param) {
-    let result = [];
-    let rules = (param || '').split(',');
-    rules.forEach(rule => {
-      rule = rule.trim();
-      const parts = rule.split('/', 2);  // "type/subtype"
-      const type = parts[0];
-      const subtype = parts[1] || '*';
-      if (!type || !subtype) return;
-      result.push({ type: makeRegExp(type), subtype: makeRegExp(subtype) });
-    });
-    return result;
-
-    function makeRegExp(str) {
-      const escaped = str
-        .replace(/[-\/\\^$+?.()|[\]{}]/g, '\\$&')   // escape all reserved chars except for the '*'
-        .replace(/\*/g, '.*');                      // treat a '*' like '.*'
-      return new RegExp('^' + escaped + '$');
-    }
-  }
-
-
-  // `init()`
-  // Initialize the validator, called once at app startup
-  //
-  validator.init = () => {
-    Object.values(Validations).forEach(validation => {
-      if (typeof validation !== 'function') return;
-      const fn = validation(context);
-      const key = fn.type;
-      _rules[key] = fn;
-    });
-
-    const disabledRules = prefs('validate-disabledRules');
-    if (disabledRules) {
-      disabledRules.split(',').forEach(k => _disabledRules[k] = true);
-    }
-  };
-
-
-  // `reset()`   (private)
-  // Cancels deferred work and resets all caches
-  //
-  // Arguments
-  //   `resetIgnored` - `true` to clear the list of user-ignored issues
-  //
-  function reset(resetIgnored) {
-    // empty queues
-    _baseCache.queue = [];
-    _headCache.queue = [];
-
-    // cancel deferred work and reject any pending promise
-    Object.keys(_deferredRIC).forEach(key => {
-      window.cancelIdleCallback(key);
-      _deferredRIC[key]();
-    });
-    _deferredRIC = {};
-    _deferredST.forEach(window.clearTimeout);
-    _deferredST.clear();
-
-    // clear caches
-    if (resetIgnored) _ignoredIssueIDs.clear();
-    _resolvedIssueIDs.clear();
-    _baseCache = validationCache('base');
-    _headCache = validationCache('head');
-    _completeDiff = new Map();
-    _headIsCurrent = false;
-  }
-
-
-  // `reset()`
-  // clear caches, called after a save or when switching OSM API
-  // (clears out the _ignoredIssueIDs set also)
-  //
-  validator.reset = () => {
-    reset(true);
-  };
-
-
-  // `resetIgnoredIssues()`
-  // clears out the _ignoredIssueIDs Set
-  //
-  validator.resetIgnoredIssues = () => {
-    _ignoredIssueIDs.clear();
-    dispatch.call('validated');   // redraw UI
-  };
-
-
-  // `revalidateUnsquare()`
-  // Called whenever the user changes the unsquare threshold
-  // It reruns just the "unsquare_way" validation on all buildings.
-  //
-  validator.revalidateUnsquare = () => {
-    revalidateUnsquare(_headCache);
-    revalidateUnsquare(_baseCache);
-    dispatch.call('validated');
-  };
-
-  function revalidateUnsquare(cache) {
-    const checkUnsquareWay = _rules.unsquare_way;
-    if (!cache.graph || typeof checkUnsquareWay !== 'function') return;
-
-    // uncache existing
-    cache.uncacheIssuesOfType('unsquare_way');
-
-    const buildings = context.history().tree().intersects(new Extent([-180,-90],[180, 90]), cache.graph)  // everywhere
-      .filter(entity => (entity.type === 'way' && entity.tags.building && entity.tags.building !== 'no'));
-
-    // rerun for all buildings
-    buildings.forEach(entity => {
-      const detected = checkUnsquareWay(entity, cache.graph);
-      if (!detected.length) return;
-      cache.cacheIssues(detected);
-    });
-  }
-
-
-  // `getIssues()`
-  // Gets all issues that match the given options
-  // This is called by many other places
-  //
-  // Arguments
-  //   `options` Object like:
-  //   {
-  //     what: 'all',                  // 'all' or 'edited'
-  //     where: 'all',                 // 'all' or 'visible'
-  //     includeIgnored: false,        // true, false, or 'only'
-  //     includeDisabledRules: false   // true, false, or 'only'
-  //   }
-  //
-  // Returns
-  //   An Array containing the issues
-  //
-  validator.getIssues = (options) => {
-    const opts = Object.assign({ what: 'all', where: 'all', includeIgnored: false, includeDisabledRules: false }, options);
-    const view = context.map().extent();
-    let seen = new Set();
-    let results = [];
-
-    // collect head issues - present in the user edits
-    if (_headCache.graph && _headCache.graph !== _baseCache.graph) {
-      Object.values(_headCache.issuesByIssueID).forEach(issue => {
-        // In the head cache, only count features that the user is responsible for - #8632
-        // For example, a user can undo some work and an issue will still present in the
-        // head graph, but we don't want to credit the user for causing that issue.
-        const userModified = (issue.entityIds || []).some(entityID => _completeDiff.has(entityID));
-        if (opts.what === 'edited' && !userModified) return;   // present in head but user didn't touch it
-
-        if (!filter(issue)) return;
-        seen.add(issue.id);
-        results.push(issue);
-      });
-    }
-
-    // collect base issues - present before user edits
-    if (opts.what === 'all') {
-      Object.values(_baseCache.issuesByIssueID).forEach(issue => {
-        if (!filter(issue)) return;
-        seen.add(issue.id);
-        results.push(issue);
-      });
-    }
-
-    return results;
-
-
-    // Filter the issue set to include only what the calling code wants to see.
-    // Note that we use `context.graph()`/`context.hasEntity()` here, not `cache.graph`,
-    // because that is the graph that the calling code will be using.
-    function filter(issue) {
-      if (!issue) return false;
-      if (seen.has(issue.id)) return false;
-      if (_resolvedIssueIDs.has(issue.id)) return false;
-      if (opts.includeDisabledRules === 'only' && !_disabledRules[issue.type]) return false;
-      if (!opts.includeDisabledRules && _disabledRules[issue.type]) return false;
-
-      if (opts.includeIgnored === 'only' && !_ignoredIssueIDs.has(issue.id)) return false;
-      if (!opts.includeIgnored && _ignoredIssueIDs.has(issue.id)) return false;
-
-      // This issue may involve an entity that doesn't exist in context.graph()
-      // This can happen because validation is async and rendering the issue lists is async.
-      if ((issue.entityIds || []).some(id => !context.hasEntity(id))) return false;
-
-      if (opts.where === 'visible') {
-        const extent = issue.extent(context.graph());
-        if (!view.intersects(extent)) return false;
-      }
-
-      return true;
-    }
-  };
-
-
-  // `getResolvedIssues()`
-  // Gets the issues that have been fixed by the user.
-  //
-  // Resolved issues are tracked in the `_resolvedIssueIDs` Set,
-  // and they should all be issues that exist in the _baseCache.
-  //
-  // Returns
-  //   An Array containing the issues
-  //
-  validator.getResolvedIssues = () => {
-    return Array.from(_resolvedIssueIDs)
-      .map(issueID => _baseCache.issuesByIssueID[issueID])
-      .filter(Boolean);
-  };
-
-
-  // `focusIssue()`
-  // Adjusts the map to focus on the given issue.
-  // (requires the issue to have a reasonable extent defined)
-  //
-  // Arguments
-  //   `issue` - the issue to focus on
-  //
-  validator.focusIssue = (issue) => {
-    // Note that we use `context.graph()`/`context.hasEntity()` here, not `cache.graph`,
-    // because that is the graph that the calling code will be using.
-    const graph = context.graph();
-    let selectID;
-    let focusCenter;
-
-    // Try to focus the map at the center of the issue..
-    const issueExtent = issue.extent(graph);
-    if (issueExtent) {
-      focusCenter = issueExtent.center();
-    }
-
-    // Try to select the first entity in the issue..
-    if (issue.entityIds && issue.entityIds.length) {
-      selectID = issue.entityIds[0];
-
-      // If a relation, focus on one of its members instead.
-      // Otherwise we might be focusing on a part of map where the relation is not visible.
-      if (selectID && selectID.charAt(0) === 'r') {   // relation
-        const ids = utilEntityAndDeepMemberIDs([selectID], graph);
-        let nodeID = ids.find(id => id.charAt(0) === 'n' && graph.hasEntity(id));
-
-        if (!nodeID) {  // relation has no downloaded nodes to focus on
-          const wayID = ids.find(id => id.charAt(0) === 'w' && graph.hasEntity(id));
-          if (wayID) {
-            nodeID = graph.entity(wayID).first();   // focus on the first node of this way
-          }
-        }
-
-        if (nodeID) {
-          focusCenter = graph.entity(nodeID).loc;
-        }
-      }
-    }
-
-    if (focusCenter) {  // Adjust the view
-      const setZoom = Math.max(context.map().zoom(), 19);
-      context.map().centerZoomEase(focusCenter, setZoom);
-    }
-
-    if (selectID) {  // Enter select mode
-      window.setTimeout(() => {
-        context.enter(modeSelect(context, [selectID]));
-        dispatch.call('focusedIssue', this, issue);
-      }, 250);  // after ease
-    }
-  };
-
-
-  // `getIssuesBySeverity()`
-  // Gets the issues then groups them by error/warning
-  // (This just calls getIssues, then puts issues in groups)
-  //
-  // Arguments
-  //   `options` - (see `getIssues`)
-  // Returns
-  //   Object result like:
-  //   {
-  //     error:    Array of errors,
-  //     warning:  Array of warnings
-  //   }
-  //
-  validator.getIssuesBySeverity = (options) => {
-    let groups = utilArrayGroupBy(validator.getIssues(options), 'severity');
-    groups.error = groups.error || [];
-    groups.warning = groups.warning || [];
-    return groups;
-  };
-
-
-  // `getEntityIssues()`
-  // Gets the issues that the given entity IDs have in common, matching the given options
-  // (This just calls getIssues, then filters for the given entity IDs)
-  // The issues are sorted for relevance
-  //
-  // Arguments
-  //   `entityIDs` - Array or Set of entityIDs to get issues for
-  //   `options` - (see `getIssues`)
-  // Returns
-  //   An Array containing the issues
-  //
-  validator.getSharedEntityIssues = (entityIDs, options) => {
-    const orderedIssueTypes = [                 // Show some issue types in a particular order:
-      'missing_tag', 'missing_role',            // - missing data first
-      'outdated_tags', 'mismatched_geometry',   // - identity issues
-      'crossing_ways', 'almost_junction',       // - geometry issues where fixing them might solve connectivity issues
-      'disconnected_way', 'impossible_oneway'   // - finally connectivity issues
-    ];
-
-    const allIssues = validator.getIssues(options);
-    const forEntityIDs = new Set(entityIDs);
-
-    return allIssues
-      .filter(issue => (issue.entityIds || []).some(entityID => forEntityIDs.has(entityID)))
-      .sort((issue1, issue2) => {
-        if (issue1.type === issue2.type) {             // issues of the same type, sort deterministically
-          return issue1.id < issue2.id ? -1 : 1;
-        }
-        const index1 = orderedIssueTypes.indexOf(issue1.type);
-        const index2 = orderedIssueTypes.indexOf(issue2.type);
-        if (index1 !== -1 && index2 !== -1) {          // both issue types have explicit sort orders
-          return index1 - index2;
-        } else if (index1 === -1 && index2 === -1) {   // neither issue type has an explicit sort order, sort by type
-          return issue1.type < issue2.type ? -1 : 1;
-        } else {                                       // order explicit types before everything else
-          return index1 !== -1 ? -1 : 1;
-        }
-      });
-  };
-
-
-  // `getEntityIssues()`
-  // Get an array of detected issues for the given entityID.
-  // (This just calls getSharedEntityIssues for a single entity)
-  //
-  // Arguments
-  //   `entityID` - the entity ID to get the issues for
-  //   `options` - (see `getIssues`)
-  // Returns
-  //   An Array containing the issues
-  //
-  validator.getEntityIssues = (entityID, options) => {
-    return validator.getSharedEntityIssues([entityID], options);
-  };
-
-
-  // `getRuleKeys()`
-  //
-  // Returns
-  //   An Array containing the rule keys
-  //
-  validator.getRuleKeys = () => {
-    return Object.keys(_rules);
-  };
-
-
-  // `isRuleEnabled()`
-  //
-  // Arguments
-  //   `key` - the rule to check (e.g. 'crossing_ways')
-  // Returns
-  //   `true`/`false`
-  //
-  validator.isRuleEnabled = (key) => {
-    return !_disabledRules[key];
-  };
-
-
-  // `toggleRule()`
-  // Toggles a single validation rule,
-  // then reruns the validation so that the user sees something happen in the UI
-  //
-  // Arguments
-  //   `key` - the rule to toggle (e.g. 'crossing_ways')
-  //
-  validator.toggleRule = (key) => {
-    if (_disabledRules[key]) {
-      delete _disabledRules[key];
-    } else {
-      _disabledRules[key] = true;
-    }
-
-    prefs('validate-disabledRules', Object.keys(_disabledRules).join(','));
-    validator.validate();
-  };
-
-
-  // `disableRules()`
-  // Disables given validation rules,
-  // then reruns the validation so that the user sees something happen in the UI
-  //
-  // Arguments
-  //   `keys` - Array or Set containing rule keys to disable
-  //
-  validator.disableRules = (keys) => {
-    _disabledRules = {};
-    keys.forEach(k => _disabledRules[k] = true);
-
-    prefs('validate-disabledRules', Object.keys(_disabledRules).join(','));
-    validator.validate();
-  };
-
-
-  // `ignoreIssue()`
-  // Don't show the given issue in lists
-  //
-  // Arguments
-  //   `issueID` - the issueID
-  //
-  validator.ignoreIssue = (issueID) => {
-    _ignoredIssueIDs.add(issueID);
-  };
-
-
-  // `validate()`
-  // Validates anything that has changed in the head graph since the last time it was run.
-  // (head graph contains user's edits)
-  //
-  // Returns
-  //   A Promise fulfilled when the validation has completed and then dispatches a `validated` event.
-  //   This may take time but happen in the background during browser idle time.
-  //
-  validator.validate = () => {
-    // Make sure the caches have graphs assigned to them.
-    // (we don't do this in `reset` because context is still resetting things and `history.base()` is unstable then)
-    const baseGraph = context.history().base();
-    if (!_headCache.graph) _headCache.graph = baseGraph;
-    if (!_baseCache.graph) _baseCache.graph = baseGraph;
-
-    const prevGraph = _headCache.graph;
-    const currGraph = context.graph();
-
-    if (currGraph === prevGraph) {   // _headCache.graph is current - we are caught up
-      _headIsCurrent = true;
-      dispatch.call('validated');
-      return Promise.resolve();
-    }
-
-    if (_headPromise) {         // Validation already in process, but we aren't caught up to current
-      _headIsCurrent = false;   // We will need to catch up after the validation promise fulfills
-      return _headPromise;
-    }
-
-    // If we get here, its time to start validating stuff.
-    _headCache.graph = currGraph;  // take snapshot
-    _completeDiff = context.history().difference().complete();
-    const incrementalDiff = new Difference(prevGraph, currGraph);
-    let entityIDs = [...incrementalDiff.complete().keys()];
-    entityIDs = _headCache.withAllRelatedEntities(entityIDs);  // expand set
-
-    if (!entityIDs.size) {
-      dispatch.call('validated');
-      return Promise.resolve();
-    }
-
-    _headPromise = validateEntitiesAsync(entityIDs, _headCache)
-      .then(() => updateResolvedIssues(entityIDs))
-      .then(() => dispatch.call('validated'))
-      .catch(e => console.error(e))  // eslint-disable-line
-      .then(() => {
-        _headPromise = null;
-        if (!_headIsCurrent) {
-          validator.validate();   // run it again to catch up to current graph
-        }
-      });
-
-    return _headPromise;
-  };
-
-
-  // register event handlers:
-
-  // WHEN TO RUN VALIDATION:
-  // When history changes:
-  context.history()
-    .on('restore.validator', validator.validate)   // on restore saved history
-    .on('undone.validator', validator.validate)    // on undo
-    .on('redone.validator', validator.validate)    // on redo
-    .on('reset.validator', () => {                 // on history reset - happens after save, or enter/exit walkthrough
-      reset(false);   // cached issues aren't valid any longer if the history has been reset
-      validator.validate();
-    });
-    // but not on 'change' (e.g. while drawing)
-
-  // When user changes editing modes (to catch recent changes e.g. drawing)
-  context
-    .on('exit.validator', validator.validate);
-
-  // When merging fetched data, validate base graph:
-  context.history()
-    .on('merge.validator', entityIDs => {
-      if (!entityIDs) return;
-
-      // Make sure the caches have graphs assigned to them.
-      // (we don't do this in `reset` because context is still resetting things and `history.base()` is unstable then)
-      const baseGraph = context.history().base();
-      if (!_headCache.graph) _headCache.graph = baseGraph;
-      if (!_baseCache.graph) _baseCache.graph = baseGraph;
-
-      entityIDs = _baseCache.withAllRelatedEntities(entityIDs);  // expand set
-      validateEntitiesAsync(entityIDs, _baseCache);
-    });
-
-
-
-  // `validateEntity()`   (private)
-  // Runs all validation rules on a single entity.
-  // Some things to note:
-  //  - Graph is passed in from whenever the validation was started.  Validators shouldn't use
-  //   `context.graph()` because this all happens async, and the graph might have changed
-  //   (for example, nodes getting deleted before the validation can run)
-  //  - Validator functions may still be waiting on something and return a "provisional" result.
-  //    In this situation, we will schedule to revalidate the entity sometime later.
-  //
-  // Arguments
-  //   `entity` - The entity
-  //   `graph` - graph containing the entity
-  //
-  // Returns
-  //   Object result like:
-  //   {
-  //     issues:       Array of detected issues
-  //     provisional:  `true` if provisional result, `false` if final result
-  //   }
-  //
-  function validateEntity(entity, graph) {
-    let result = { issues: [], provisional: false };
-    Object.keys(_rules).forEach(runValidation);   // run all rules
-    return result;
-
-
-    // runs validation and appends resulting issues
-    function runValidation(key) {
-      const fn = _rules[key];
-      if (typeof fn !== 'function') {
-        console.error('no such validation rule = ' + key);  // eslint-disable-line no-console
-        return;
-      }
-
-      let detected = fn(entity, graph);
-      if (detected.provisional) {  // this validation should be run again later
-        result.provisional = true;
-      }
-      detected = detected.filter(applySeverityOverrides);
-      result.issues = result.issues.concat(detected);
-
-
-      // If there are any override rules that match the issue type/subtype,
-      // adjust severity (or disable it) and keep/discard as quickly as possible.
-      function applySeverityOverrides(issue) {
-        const type = issue.type;
-        const subtype = issue.subtype || '';
-        let i;
-
-        for (i = 0; i < _errorOverrides.length; i++) {
-          if (_errorOverrides[i].type.test(type) && _errorOverrides[i].subtype.test(subtype)) {
-            issue.severity = 'error';
-            return true;
-          }
-        }
-        for (i = 0; i < _warningOverrides.length; i++) {
-          if (_warningOverrides[i].type.test(type) && _warningOverrides[i].subtype.test(subtype)) {
-            issue.severity = 'warning';
-            return true;
-          }
-        }
-        for (i = 0; i < _disableOverrides.length; i++) {
-          if (_disableOverrides[i].type.test(type) && _disableOverrides[i].subtype.test(subtype)) {
-            return false;
-          }
-        }
-        return true;
-      }
-    }
-  }
-
-
-  // `updateResolvedIssues()`   (private)
-  // Determine if any issues were resolved for the given entities.
-  // This is called by `validate()` after validation of the head graph
-  //
-  // Give the user credit for fixing an issue if:
-  // - the issue is in the base cache
-  // - the issue is not in the head cache
-  // - the user did something to one of the entities involved in the issue
-  //
-  // Arguments
-  //   `entityIDs` - Array or Set containing entity IDs.
-  //
-  function updateResolvedIssues(entityIDs) {
-    entityIDs.forEach(entityID => {
-      const baseIssues = _baseCache.issuesByEntityID[entityID];
-      if (!baseIssues) return;
-
-      baseIssues.forEach(issueID => {
-        // Check if the user did something to one of the entities involved in this issue.
-        // (This issue could involve multiple entities, e.g. disconnected routable features)
-        const issue = _baseCache.issuesByIssueID[issueID];
-        const userModified = (issue.entityIds || []).some(entityID => _completeDiff.has(entityID));
-
-        if (userModified && !_headCache.issuesByIssueID[issueID]) {  // issue seems fixed
-          _resolvedIssueIDs.add(issueID);
-        } else {                              // issue still not resolved
-          _resolvedIssueIDs.delete(issueID);  // (did undo, or possibly fixed and then re-caused the issue)
-        }
-      });
-    });
-  }
-
-
-  // `validateEntitiesAsync()`   (private)
-  // Schedule validation for many entities.
-  //
-  // Arguments
-  //   `entityIDs` - Array or Set containing entityIDs.
-  //   `graph` - the graph to validate that contains those entities
-  //   `cache` - the cache to store results in (_headCache or _baseCache)
-  //
-  // Returns
-  //   A Promise fulfilled when the validation has completed.
-  //   This may take time but happen in the background during browser idle time.
-  //
-  function validateEntitiesAsync(entityIDs, cache) {
-    // Enqueue the work
-    const jobs = Array.from(entityIDs).map(entityID => {
-      if (cache.queuedEntityIDs.has(entityID)) return null;  // queued already
-      cache.queuedEntityIDs.add(entityID);
-
-      // Clear caches for existing issues related to this entity
-      cache.uncacheEntityID(entityID);
-
-      return () => {
-        cache.queuedEntityIDs.delete(entityID);
-
-        const graph = cache.graph;
-        if (!graph) return;  // was reset?
-
-        const entity = graph.hasEntity(entityID);   // Sanity check: don't validate deleted entities
-        if (!entity) return;
-
-        // detect new issues and update caches
-        const result = validateEntity(entity, graph);
-        if (result.provisional) {                       // provisional result
-          cache.provisionalEntityIDs.add(entityID);     // we'll need to revalidate this entity again later
-        }
-
-        cache.cacheIssues(result.issues);   // update cache
-      };
-
-    }).filter(Boolean);
-
-
-    // Perform the work in chunks.
-    // Because this will happen during idle callbacks, we want to choose a chunk size
-    // that won't make the browser stutter too badly.
-    cache.queue = cache.queue.concat(utilArrayChunk(jobs, 100));
-
-    // Perform the work
-    if (cache.queuePromise) return cache.queuePromise;
-
-    cache.queuePromise = processQueue(cache)
-      .then(() => revalidateProvisionalEntities(cache))
-      .catch(e => console.error(e))  // eslint-disable-line
-      .finally(() => cache.queuePromise = null);
-
-    return cache.queuePromise;
-  }
-
-
-  // `revalidateProvisionalEntities()`   (private)
-  // Sometimes a validator will return a "provisional" result.
-  // In this situation, we'll need to revalidate the entity later.
-  // This function waits a delay, then places them back into the validation queue.
-  //
-  // Arguments
-  //   `cache` - The cache (_headCache or _baseCache)
-  //
-  function revalidateProvisionalEntities(cache) {
-    if (!cache.provisionalEntityIDs.size) return;  // nothing to do
-
-    const handle = window.setTimeout(() => {
-      _deferredST.delete(handle);
-      if (!cache.provisionalEntityIDs.size) return;  // nothing to do
-      validateEntitiesAsync(Array.from(cache.provisionalEntityIDs), cache);
-    }, RETRY);
-
-    _deferredST.add(handle);
-  }
-
-
-  // `processQueue(queue)`   (private)
-  // Process the next chunk of deferred validation work
-  //
-  // Arguments
-  //   `cache` - The cache (_headCache or _baseCache)
-  //
-  // Returns
-  //   A Promise fulfilled when the validation has completed.
-  //   This may take time but happen in the background during browser idle time.
-  //
-  function processQueue(cache) {
-    // console.log(`${cache.which} queue length ${cache.queue.length}`);
-
-    if (!cache.queue.length) return Promise.resolve();  // we're done
-    const chunk = cache.queue.pop();
-
-    return new Promise((resolvePromise, rejectPromise) => {
-        const handle = window.requestIdleCallback(() => {
-          delete (_deferredRIC[handle]);
-          // const t0 = performance.now();
-          chunk.forEach(job => job());
-          // const t1 = performance.now();
-          // console.log('chunk processed in ' + (t1 - t0) + ' ms');
-          resolvePromise();
-        });
-        _deferredRIC[handle] = rejectPromise;
-      })
-      .then(() => { // dispatch an event sometimes to redraw various UI things
-        if (cache.queue.length % 25 === 0) dispatch.call('validated');
-      })
-      .then(() => processQueue(cache));
-  }
-
-
-  return validator;
-}
-
-
-// `validationCache()`   (private)
-// Creates a cache to store validation state
-// We create 2 of these:
-//   `_baseCache` for validation on the base graph (unedited)
-//   `_headCache` for validation on the head graph (user edits applied)
-//
-// Arguments
-//   `which` - just a String 'base' or 'head' to keep track of it
-//
-function validationCache(which) {
-  let cache = {
-    which: which,
-    graph: null,
-    queue: [],
-    queuePromise: null,
-    queuedEntityIDs: new Set(),
-    provisionalEntityIDs: new Set(),
-    issuesByIssueID: {},  // issue.id -> issue
-    issuesByEntityID: {}  // entity.id -> Set(issue.id)
-  };
-
-
-  cache.cacheIssue = (issue) => {
-    (issue.entityIds || []).forEach(entityID => {
-      if (!cache.issuesByEntityID[entityID]) {
-        cache.issuesByEntityID[entityID] = new Set();
-      }
-      cache.issuesByEntityID[entityID].add(issue.id);
-    });
-    cache.issuesByIssueID[issue.id] = issue;
-  };
-
-
-  cache.uncacheIssue = (issue) => {
-    (issue.entityIds || []).forEach(entityID => {
-      if (cache.issuesByEntityID[entityID]) {
-        cache.issuesByEntityID[entityID].delete(issue.id);
-      }
-    });
-    delete cache.issuesByIssueID[issue.id];
-  };
-
-
-  cache.cacheIssues = (issues) => {
-    issues.forEach(cache.cacheIssue);
-  };
-
-
-  cache.uncacheIssues = (issues) => {
-    issues.forEach(cache.uncacheIssue);
-  };
-
-
-  cache.uncacheIssuesOfType = (type) => {
-    const issuesOfType = Object.values(cache.issuesByIssueID)
-      .filter(issue => issue.type === type);
-    cache.uncacheIssues(issuesOfType);
-  };
-
-
-  // Remove a single entity and all its related issues from the caches
-  cache.uncacheEntityID = (entityID) => {
-    const entityIssueIDs = cache.issuesByEntityID[entityID];
-    if (entityIssueIDs) {
-      entityIssueIDs.forEach(issueID => {
-        const issue = cache.issuesByIssueID[issueID];
-        if (issue) {
-          cache.uncacheIssue(issue);
-        } else {  // shouldn't happen, clean up
-          delete cache.issuesByIssueID[issueID];
-        }
-      });
-    }
-
-    delete cache.issuesByEntityID[entityID];
-    cache.provisionalEntityIDs.delete(entityID);
-  };
-
-
-  // Return the expandeded set of entityIDs related to issues for the given entityIDs
-  //
-  // Arguments
-  //   `entityIDs` - Array or Set containing entityIDs.
-  //
-  cache.withAllRelatedEntities = (entityIDs) => {
-    let result = new Set();
-    (entityIDs || []).forEach(entityID => {
-      result.add(entityID);  // include self
-
-      const entityIssueIDs = cache.issuesByEntityID[entityID];
-      if (entityIssueIDs) {
-        entityIssueIDs.forEach(issueID => {
-          const issue = cache.issuesByIssueID[issueID];
-          if (issue) {
-            (issue.entityIds || []).forEach(relatedID => result.add(relatedID));
-          } else {  // shouldn't happen, clean up
-            delete cache.issuesByIssueID[issueID];
-          }
-        });
-      }
-    });
-
-    return result;
-  };
-
-
-  return cache;
-}
diff --git a/modules/index.js b/modules/index.js
index 212b9f19ca..5d3b114195 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -5,12 +5,9 @@ export * from './geo/index';
 export * from './modes/index';
 export * from './operations/index';
 export * from './osm/index';
-export * from './presets/index';
-export * from './renderer/index';
 export * from './services/index';
 export * from './svg/index';
 export * from './ui/fields/index';
-export * from './ui/intro/index';
 export * from './ui/panels/index';
 export * from './ui/panes/index';
 export * from './ui/sections/index';
@@ -19,10 +16,11 @@ export * from './ui/index';
 export * from './util/index';
 export * from './validations/index';
 
-// Reexport just what our tests use, see #4379
+export { Context } from './Context';
+
+// Reexport only what our tests use, see iD#4379
 import * as D3 from 'd3';
 export const d3 = {
-  dispatch:  D3.dispatch,
   polygonArea: D3.polygonArea,
   polygonCentroid: D3.polygonCentroid,
   select: D3.select,
diff --git a/modules/modes/AbstractMode.js b/modules/modes/AbstractMode.js
index 174f94562f..c21151bed1 100644
--- a/modules/modes/AbstractMode.js
+++ b/modules/modes/AbstractMode.js
@@ -1,21 +1,30 @@
+import { EventEmitter } from '@pixi/utils';
+
+
 /**
  * "Modes" are editing tasks that the user are allowed to perform.
  * Each mode is exclusive, i.e only one mode should be active at a time.
+ *
  * `AbstractMode` is the base class from which all modes inherit.
+ * All modes are event emitters.
  *
  * Properties you can access:
+ *   `id`           `String` identifier for the mode (e.g. 'browse')
  *   `active`       `true` if the mode is active, `false` if not.
  *   `operations`   `Array` of operations allowed on the right-click edit menu
  *   `selectedData` `Map(dataID -> data)` containing selected data
  */
-export class AbstractMode {
+export class AbstractMode extends EventEmitter {
 
   /**
    * @constructor
    * @param  `context`   Global shared application context
    */
   constructor(context) {
+    super();
     this.context = context;
+    this.id = '';
+
     this._active = false;
     this._selectedData = new Map();
     this.operations = [];
diff --git a/modules/modes/ModeAddNote.js b/modules/modes/AddNoteMode.js
similarity index 81%
rename from modules/modes/ModeAddNote.js
rename to modules/modes/AddNoteMode.js
index b3f56130f6..3914cd5f6a 100644
--- a/modules/modes/ModeAddNote.js
+++ b/modules/modes/AddNoteMode.js
@@ -1,15 +1,14 @@
 import { AbstractMode } from './AbstractMode';
 import { osmNote } from '../osm/note';
-import { services } from '../services';
 
 const DEBUG = false;
 
 
 /**
- * `ModeAddNote`
+ * `AddNoteMode`
  * In this mode, we are waiting for the user to place a Note somewhere
  */
-export class ModeAddNote extends AbstractMode {
+export class AddNoteMode extends AbstractMode {
 
   /**
    * @constructor
@@ -17,7 +16,6 @@ export class ModeAddNote extends AbstractMode {
    */
   constructor(context) {
     super(context);
-
     this.id = 'add-note';
 
     // Make sure the event handlers have `this` bound correctly
@@ -31,7 +29,7 @@ export class ModeAddNote extends AbstractMode {
    */
   enter() {
     if (DEBUG) {
-      console.log('ModeAddNote: entering');  // eslint-disable-line no-console
+      console.log('AddNoteMode: entering');  // eslint-disable-line no-console
     }
 
     this._active = true;
@@ -43,7 +41,9 @@ export class ModeAddNote extends AbstractMode {
       .on('cancel', this._cancel)
       .on('finish', this._cancel);
 
-    context.history().on('undone.ModeAddNote redone.ModeAddNote', this._cancel);
+    context.editSystem()
+      .on('undone', this._cancel)
+      .on('redone', this._cancel);
 
     context.behaviors.get('map-nudging').allow();
 
@@ -59,7 +59,7 @@ export class ModeAddNote extends AbstractMode {
     this._active = false;
 
     if (DEBUG) {
-      console.log('ModeAddNote: exiting');  // eslint-disable-line no-console
+      console.log('AddNoteMode: exiting');  // eslint-disable-line no-console
     }
 
     const context = this.context;
@@ -68,7 +68,9 @@ export class ModeAddNote extends AbstractMode {
       .off('cancel', this._cancel)
       .off('finish', this._cancel);
 
-    context.history().on('undone.ModeAddNote redone.ModeAddNote', null);
+    context.editSystem()
+      .off('undone', this._cancel)
+      .off('redone', this._cancel);
   }
 
 
@@ -78,7 +80,7 @@ export class ModeAddNote extends AbstractMode {
    */
   _click(eventData) {
     const context = this.context;
-    const osm = services.osm;
+    const osm = context.services.get('osm');
     const projection = context.projection;
     const coord = eventData.coord;
     const loc = projection.invert(coord);
diff --git a/modules/modes/ModeAddPoint.js b/modules/modes/AddPointMode.js
similarity index 79%
rename from modules/modes/ModeAddPoint.js
rename to modules/modes/AddPointMode.js
index 719d7b573a..2f5835e4d6 100644
--- a/modules/modes/ModeAddPoint.js
+++ b/modules/modes/AddPointMode.js
@@ -4,19 +4,16 @@ import { actionAddEntity } from '../actions/add_entity';
 import { actionChangeTags } from '../actions/change_tags';
 import { actionAddMidpoint } from '../actions/add_midpoint';
 import { geoChooseEdge } from '../geo';
-import { locationManager } from '../core/LocationManager';
-import { modeSelect } from '../modes/select';
 import { osmNode } from '../osm/node';
-import { t } from '../core/localizer';
 
 const DEBUG = false;
 
 
 /**
- * `ModeAddPoint`
+ * `AddPointMode`
  * In this mode, we are waiting for the user to place a point somewhere
  */
-export class ModeAddPoint extends AbstractMode {
+export class AddPointMode extends AbstractMode {
 
   /**
    * @constructor
@@ -24,8 +21,8 @@ export class ModeAddPoint extends AbstractMode {
    */
   constructor(context) {
     super(context);
-
     this.id = 'add-point';
+
     this.defaultTags = {};
 
     // Make sure the event handlers have `this` bound correctly
@@ -39,7 +36,7 @@ export class ModeAddPoint extends AbstractMode {
    */
   enter() {
     if (DEBUG) {
-      console.log('ModeAddPoint: entering');  // eslint-disable-line no-console
+      console.log('AddPointMode: entering');  // eslint-disable-line no-console
     }
 
     this._active = true;
@@ -51,7 +48,9 @@ export class ModeAddPoint extends AbstractMode {
       .on('cancel', this._cancel)
       .on('finish', this._cancel);
 
-    context.history().on('undone.ModeAddPoint redone.ModeAddPoint', this._cancel);
+    context.editSystem()
+      .on('undone', this._cancel)
+      .on('redone', this._cancel);
 
     return true;
   }
@@ -64,7 +63,7 @@ export class ModeAddPoint extends AbstractMode {
     if (!this._active) return;
 
     if (DEBUG) {
-      console.log('ModeAddPoint: exiting');  // eslint-disable-line no-console
+      console.log('AddPointMode: exiting');  // eslint-disable-line no-console
     }
 
     this._active = false;
@@ -75,7 +74,9 @@ export class ModeAddPoint extends AbstractMode {
       .off('cancel', this._cancel)
       .off('finish', this._cancel);
 
-    context.history().on('undone.ModeAddPoint redone.ModeAddPoint', null);
+    context.editSystem()
+      .off('undone', this._cancel)
+      .off('redone', this._cancel);
   }
 
 
@@ -90,7 +91,8 @@ export class ModeAddPoint extends AbstractMode {
     const coord = eventData.coord;
     const loc = projection.invert(coord);
 
-    if (locationManager.blocksAt(loc).length) return;   // editing is blocked here
+    const locationSystem = context.locationSystem();
+    if (locationSystem.blocksAt(loc).length) return;   // editing is blocked here
 
     // Allow snapping only for OSM Entities in the actual graph (i.e. not Rapid features)
     const datum = eventData?.target?.data;
@@ -130,9 +132,9 @@ export class ModeAddPoint extends AbstractMode {
   _clickNothing(loc) {
     const context = this.context;
     const node = osmNode({ loc: loc, tags: this.defaultTags });
-    const annotation = t('operations.add.annotation.point');
+    const annotation = context.t('operations.add.annotation.point');
     context.perform(actionAddEntity(node), annotation);
-    context.enter(modeSelect(context, [node.id]).newFeature(true));
+    context.enter('select-osm', { selectedIDs: [node.id], newFeature: true });
   }
 
 
@@ -143,9 +145,9 @@ export class ModeAddPoint extends AbstractMode {
   _clickWay(loc, edge) {
     const context = this.context;
     const node = osmNode({ tags: this.defaultTags });
-    const annotation = t('operations.add.annotation.vertex');
+    const annotation = context.t('operations.add.annotation.vertex');
     context.perform(actionAddMidpoint({ loc: loc, edge: edge }, node), annotation);
-    context.enter(modeSelect(context, [node.id]).newFeature(true));
+    context.enter('select-osm', { selectedIDs: [node.id], newFeature: true });
   }
 
 
@@ -157,7 +159,7 @@ export class ModeAddPoint extends AbstractMode {
     const context = this.context;
 
     if (Object.keys(this.defaultTags).length === 0) {
-      context.enter(modeSelect(context, [node.id]));
+      context.enter('select-osm', { selectedIDs: [node.id] });
       return;
     }
 
@@ -166,9 +168,9 @@ export class ModeAddPoint extends AbstractMode {
       tags[k] = this.defaultTags[k];
     }
 
-    const annotation = t('operations.add.annotation.point');
+    const annotation = context.t('operations.add.annotation.point');
     context.perform(actionChangeTags(node.id, tags), annotation);
-    context.enter(modeSelect(context, [node.id]).newFeature(true));
+    context.enter('select-osm', { selectedIDs: [node.id], newFeature: true });
   }
 
 
diff --git a/modules/modes/ModeBrowse.js b/modules/modes/BrowseMode.js
similarity index 73%
rename from modules/modes/ModeBrowse.js
rename to modules/modes/BrowseMode.js
index 2fc31eb02f..3c52aa8d1a 100644
--- a/modules/modes/ModeBrowse.js
+++ b/modules/modes/BrowseMode.js
@@ -5,11 +5,11 @@ const DEBUG = false;
 
 
 /**
- * `ModeBrowse` is the default mode that the editor is in.
+ * `BrowseMode` is the default mode that the editor is in.
  *  Nothing selected but users can hover or click on things.
  *  - "operations" allowed (right click edit menu) includes Paste only
  */
-export class ModeBrowse extends AbstractMode {
+export class BrowseMode extends AbstractMode {
 
   /**
    * @constructor
@@ -27,7 +27,7 @@ export class ModeBrowse extends AbstractMode {
    */
   enter() {
     if (DEBUG) {
-      console.log('ModeBrowse: entering');  // eslint-disable-line no-console
+      console.log('BrowseMode: entering');  // eslint-disable-line no-console
     }
 
     this.operations = [ operationPaste(this.context) ];
@@ -52,16 +52,13 @@ export class ModeBrowse extends AbstractMode {
     if (!this._active) return;
     this._active = false;
     if (DEBUG) {
-      console.log('ModeBrowse: exiting');  // eslint-disable-line no-console
+      console.log('BrowseMode: exiting');  // eslint-disable-line no-console
     }
   }
 
 
-  selectBehavior() {
-    console.error('error: do not call modeBrowse.selectBehavior anymore');  // eslint-disable-line no-console
-  }
   sidebar() {
-    console.error('error: do not call modeBrowse.sidebar anymore');   // eslint-disable-line no-console
+    console.error('error: do not call BrowseMode.sidebar anymore');   // eslint-disable-line no-console
   }
 
 }
diff --git a/modules/modes/ModeDragNode.js b/modules/modes/DragNodeMode.js
similarity index 86%
rename from modules/modes/ModeDragNode.js
rename to modules/modes/DragNodeMode.js
index efd0bb28b6..e4c07bb22e 100644
--- a/modules/modes/ModeDragNode.js
+++ b/modules/modes/DragNodeMode.js
@@ -7,19 +7,15 @@ import { actionConnect } from '../actions/connect';
 import { actionMoveNode } from '../actions/move_node';
 import { actionNoop } from '../actions/noop';
 import { geoChooseEdge } from '../geo';
-import { locationManager } from '../core/LocationManager';
-import { modeSelect } from './select';
 import { osmNode } from '../osm';
-import { presetManager } from '../presets';
-import { t } from '../core/localizer';
 
 
 
 /**
- * `ModeDragNode`
+ * `DragNodeMode`
  *  In this mode, the user has started dragging a point or vertex.
  */
-export class ModeDragNode extends AbstractMode {
+export class DragNodeMode extends AbstractMode {
 
   /**
    * @constructor
@@ -69,12 +65,12 @@ export class ModeDragNode extends AbstractMode {
 
     if (!this._wasMidpoint) {
       // Bail out if the node is connected to something hidden.
-      const hasHidden = context.features().hasHiddenConnections(entity, context.graph());
+      const hasHidden = context.filterSystem().hasHiddenConnections(entity, context.graph());
       if (hasHidden) {
         context.ui().flash
           .duration(4000)
           .iconName('#rapid-icon-no')
-          .label(t('modes.drag_node.connected_to_hidden'))();
+          .label(context.t('modes.drag_node.connected_to_hidden'))();
         return false;
       }
     }
@@ -113,7 +109,9 @@ export class ModeDragNode extends AbstractMode {
       .on('end', this._end)
       .on('cancel', this._cancel);
 
-    context.history().on('undone.ModeDragNode redone.ModeDragNode', this._cancel);
+    context.editSystem()
+      .on('undone', this._cancel)
+      .on('redone', this._cancel);
 
     return true;
   }
@@ -131,14 +129,18 @@ export class ModeDragNode extends AbstractMode {
     this._clickLoc = null;
     this._wasMidpoint = false;
     this._selectedData.clear();
-    this.context.scene().clearClass('drawing');
 
-    this.context.behaviors.get('drag')
+    const context = this.context;
+    context.scene().clearClass('drawing');
+
+    context.behaviors.get('drag')
       .off('move', this._move)
       .off('end', this._end)
       .off('cancel', this._cancel);
 
-    this.context.history().on('undone.ModeDragNode redone.ModeDragNode', null);
+    context.editSystem()
+      .off('undone', this._cancel)
+      .off('redone', this._cancel);
   }
 
 
@@ -212,7 +214,8 @@ export class ModeDragNode extends AbstractMode {
       loc = projection.invert(adjustedCoord);
     }
 
-    if (locationManager.blocksAt(loc).length) {  // editing is blocked here
+    const locationSystem = context.locationSystem();
+    if (locationSystem.blocksAt(loc).length) {  // editing is blocked here
       this._cancel();
       return;
     }
@@ -269,7 +272,7 @@ export class ModeDragNode extends AbstractMode {
       }
 
     } else if (this._wasMidpoint) {
-      context.replace(actionNoop(), t('operations.add.annotation.vertex'));
+      context.replace(actionNoop(), context.t('operations.add.annotation.vertex'));
 
     } else {
       context.replace(actionNoop(), this._moveAnnotation());
@@ -277,9 +280,9 @@ export class ModeDragNode extends AbstractMode {
 
     // Choose next mode
     if (isPoint && context.hasEntity(this.dragNode.id)) {
-      context.enter(modeSelect(context, [this.dragNode.id]));
+      context.enter('select-osm', { selectedIDs: [this.dragNode.id] });
     } else if (this._reselectIDs.length) {
-      context.enter(modeSelect(context, this._reselectIDs));
+      context.enter('select-osm', { selectedIDs: this._reselectIDs });
     } else {
       context.enter('browse');
     }
@@ -292,8 +295,9 @@ export class ModeDragNode extends AbstractMode {
   _moveAnnotation() {
     if (!this.dragNode) return undefined;
 
-    const geometry = this.dragNode.geometry(this.context.graph());
-    return t(`operations.move.annotation.${geometry}`);
+    const context = this.context;
+    const geometry = this.dragNode.geometry(context.graph());
+    return context.t(`operations.move.annotation.${geometry}`);
   }
 
 
@@ -304,7 +308,8 @@ export class ModeDragNode extends AbstractMode {
   _connectAnnotation(target) {
     if (!this.dragNode || !target) return undefined;
 
-    const graph = this.context.graph();
+    const context = this.context;
+    const graph = context.graph();
     const nodeGeometry = this.dragNode.geometry(graph);
     const targetGeometry = target.geometry(graph);
 
@@ -316,12 +321,12 @@ export class ModeDragNode extends AbstractMode {
       if (sharedParentWays.length !== 0) {
         // if the nodes are next to each other, they are merged
         if (sharedParentWays[0].areAdjacent(this.dragNode.id, target.id)) {
-          return t('operations.connect.annotation.from_vertex.to_adjacent_vertex');
+          return context.t('operations.connect.annotation.from_vertex.to_adjacent_vertex');
         }
-        return t('operations.connect.annotation.from_vertex.to_sibling_vertex');
+        return context.t('operations.connect.annotation.from_vertex.to_sibling_vertex');
       }
     }
-    return t(`operations.connect.annotation.from_${nodeGeometry}.to_${targetGeometry}`);
+    return context.t(`operations.connect.annotation.from_${nodeGeometry}.to_${targetGeometry}`);
   }
 
 
@@ -333,8 +338,9 @@ export class ModeDragNode extends AbstractMode {
     if (!this.dragNode) return false;
 
     const graph = this.context.graph();
+    const presetSystem = this.context.presetSystem();
     return this.dragNode.geometry(graph) !== 'vertex' ||
-      (target.geometry(graph) === 'vertex' || presetManager.allowsVertex(target, graph));
+      (target.geometry(graph) === 'vertex' || presetSystem.allowsVertex(target, graph));
   }
 
 
diff --git a/modules/modes/ModeDrawArea.js b/modules/modes/DrawAreaMode.js
similarity index 91%
rename from modules/modes/ModeDrawArea.js
rename to modules/modes/DrawAreaMode.js
index 23dadaf4bd..85845fae47 100644
--- a/modules/modes/ModeDrawArea.js
+++ b/modules/modes/DrawAreaMode.js
@@ -7,19 +7,16 @@ import { actionAddVertex } from '../actions/add_vertex';
 import { actionMoveNode } from '../actions/move_node';
 import { actionNoop } from '../actions/noop';
 import { geoChooseEdge } from '../geo';
-import { locationManager } from '../core/LocationManager';
-import { modeSelect } from '../modes/select';
 import { osmNode, osmWay } from '../osm';
-import { t } from '../core/localizer';
 
 const DEBUG = false;
 
 
 /**
- * `ModeDrawArea`
+ * `DrawAreaMode`
  * In this mode, we are waiting for the user to place the initial point of an area
  */
-export class ModeDrawArea extends AbstractMode {
+export class DrawAreaMode extends AbstractMode {
 
   /**
    * @constructor
@@ -27,10 +24,9 @@ export class ModeDrawArea extends AbstractMode {
    */
   constructor(context) {
     super(context);
-
     this.id = 'draw-area';
-    this.defaultTags = {};
 
+    this.defaultTags = {};
     this.drawWay = null;    // The draw way just contains the way that we are drawing
     this.drawNode = null;   // The draw node is temporary and just follows the pointer
     this.firstNode = null;  // The first real node in the draw way (this is also the last node that closes the area)
@@ -59,7 +55,7 @@ export class ModeDrawArea extends AbstractMode {
    */
   enter() {
     if (DEBUG) {
-      console.log('ModeDrawArea: entering'); // eslint-disable-line no-console
+      console.log('DrawAreaMode: entering'); // eslint-disable-line no-console
     }
 
     const context = this.context;
@@ -81,7 +77,9 @@ export class ModeDrawArea extends AbstractMode {
       .on('finish', this._finish)
       .on('cancel', this._cancel);
 
-    context.history().on('undone.ModeDrawArea redone.ModeDrawArea', this._undoOrRedo);
+    context.editSystem()
+      .on('undone', this._undoOrRedo)
+      .on('redone', this._undoOrRedo);
 
     context.behaviors.get('map-interaction').doubleClickEnabled = false;
 
@@ -97,7 +95,7 @@ export class ModeDrawArea extends AbstractMode {
     this._active = false;
 
     if (DEBUG) {
-      console.log('ModeDrawArea: exiting'); // eslint-disable-line no-console
+      console.log('DrawAreaMode: exiting'); // eslint-disable-line no-console
     }
 
     const context = this.context;
@@ -115,7 +113,7 @@ export class ModeDrawArea extends AbstractMode {
     const length = this.drawWay?.nodes?.length || 0;
     if (length < 4) {
       if (DEBUG) {
-        console.log('ModeDrawArea: draw way invalid, rolling back');  // eslint-disable-line no-console
+        console.log('DrawAreaMode: draw way invalid, rolling back');  // eslint-disable-line no-console
       }
       while (context.graph() !== this._startGraph) {  // rollback to initial state
         context.pop();
@@ -139,7 +137,9 @@ export class ModeDrawArea extends AbstractMode {
       .off('finish', this._finish)
       .off('cancel', this._cancel);
 
-    context.history().on('undone.ModeDrawArea redone.ModeDrawArea', null);
+    context.editSystem()
+      .off('undone', this._undoOrRedo)
+      .off('redone', this._undoOrRedo);
 
     context.resumeChangeDispatch();
   }
@@ -187,7 +187,7 @@ export class ModeDrawArea extends AbstractMode {
     if (length < 4) return undefined;
 
     const which = length > 4 ? 'continue' : 'start';
-    return t(`operations.${which}.annotation.area`);
+    return this.context.t(`operations.${which}.annotation.area`);
   }
 
 
@@ -241,7 +241,8 @@ export class ModeDrawArea extends AbstractMode {
     const coord = eventData.coord;
     const loc = projection.invert(coord);
 
-    if (locationManager.blocksAt(loc).length) return;   // editing is blocked here
+    const locationSystem = context.locationSystem();
+    if (locationSystem.blocksAt(loc).length) return;   // editing is blocked here
 
     // Now that the user has clicked, let them nudge the map by moving to the edge.
     context.behaviors.get('map-nudging').allow();
@@ -296,7 +297,7 @@ export class ModeDrawArea extends AbstractMode {
       }
 
       if (DEBUG) {
-        console.log(`ModeDrawArea: _clickLoc, extending area to ${loc}`);  // eslint-disable-line no-console
+        console.log(`DrawAreaMode: _clickLoc, extending area to ${loc}`);  // eslint-disable-line no-console
       }
 
       context.replace(actionNoop(), this._getAnnotation());   // Add annotation so we can undo to here
@@ -312,7 +313,7 @@ export class ModeDrawArea extends AbstractMode {
     // Start a new area at 'loc'...
     } else {
       if (DEBUG) {
-        console.log(`ModeDrawArea: _clickLoc, starting area at ${loc}`); // eslint-disable-line no-console
+        console.log(`DrawAreaMode: _clickLoc, starting area at ${loc}`); // eslint-disable-line no-console
       }
       this.firstNode = osmNode({ loc: loc });
       this.lastNode = this.firstNode;
@@ -354,7 +355,7 @@ export class ModeDrawArea extends AbstractMode {
       }
 
       if (DEBUG) {
-        console.log(`ModeDrawArea: _clickWay, extending area to edge ${edge}`);  // eslint-disable-line no-console
+        console.log(`DrawAreaMode: _clickWay, extending area to edge ${edge}`);  // eslint-disable-line no-console
       }
 
       context.replace(
@@ -374,7 +375,7 @@ export class ModeDrawArea extends AbstractMode {
     // Start a new area at `loc` on target edge...
     } else {
       if (DEBUG) {
-        console.log(`ModeDrawArea: _clickWay, starting area at edge ${edge}`);  // eslint-disable-line no-console
+        console.log(`DrawAreaMode: _clickWay, starting area at edge ${edge}`);  // eslint-disable-line no-console
       }
       this.firstNode = osmNode({ loc: loc });
       this.lastNode = this.firstNode;
@@ -418,7 +419,7 @@ export class ModeDrawArea extends AbstractMode {
       }
 
       if (DEBUG) {
-        console.log(`ModeDrawArea: _clickNode, extending area to ${targetNode.id}`);  // eslint-disable-line no-console
+        console.log(`DrawAreaMode: _clickNode, extending area to ${targetNode.id}`);  // eslint-disable-line no-console
       }
 
       // Time for a switcheroo- replace the 'draw' node with the target node, and annotate it for undo/redo
@@ -438,7 +439,7 @@ export class ModeDrawArea extends AbstractMode {
     // Start a new area at target node...
     } else {
       if (DEBUG) {
-        console.log(`ModeDrawArea: _clickNode, starting line at ${targetNode.id}`); // eslint-disable-line no-console
+        console.log(`DrawAreaMode: _clickNode, starting line at ${targetNode.id}`); // eslint-disable-line no-console
       }
 
       this.firstNode = targetNode;
@@ -478,10 +479,10 @@ export class ModeDrawArea extends AbstractMode {
   _finish() {
     if (this.drawWay) {
       if (DEBUG) {
-        console.log(`ModeDrawArea: _finish, drawWay.id = ${this.drawWay.id}`);  // eslint-disable-line no-console
+        console.log(`DrawAreaMode: _finish, drawWay.id = ${this.drawWay.id}`);  // eslint-disable-line no-console
       }
       const context = this.context;
-      context.enter(modeSelect(context, [this.drawWay.id]).newFeature(true));
+      context.enter('select-osm', { selectedIDs: [this.drawWay.id], newFeature: true });
     } else {
       this._cancel();
     }
@@ -490,12 +491,12 @@ export class ModeDrawArea extends AbstractMode {
 
   /**
    * _cancel
-   * Rollback to the initial checkpoint then return to browse mode
+   * Return to browse mode
    * Note that `exit()` will be called immediately after this to perform cleanup.
    */
   _cancel() {
     if (DEBUG) {
-      console.log(`ModeDrawArea: _cancel`); // eslint-disable-line no-console
+      console.log(`DrawAreaMode: _cancel`); // eslint-disable-line no-console
     }
     this.drawWay = null;
     this.drawNode = null;
diff --git a/modules/modes/ModeDrawLine.js b/modules/modes/DrawLineMode.js
similarity index 92%
rename from modules/modes/ModeDrawLine.js
rename to modules/modes/DrawLineMode.js
index b14d3fbfc7..2f2f90bd39 100644
--- a/modules/modes/ModeDrawLine.js
+++ b/modules/modes/DrawLineMode.js
@@ -7,19 +7,16 @@ import { actionAddVertex } from '../actions/add_vertex';
 import { actionMoveNode } from '../actions/move_node';
 import { actionNoop } from '../actions/noop';
 import { geoChooseEdge } from '../geo';
-import { locationManager } from '../core/LocationManager';
-import { modeSelect } from '../modes/select';
 import { osmNode, osmWay } from '../osm';
-import { t } from '../core/localizer';
 
 const DEBUG = false;
 
 
 /**
- * `ModeDrawLine`
+ * `DrawLineMode`
  * In this mode we are drawing a new line or continuing an existing line
  */
-export class ModeDrawLine extends AbstractMode {
+export class DrawLineMode extends AbstractMode {
 
   /**
    * @constructor
@@ -27,10 +24,9 @@ export class ModeDrawLine extends AbstractMode {
    */
   constructor(context) {
     super(context);
-
     this.id = 'draw-line';
-    this.defaultTags = {};
 
+    this.defaultTags = {};
     this.drawWay = null;    // The draw way just contains the way that we are drawing
     this.drawNode = null;   // The draw node is temporary and just follows the pointer
     this.firstNode = null;  // The first real node in the draw way
@@ -75,12 +71,12 @@ export class ModeDrawLine extends AbstractMode {
       if (!(continueWay instanceof osmWay)) return false;
 
       if (DEBUG) {
-        console.log(`ModeDrawLine: entering, continuing line ${continueWay.id}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: entering, continuing line ${continueWay.id}`);  // eslint-disable-line no-console
       }
 
     } else {    // Start a new line
       if (DEBUG) {
-        console.log('ModeDrawLine: entering');  // eslint-disable-line no-console
+        console.log('DrawLineMode: entering');  // eslint-disable-line no-console
       }
     }
 
@@ -104,7 +100,9 @@ export class ModeDrawLine extends AbstractMode {
       .on('finish', this._finish)
       .on('cancel', this._cancel);
 
-    context.history().on('undone.ModeDrawLine redone.ModeDrawLine', this._undoOrRedo);
+    context.editSystem()
+      .on('undone', this._undoOrRedo)
+      .on('redone', this._undoOrRedo);
 
     context.behaviors.get('map-interaction').doubleClickEnabled = false;
 
@@ -119,7 +117,7 @@ export class ModeDrawLine extends AbstractMode {
       this.drawWay = continueWay;
 
       // Create draw node where we think the poitner is, and extend continue way to it
-      this.drawNode = osmNode({ loc: context.map().mouseLoc() });
+      this.drawNode = osmNode({ loc: context.mapSystem().mouseLoc() });
       context.perform(
         actionAddEntity(this.drawNode),                                          // Create new draw node
         actionAddVertex(this.drawWay.id, this.drawNode.id, this._insertIndex)    // Add draw node to draw way
@@ -139,7 +137,7 @@ export class ModeDrawLine extends AbstractMode {
     this._active = false;
 
     if (DEBUG) {
-      console.log('ModeDrawLine: exiting');  // eslint-disable-line no-console
+      console.log('DrawLineMode: exiting');  // eslint-disable-line no-console
     }
 
     const context = this.context;
@@ -157,7 +155,7 @@ export class ModeDrawLine extends AbstractMode {
     const length = this.drawWay?.nodes?.length || 0;
     if (length < 2) {
       if (DEBUG) {
-        console.log('ModeDrawLine: draw way invalid, rolling back');  // eslint-disable-line no-console
+        console.log('DrawLineMode: draw way invalid, rolling back');  // eslint-disable-line no-console
       }
       while (context.graph() !== this._startGraph) {  // rollback to initial state
         context.pop();
@@ -182,7 +180,9 @@ export class ModeDrawLine extends AbstractMode {
       .off('finish', this._finish)
       .off('cancel', this._cancel);
 
-    context.history().on('undone.ModeDrawLine redone.ModeDrawLine', null);
+    context.editSystem()
+      .off('undone', this._undoOrRedo)
+      .off('redone', this._undoOrRedo);
 
     context.resumeChangeDispatch();
   }
@@ -232,7 +232,7 @@ export class ModeDrawLine extends AbstractMode {
     if (length < 2) return undefined;
 
     const which = length > 2 ? 'continue' : 'start';
-    return t(`operations.${which}.annotation.line`);
+    return this.context.t(`operations.${which}.annotation.line`);
   }
 
 
@@ -286,7 +286,8 @@ export class ModeDrawLine extends AbstractMode {
     const coord = eventData.coord;
     const loc = projection.invert(coord);
 
-    if (locationManager.blocksAt(loc).length) return;   // editing is blocked here
+    const locationSystem = context.locationSystem();
+    if (locationSystem.blocksAt(loc).length) return;   // editing is blocked here
 
     // Now that the user has clicked, let them nudge the map by moving to the edge.
     context.behaviors.get('map-nudging').allow();
@@ -341,7 +342,7 @@ export class ModeDrawLine extends AbstractMode {
       }
 
       if (DEBUG) {
-        console.log(`ModeDrawLine: _clickLoc, extending line to ${loc}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: _clickLoc, extending line to ${loc}`);  // eslint-disable-line no-console
       }
 
       context.replace(actionNoop(), this._getAnnotation());   // Add annotation so we can undo to here
@@ -357,7 +358,7 @@ export class ModeDrawLine extends AbstractMode {
     // Start a new line at `loc`...
     } else {
       if (DEBUG) {
-        console.log(`ModeDrawLine: _clickLoc, starting line at ${loc}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: _clickLoc, starting line at ${loc}`);  // eslint-disable-line no-console
       }
       this.firstNode = osmNode({ loc: loc });
       this.lastNode = this.firstNode;
@@ -396,7 +397,7 @@ export class ModeDrawLine extends AbstractMode {
       }
 
       if (DEBUG) {
-        console.log(`ModeDrawLine: _clickWay, extending line to edge ${edge}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: _clickWay, extending line to edge ${edge}`);  // eslint-disable-line no-console
       }
 
       context.replace(
@@ -416,7 +417,7 @@ export class ModeDrawLine extends AbstractMode {
     // Start a new line at `loc` on target edge...
     } else {
       if (DEBUG) {
-        console.log(`ModeDrawLine: _clickWay, starting line at edge ${edge}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: _clickWay, starting line at edge ${edge}`);  // eslint-disable-line no-console
       }
       this.firstNode = osmNode({ loc: loc });
       this.lastNode = this.firstNode;
@@ -466,7 +467,7 @@ export class ModeDrawLine extends AbstractMode {
       }
 
       if (DEBUG) {
-        console.log(`ModeDrawLine: _clickNode, extending line to ${targetNode.id}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: _clickNode, extending line to ${targetNode.id}`);  // eslint-disable-line no-console
       }
 
       // Time for a switcheroo- replace the 'draw' node with the target node, and annotate it for undo/redo
@@ -486,7 +487,7 @@ export class ModeDrawLine extends AbstractMode {
     // Start a new line at target node...
     } else {
       if (DEBUG) {
-        console.log(`ModeDrawLine: _clickNode, starting line at ${targetNode.id}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: _clickNode, starting line at ${targetNode.id}`);  // eslint-disable-line no-console
       }
 
       this.firstNode = targetNode;
@@ -523,10 +524,10 @@ export class ModeDrawLine extends AbstractMode {
   _finish() {
     if (this.drawWay) {
       if (DEBUG) {
-        console.log(`ModeDrawLine: _finish, drawWay.id = ${this.drawWay.id}`);  // eslint-disable-line no-console
+        console.log(`DrawLineMode: _finish, drawWay.id = ${this.drawWay.id}`);  // eslint-disable-line no-console
       }
       const context = this.context;
-      context.enter(modeSelect(context, [this.drawWay.id]).newFeature(true));
+      context.enter('select-osm', { selectedIDs: [this.drawWay.id], newFeature: true });
     } else {
       this._cancel();
     }
@@ -540,7 +541,7 @@ export class ModeDrawLine extends AbstractMode {
    */
   _cancel() {
     if (DEBUG) {
-      console.log(`ModeDrawLine: _cancel`);  // eslint-disable-line no-console
+      console.log(`DrawLineMode: _cancel`);  // eslint-disable-line no-console
     }
     this.drawWay = null;
     this.drawNode = null;
diff --git a/modules/modes/ModeMove.js b/modules/modes/MoveMode.js
similarity index 73%
rename from modules/modes/ModeMove.js
rename to modules/modes/MoveMode.js
index 63fabfe24f..b25b4c9d1e 100644
--- a/modules/modes/ModeMove.js
+++ b/modules/modes/MoveMode.js
@@ -3,16 +3,13 @@ import { vecSubtract } from '@rapid-sdk/math';
 import { AbstractMode } from './AbstractMode';
 import { actionMove } from '../actions/move';
 import { actionNoop } from '../actions/noop';
-import { locationManager } from '../core/LocationManager';
-import { modeSelect } from './select';
-import { t } from '../core/localizer';
 
 
 /**
- * `ModeMove`
+ * `MoveMode`
  * In this mode, we are moving one or more map features
  */
-export class ModeMove extends AbstractMode {
+export class MoveMode extends AbstractMode {
 
   /**
    * @constructor
@@ -20,8 +17,8 @@ export class ModeMove extends AbstractMode {
    */
   constructor(context) {
     super(context);
-
     this.id = 'move';
+
     this._entityIDs = [];
     this._prevGraph = null;
     this._startLoc = null;
@@ -50,7 +47,7 @@ export class ModeMove extends AbstractMode {
     this._active = true;
 
     const context = this.context;
-    context.features().forceVisible(this._entityIDs);
+    context.filterSystem().forceVisible(this._entityIDs);
     context.enableBehaviors(['map-interaction', 'map-nudging']);
     context.behaviors.get('map-nudging').allow();
 
@@ -58,13 +55,16 @@ export class ModeMove extends AbstractMode {
     this._startLoc = null;
     this._movementCache = null;
 
-    const eventManager = context.map().renderer.events;
-    eventManager.on('click', this._finish);
-    eventManager.on('keydown', this._keydown);
-    eventManager.on('pointercancel', this._cancel);
-    eventManager.on('pointermove', this._pointermove);
+    const eventManager = context.mapSystem().renderer.events;
+    eventManager
+      .on('click', this._finish)
+      .on('keydown', this._keydown)
+      .on('pointercancel', this._cancel)
+      .on('pointermove', this._pointermove);
 
-    context.history().on('undone.ModeMove redone.ModeMove', this._undoOrRedo);
+    context.editSystem()
+      .on('undone', this._undoOrRedo)
+      .on('redone', this._undoOrRedo);
 
     return true;
   }
@@ -82,15 +82,18 @@ export class ModeMove extends AbstractMode {
     this._movementCache = null;
 
     const context = this.context;
-    context.features().forceVisible([]);
-
-    const eventManager = this.context.map().renderer.events;
-    eventManager.off('click', this._finish);
-    eventManager.off('keydown', this._keydown);
-    eventManager.off('pointercancel', this._cancel);
-    eventManager.off('pointermove', this._pointermove);
-
-    context.history().on('undone.ModeMove redone.ModeMove', null);
+    context.filterSystem().forceVisible([]);
+
+    const eventManager = this.context.mapSystem().renderer.events;
+    eventManager
+      .off('click', this._finish)
+      .off('keydown', this._keydown)
+      .off('pointercancel', this._cancel)
+      .off('pointermove', this._pointermove);
+
+    context.editSystem()
+      .off('undone', this._undoOrRedo)
+      .off('redone', this._undoOrRedo);
   }
 
 
@@ -123,15 +126,16 @@ export class ModeMove extends AbstractMode {
     // If prevGraph doesn't match, either we haven't started moving, or something has
     // occurred during the move that interrupted it, so reset vars and start a new move
     if (this._prevGraph !== context.graph()) {
-      this._startLoc = context.map().mouseLoc();
+      this._startLoc = context.mapSystem().mouseLoc();
       this._movementCache = {};
       fn = context.perform;     // start moving
     } else {
       fn = context.overwrite;   // continue moving
     }
 
-    const currLoc = context.map().mouseLoc();
-    if (locationManager.blocksAt(currLoc).length) {  // editing is blocked here
+    const currLoc = context.mapSystem().mouseLoc();
+    const locationSystem = context.locationSystem();
+    if (locationSystem.blocksAt(currLoc).length) {  // editing is blocked here
       this._cancel();
       return;
     }
@@ -159,12 +163,12 @@ export class ModeMove extends AbstractMode {
     const context = this.context;
     if (this._prevGraph) {
       const annotation = (this._entityIDs.length === 1) ?
-        t('operations.move.annotation.' + context.graph().geometry(this._entityIDs[0])) :
-        t('operations.move.annotation.feature', { n: this._entityIDs.length });
+        context.t('operations.move.annotation.' + context.graph().geometry(this._entityIDs[0])) :
+        context.t('operations.move.annotation.feature', { n: this._entityIDs.length });
 
       context.replace(actionNoop(), annotation);   // annotate the move
     }
-    context.enter(modeSelect(context, this._entityIDs));
+    context.enter('select-osm', { selectedIDs: this._entityIDs });
   }
 
 
@@ -177,7 +181,7 @@ export class ModeMove extends AbstractMode {
     if (this._prevGraph) {
       context.pop();   // remove the move
     }
-    context.enter(modeSelect(context, this._entityIDs));
+    context.enter('select-osm', { selectedIDs: this._entityIDs });
   }
 
 
diff --git a/modules/modes/ModeRotate.js b/modules/modes/RotateMode.js
similarity index 84%
rename from modules/modes/ModeRotate.js
rename to modules/modes/RotateMode.js
index 791b63e4e7..4a0aa71e83 100644
--- a/modules/modes/ModeRotate.js
+++ b/modules/modes/RotateMode.js
@@ -5,15 +5,13 @@ import { utilGetAllNodes } from '@rapid-sdk/util';
 import { AbstractMode } from './AbstractMode';
 import { actionRotate } from '../actions/rotate';
 import { actionNoop } from '../actions/noop';
-import { modeSelect } from './select';
-import { t } from '../core/localizer';
 
 
 /**
- * `ModeRotate`
+ * `RotateMode`
  * In this mode, we are rotating one or more map features
  */
-export class ModeRotate extends AbstractMode {
+export class RotateMode extends AbstractMode {
 
   /**
    * @constructor
@@ -21,8 +19,8 @@ export class ModeRotate extends AbstractMode {
    */
   constructor(context) {
     super(context);
-
     this.id = 'rotate';
+
     this._entityIDs = [];
     this._prevGraph = null;
     this._lastPoint = null;
@@ -51,20 +49,23 @@ export class ModeRotate extends AbstractMode {
     this._active = true;
 
     const context = this.context;
-    context.features().forceVisible(this._entityIDs);
+    context.filterSystem().forceVisible(this._entityIDs);
     context.enableBehaviors(['map-interaction']);
 
     this._prevGraph = null;
     this._lastPoint = null;
     this._pivotLoc = null;
 
-    const eventManager = context.map().renderer.events;
-    eventManager.on('click', this._finish);
-    eventManager.on('keydown', this._keydown);
-    eventManager.on('pointercancel', this._cancel);
-    eventManager.on('pointermove', this._pointermove);
+    const eventManager = context.mapSystem().renderer.events;
+    eventManager
+      .on('click', this._finish)
+      .on('keydown', this._keydown)
+      .on('pointercancel', this._cancel)
+      .on('pointermove', this._pointermove);
 
-    context.history().on('undone.ModeRotate redone.ModeRotate', this._undoOrRedo);
+    context.editSystem()
+      .on('undone', this._undoOrRedo)
+      .on('redone', this._undoOrRedo);
 
     return true;
   }
@@ -82,15 +83,18 @@ export class ModeRotate extends AbstractMode {
     this._pivotLoc = null;
 
     const context = this.context;
-    context.features().forceVisible([]);
-
-    const eventManager = this.context.map().renderer.events;
-    eventManager.off('click', this._finish);
-    eventManager.off('keydown', this._keydown);
-    eventManager.off('pointercancel', this._cancel);
-    eventManager.off('pointermove', this._pointermove);
-
-    context.history().on('undone.ModeRotate redone.ModeRotate', null);
+    context.filterSystem().forceVisible([]);
+
+    const eventManager = this.context.mapSystem().renderer.events;
+    eventManager
+      .off('click', this._finish)
+      .off('keydown', this._keydown)
+      .off('pointercancel', this._cancel)
+      .off('pointermove', this._pointermove);
+
+    context.editSystem()
+      .off('undone', this._undoOrRedo)
+      .off('redone', this._undoOrRedo);
   }
 
 
@@ -118,7 +122,7 @@ export class ModeRotate extends AbstractMode {
    */
   _pointermove() {
     const context = this.context;
-    const eventManager = context.map().renderer.events;
+    const eventManager = context.mapSystem().renderer.events;
     const currPoint = eventManager.coord;
 
     let fn;
@@ -223,12 +227,12 @@ export class ModeRotate extends AbstractMode {
     const context = this.context;
     if (this._prevGraph) {
       const annotation = (this._entityIDs.length === 1) ?
-        t('operations.rotate.annotation.' + context.graph().geometry(this._entityIDs[0])) :
-        t('operations.rotate.annotation.feature', { n: this._entityIDs.length });
+        context.t('operations.rotate.annotation.' + context.graph().geometry(this._entityIDs[0])) :
+        context.t('operations.rotate.annotation.feature', { n: this._entityIDs.length });
 
       context.replace(actionNoop(), annotation);   // annotate the rotation
     }
-    context.enter(modeSelect(context, this._entityIDs));
+    context.enter('select-osm', { selectedIDs: this._entityIDs });
   }
 
 
@@ -241,7 +245,7 @@ export class ModeRotate extends AbstractMode {
     if (this._prevGraph) {
       context.pop();   // remove the rotate
     }
-    context.enter(modeSelect(context, this._entityIDs));
+    context.enter('select-osm', { selectedIDs: this._entityIDs });
   }
 
 
diff --git a/modules/modes/ModeSave.js b/modules/modes/SaveMode.js
similarity index 57%
rename from modules/modes/ModeSave.js
rename to modules/modes/SaveMode.js
index 5013ee90ca..0af89c700c 100644
--- a/modules/modes/ModeSave.js
+++ b/modules/modes/SaveMode.js
@@ -1,11 +1,10 @@
 import { select as d3_select } from 'd3-selection';
 
 import { AbstractMode } from './AbstractMode';
-import { t } from '../core/localizer';
-import { services } from '../services';
-import { uiConflicts } from '../ui/conflicts';
-import { uiConfirm } from '../ui/confirm';
 import { uiCommit } from '../ui/commit';
+import { uiConfirm } from '../ui/confirm';
+import { uiConflicts } from '../ui/conflicts';
+import { uiLoading } from '../ui/loading';
 import { uiSuccess } from '../ui/success';
 import { utilKeybinding } from '../util';
 
@@ -13,10 +12,10 @@ const DEBUG = false;
 
 
 /**
- * `ModeSave`
+ * `SaveMode`
  * In this mode, the user is ready to upload their changes
  */
-export class ModeSave extends AbstractMode {
+export class SaveMode extends AbstractMode {
 
   /**
    * @constructor
@@ -26,33 +25,24 @@ export class ModeSave extends AbstractMode {
     super(context);
     this.id = 'save';
 
-    this._keybinding = utilKeybinding('modeSave');
+    this._keybinding = utilKeybinding('SaveMode');
 
     // Make sure the event handlers have `this` bound correctly
     this._cancel = this._cancel.bind(this);
+    this._hideLoading = this._hideLoading.bind(this);
     this._keybindingOff = this._keybindingOff.bind(this);
-    this._keybindingOn= this._keybindingOn.bind(this);
+    this._keybindingOn = this._keybindingOn.bind(this);
     this._prepareForSuccess = this._prepareForSuccess.bind(this);
     this._showConflicts = this._showConflicts.bind(this);
     this._showErrors = this._showErrors.bind(this);
+    this._showLoading = this._showLoading.bind(this);
     this._showProgress = this._showProgress.bind(this);
     this._showSuccess = this._showSuccess.bind(this);
 
     this._location = null;
-    this._successUI = null;
-    this._conflictsUI = null;
-
-    this._commitUI = uiCommit(context)
-      .on('cancel', this._cancel);
-
-    this.uploader = context.uploader()
-      .on('saveStarted.modeSave', this._keybindingOff)
-      .on('willAttemptUpload.modeSave', this._prepareForSuccess)
-      .on('progressChanged.modeSave', this._showProgress)
-      .on('resultNoChanges.modeSave', this._cancel)
-      .on('resultErrors.modeSave', this._showErrors)
-      .on('resultConflicts.modeSave', this._showConflicts)
-      .on('resultSuccess.modeSave', this._showSuccess);
+    this._uiConflicts = null;
+    this._uiLoading = null;
+    this._uiSuccess = null;
   }
 
 
@@ -61,40 +51,51 @@ export class ModeSave extends AbstractMode {
    */
   enter() {
     if (DEBUG) {
-      console.log('ModeSave: entering');  // eslint-disable-line no-console
+      console.log('SaveMode: entering');  // eslint-disable-line no-console
     }
 
     // Show sidebar
     const context = this.context;
     context.ui().sidebar.expand();
 
-    const thiz = this;
-    function showSidebar() {
-      context.ui().sidebar.show(thiz._commitUI);
-    }
-
-    const osm = context.connection();
+    const osm = context.services.get('osm');
     if (!osm) return false;  // can't enter save mode
 
+    this._active = true;
+
+    this._uiCommit = uiCommit(context)
+      .on('cancel', this._cancel);
+
     if (osm.authenticated()) {
-        showSidebar();
+      context.ui().sidebar.show(this._uiCommit);
     } else {
       osm.authenticate(err => {
         if (err) {
-          thiz._cancel();
+          this._cancel();
         } else {
-          showSidebar();
+          context.ui().sidebar.show(this._uiCommit);
         }
       });
     }
 
-    this._active = true;
     context.container().selectAll('.main-content')
       .classed('active', false)
       .classed('inactive', true);
 
     this._keybindingOn();
-    this.context.enableBehaviors(['map-interaction']);
+    context.enableBehaviors(['map-interaction']);
+
+    context.uploaderSystem()
+      .on('progressChanged', this._showProgress)
+      .on('resultConflicts', this._showConflicts)
+      .on('resultErrors', this._showErrors)
+      .on('resultNoChanges', this._cancel)
+      .on('resultSuccess', this._showSuccess)
+      .on('saveEnded', this._hideLoading)
+      .on('saveStarted', this._keybindingOff)
+      .on('saveStarted', this._showLoading)
+      .on('willAttemptUpload', this._prepareForSuccess);
+
     return true;
   }
 
@@ -107,9 +108,23 @@ export class ModeSave extends AbstractMode {
     this._active = false;
 
     if (DEBUG) {
-      console.log('ModeSave: exiting');  // eslint-disable-line no-console
+      console.log('SaveMode: exiting');  // eslint-disable-line no-console
     }
 
+    this._uiCommit.on('cancel', null);
+    this._uiCommit = null;
+
+    this.context.uploaderSystem()
+      .off('progressChanged', this._showProgress)
+      .off('resultConflicts', this._showConflicts)
+      .off('resultErrors', this._showErrors)
+      .off('resultNoChanges', this._cancel)
+      .off('resultSuccess', this._showSuccess)
+      .off('saveEnded', this._hideLoading)
+      .off('saveStarted', this._keybindingOff)
+      .off('saveStarted', this._showLoading)
+      .off('willAttemptUpload', this._prepareForSuccess);
+
     this._keybindingOff();
 
     this.context.container().selectAll('.main-content')
@@ -141,25 +156,28 @@ export class ModeSave extends AbstractMode {
       .append('div')
       .attr('class', 'progress')
       .merge(progress)
-      .text(t('save.conflict_progress', { num: num, total: total }));
+      .text(this.context.t('save.conflict_progress', { num: num, total: total }));
   }
 
 
   /**
    * showConflicts handler
    */
-  _showConflicts(changeset, conflicts, origChanges) {
-    const selection = this.context.container().select('.sidebar')
+  _showConflicts(conflicts, origChanges) {
+    const context = this.context;
+    const uploader = context.uploaderSystem();
+
+    const selection = context.container().select('.sidebar')
       .append('div')
       .attr('class','sidebar-component');
 
-    const mainContent = this.context.container().selectAll('.main-content');
+    const mainContent = context.container().selectAll('.main-content');
 
     mainContent
       .classed('active', true)
       .classed('inactive', false);
 
-    this._conflictsUI = uiConflicts(this.context)
+    this._uiConflicts = uiConflicts(context)
       .conflictList(conflicts)
       .origChanges(origChanges)
       .on('cancel', () => {
@@ -168,17 +186,17 @@ export class ModeSave extends AbstractMode {
           .classed('inactive', true);
         selection.remove();
         this._keybindingOn();
-        this.uploader.cancelConflictResolution();
+        uploader.cancelConflictResolution();
       })
       .on('save', () => {
         mainContent
           .classed('active', false)
           .classed('inactive', true);
         selection.remove();
-        this.uploader.processResolvedConflicts(changeset);
+        uploader.processResolvedConflicts();
       });
 
-    selection.call(this._conflictsUI);
+    selection.call(this._uiConflicts);
   }
 
 
@@ -188,11 +206,11 @@ export class ModeSave extends AbstractMode {
   _showErrors(errors) {
     this._keybindingOn();
 
-    const selection = uiConfirm(this.context.container());
+    const selection = uiConfirm(this.context, this.context.container());
     selection
       .select('.modal-section.header')
       .append('h3')
-      .text(t('save.error'));
+      .text(this.context.t('save.error'));
 
     this._addErrors(selection, errors);
     selection.okButton();
@@ -219,13 +237,13 @@ export class ModeSave extends AbstractMode {
       .attr('class', 'error-description')
       .attr('href', '#')
       .classed('hide-toggle', true)
-      .text(d => d.msg || t('save.unknown_error_details'))
+      .text(d => d.msg || this.context.t('save.unknown_error_details'))
       .on('click', function(d3_event) {
         d3_event.preventDefault();
 
-        var error = d3_select(this);
-        var detail = d3_select(this.nextElementSibling);
-        var exp = error.classed('expanded');
+        const error = d3_select(this);
+        const detail = d3_select(this.nextElementSibling);
+        const exp = error.classed('expanded');
 
         detail.style('display', exp ? 'none' : 'block');
         error.classed('expanded', !exp);
@@ -255,17 +273,35 @@ export class ModeSave extends AbstractMode {
    * _showSuccess handler
    */
   _showSuccess(changeset) {
-    this._commitUI.reset();
-
-    const successContent = this._successUI
+    const context = this.context;
+    const successContent = this._uiSuccess
       .changeset(changeset)
       .location(this._location)
-      .on('cancel', () => {
-        this.context.ui().sidebar.hide();
-      });
+      .on('cancel', () => context.ui().sidebar.hide());
 
-    this.context.enter('browse');
-    this.context.ui().sidebar.show(successContent);
+    context.enter('browse');
+    context.ui().sidebar.show(successContent);
+  }
+
+
+  /**
+   * _showLoading
+   */
+  _showLoading() {
+    const context = this.context;
+    this._saveLoading = uiLoading(context)
+      .message(context.tHtml('save.uploading'))
+      .blocking(true);
+    context.container().call(this._saveLoading);  // block input during upload
+  }
+
+
+  /**
+   * _hideLoading
+   */
+  _hideLoading() {
+    this._saveLoading.close();
+    this._saveLoading = null;
   }
 
 
@@ -276,6 +312,7 @@ export class ModeSave extends AbstractMode {
     d3_select(document).call(this._keybinding.on('⎋', this._cancel, true));
   }
 
+
   /**
    * _keybindingOff
    */
@@ -287,27 +324,24 @@ export class ModeSave extends AbstractMode {
   // Reverse geocode current map location so we can display a message on
   // the success screen like "Thank you for editing around place, region."
   _prepareForSuccess() {
-    this._successUI = uiSuccess(this.context);
+    this._uiSuccess = uiSuccess(this.context);
     this._location = null;
-    if (!services.geocoder) return;
 
-    services.geocoder.reverse(this.context.map().center(), (err, result) => {
+    const loc = this.context.mapSystem().center();
+    const nominatim = this.context.services.get('nominatim');
+
+    nominatim?.reverse(loc, (err, result) => {
       if (err || !result || !result.address) return;
 
       const addr = result.address;
-      const place = (addr && (addr.town || addr.city || addr.county)) || '';
-      const region = (addr && (addr.state || addr.country)) || '';
-      const separator = (place && region) ? t('success.thank_you_where.separator') : '';
+      const place = addr?.town ?? addr?.city ?? addr?.county ?? '';
+      const region = addr?.state ?? addr?.country ?? '';
+      const separator = (place && region) ? this.context.t('success.thank_you_where.separator') : '';
 
-      this._location = t('success.thank_you_where.format',
+      this._location = this.context.t('success.thank_you_where.format',
         { place: place, separator: separator, region: region }
       );
     });
   }
 
-// mode.selectedIDs = function() {
-//     return _conflictsUI ? _conflictsUI.shownEntityIds() : [];
-// };
-
 }
-
diff --git a/modules/modes/ModeSelect.js b/modules/modes/SelectMode.js
similarity index 82%
rename from modules/modes/ModeSelect.js
rename to modules/modes/SelectMode.js
index c2af13d3c0..b964918a9d 100644
--- a/modules/modes/ModeSelect.js
+++ b/modules/modes/SelectMode.js
@@ -3,7 +3,6 @@ import { geoBounds as d3_geoBounds } from 'd3-geo';
 import { Extent } from '@rapid-sdk/math';
 
 import { AbstractMode } from './AbstractMode';
-import { services } from '../services';
 import { osmNote, QAItem } from '../osm';
 import { uiDataEditor } from '../ui/data_editor';
 import { uiImproveOsmEditor } from '../ui/improveOSM_editor';
@@ -17,13 +16,13 @@ const DEBUG = false;
 
 
 /**
- * `ModeSelect`
+ * `SelectMode`
  * In this mode, the user has selected one or more things.
  * - `selectedData` contains the information about what is selected.
  * - The sidebar shows something depending on what the selection contains.
  * - We also can set up the "operations" allowed (right click edit menu)
  */
-export class ModeSelect extends AbstractMode {
+export class SelectMode extends AbstractMode {
 
   /**
    * @constructor
@@ -32,8 +31,8 @@ export class ModeSelect extends AbstractMode {
   constructor(context) {
     super(context);
     this.id = 'select';
-    this.keybinding = null;
 
+    this.keybinding = null;
     this.extent = null;
   }
 
@@ -51,7 +50,7 @@ export class ModeSelect extends AbstractMode {
     const [[datumID, datum]] = selection.entries();   // the first thing in the selection
 
     if (DEBUG) {
-      console.log(`ModeSelect: entering, selected ${datumID}`);  // eslint-disable-line no-console
+      console.log(`SelectMode: entering, selected ${datumID}`);  // eslint-disable-line no-console
     }
 
     this._selectedData = selection;
@@ -77,7 +76,7 @@ export class ModeSelect extends AbstractMode {
         other = new Extent(bounds[0], bounds[1]);
 
       } else if (datum.__fbid__) {  // Rapid feature
-        const service = datum.__service__ === 'esri' ? services.esriData : services.fbMLRoads;
+        const service = context.services.get(datum.__service__);
         if (!service) continue;
         const graph = service.graph(datum.__datasetid__);
         if (!graph) continue;
@@ -96,9 +95,9 @@ export class ModeSelect extends AbstractMode {
       sidebarContent = uiNoteEditor(context).note(datum);
       sidebarContent
         .on('change', () => {
-          context.map().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
-          if (!services.osm) return;
-          const note = services.osm.getNote(datumID);
+          context.mapSystem().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
+          const osm = context.services.get('osm');
+          const note = osm?.getNote(datumID);
           if (!(note instanceof osmNote)) return;   // or - go to browse mode
           context.ui().sidebar.show(sidebarContent.note(note));
           this._selectedData.set(datumID, note);  // update selectedData after a change happens?
@@ -108,9 +107,9 @@ export class ModeSelect extends AbstractMode {
       sidebarContent = uiImproveOsmEditor(context).error(datum);
       sidebarContent
         .on('change', () => {
-          context.map().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
-          if (!services.improveOSM) return;
-          const error = services.improveOSM.getError(datumID);
+          context.mapSystem().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
+          const improveosm = context.services.get('improveOSM');
+          const error = improveosm?.getError(datumID);
           if (!(error instanceof QAItem)) return;  // or - go to browse mode?
           context.ui().sidebar.show(sidebarContent.error(error));
           this._selectedData.set(datumID, error);  // update selectedData after a change happens?
@@ -120,9 +119,9 @@ export class ModeSelect extends AbstractMode {
       sidebarContent = uiKeepRightEditor(context).error(datum);
       sidebarContent
         .on('change', () => {
-          context.map().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
-          if (!services.keepRight) return;
-          const error = services.keepRight.getError(datumID);
+          context.mapSystem().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
+          const keepright = context.services.get('keepRight');
+          const error = keepright?.getError(datumID);
           if (!(error instanceof QAItem)) return;  // or - go to browse mode?
           context.ui().sidebar.show(sidebarContent.error(error));
           this._selectedData.set(datumID, error);  // update selectedData after a change happens?
@@ -132,9 +131,9 @@ export class ModeSelect extends AbstractMode {
       sidebarContent = uiOsmoseEditor(context).error(datum);
       sidebarContent
         .on('change', () => {
-          context.map().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
-          if (!services.osmose) return;
-          const error = services.osmose.getError(datumID);
+          context.mapSystem().immediateRedraw();  // force a redraw (there is no history change that would otherwise do this)
+          const osmose = context.services.get('osmose');
+          const error = osmose?.getError(datumID);
           if (!(error instanceof QAItem)) return;  // or - go to browse mode?
           context.ui().sidebar.show(sidebarContent.error(error));
           this._selectedData.set(datumID, error);  // update selectedData after a change happens?
@@ -184,7 +183,7 @@ export class ModeSelect extends AbstractMode {
     }
 
     if (DEBUG) {
-      console.log('ModeSelect: exiting');  // eslint-disable-line no-console
+      console.log('SelectMode: exiting');  // eslint-disable-line no-console
     }
 
     this._selectedData.clear();
diff --git a/modules/modes/SelectOsmMode.js b/modules/modes/SelectOsmMode.js
new file mode 100644
index 0000000000..4c2c649be1
--- /dev/null
+++ b/modules/modes/SelectOsmMode.js
@@ -0,0 +1,455 @@
+import { select as d3_select } from 'd3-selection';
+
+import { AbstractMode } from './AbstractMode';
+import { actionDeleteRelation } from '../actions/delete_relation';
+import * as Operations from '../operations/index';
+import { uiCmd } from '../ui/cmd';
+import { utilKeybinding, utilTotalExtent } from '../util';
+
+
+/**
+ * `SelectOsmMode`
+ * In this mode, the user has selected one or more OSM features.
+ *
+ * For a while we needed to keep the old `modeSelect` around, and we should
+ * eventually have a common select mode for everything but this is just my
+ * attempt at updating the legacy osm-only select mode for now.
+ */
+export class SelectOsmMode extends AbstractMode {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'select-osm';
+
+    this.keybinding = null;
+    this.extent = null;
+
+    this._newFeature = false;
+
+    // `this._focusedParentID` is used when we visit a vertex with multiple
+    // parents, and we want to remember which parent line we started on.
+    this._focusedParentID = null;
+
+    // If we have a single thing selected, keep track of it here
+    this._singularDatum = null;
+
+    // Make sure the event handlers have `this` bound correctly
+    this._esc = this._esc.bind(this);
+    this._firstVertex = this._firstVertex.bind(this);
+    this._focusNextParent = this._focusNextParent.bind(this);
+    this._lastVertex = this._lastVertex.bind(this);
+    this._nextVertex = this._nextVertex.bind(this);
+    this._previousVertex = this._previousVertex.bind(this);
+    this._undoOrRedo = this._undoOrRedo.bind(this);
+  }
+
+
+  /**
+   * enter
+   * Expects a `selectedIDs` Array property in the options
+   * @param  `options`  Optional `Object` of options passed to the new mode
+   */
+  enter(options = {}) {
+    const entityIDs = options.selectedIDs;
+    this._newFeature = options.newFeature;
+
+    if (!Array.isArray(entityIDs)) return false;
+    if (!entityIDs.length) return false;
+
+    const context = this.context;
+    const locationSystem = context.locationSystem();
+
+    // For this mode, keep only the OSM data
+    let selectedIDs = [];
+    this._selectedData = new Map();
+    this._singularDatum = null;
+
+    for (const entityID of entityIDs) {
+      const entity = context.hasEntity(entityID);
+      if (!entity) continue;   // not osm
+      if (entity.type === 'node' && locationSystem.blocksAt(entity.loc).length) continue;  // editing is blocked
+
+      this._selectedData.set(entityID, entity);   // otherwise keep it
+      selectedIDs.push(entityID);
+      if (entityIDs.length === 1) {
+        this._singularDatum = entity;   // a single thing is selected
+      }
+    }
+
+    if (!this._selectedData.size) return false;  // nothing to select
+
+    this._active = true;
+    context.enableBehaviors(['hover', 'select', 'drag', 'map-interaction', 'lasso', 'paste']);
+
+    // Compute the total extent of selected items
+    this.extent = utilTotalExtent(selectedIDs, context.graph());
+
+    context.filterSystem().forceVisible(selectedIDs);
+
+    // setup which operations are valid for this selection
+    this.operations.forEach(o => {
+      if (o.behavior) {
+        o.behavior.disable();
+      }
+    });
+
+    this.operations = Object.values(Operations)
+      .map(o => o(context, selectedIDs))
+      .filter(o => (o.id !== 'delete' && o.id !== 'downgrade' && o.id !== 'copy'))
+      .concat([
+          // group copy/downgrade/delete operation together at the end of the list
+          Operations.operationCopy(context, selectedIDs),
+          Operations.operationDowngrade(context, selectedIDs),
+          Operations.operationDelete(context, selectedIDs)
+        ])
+      .filter(o => o.available());
+
+    this.operations.forEach(o => {
+      if (o.behavior) {
+        o.behavior.enable();
+      }
+    });
+
+    context.ui().closeEditMenu();   // remove any displayed menu
+
+    this.keybinding = utilKeybinding('select');
+    this.keybinding
+      .on(['[', 'pgup'], this._previousVertex)
+      .on([']', 'pgdown'], this._nextVertex)
+      .on(['{', uiCmd('⌘['), 'home'], this._firstVertex)
+      .on(['}', uiCmd('⌘]'), 'end'], this._lastVertex)
+      .on(['\\', 'pause'], this._focusNextParent)
+      .on('⎋', this._esc, true);
+//      .on(uiCmd('⌘↑'), this._selectParent)    // tbh I dont know what these are
+//      .on(uiCmd('⌘↓'), this._selectChild)
+
+    d3_select(document)
+      .call(this.keybinding);
+
+    context.ui().sidebar
+      .select(selectedIDs, this._newFeature);
+
+    context.editSystem()
+      // this was probably to style the elements
+      // .on('change', this._selectElements)    // reselect, in case relation members were removed or added
+      .on('undone', this._undoOrRedo)
+      .on('redone', this._undoOrRedo);
+
+    return true;
+  }
+
+
+  /**
+   * exit
+   */
+  exit() {
+    if (!this._active) return;
+    this._active = false;
+
+    const context = this.context;
+
+    // If the user added an empty relation, we should clean it up.
+    const entity = this._singularDatum;
+    if (
+      entity && entity.type === 'relation' &&
+      // no tags
+      Object.keys(entity.tags).length === 0 &&
+      // no parent relations
+      context.graph().parentRelations(entity).length === 0 &&
+      // no members or one member with no role
+      (entity.members.length === 0 || (entity.members.length === 1 && !entity.members[0].role))
+    ) {
+      // The user added this relation but didn't edit it at all, so just delete it
+      const deleteAction = actionDeleteRelation(entity.id, true /* don't delete untagged members */);
+      context.perform(deleteAction, context.t('operations.delete.annotation.relation'));
+      context.validationSystem().validate();
+    }
+
+
+    this.extent = null;
+    this._newFeature = false;
+    this._singularDatum = null;
+    this._selectedData.clear();
+
+    // disable operations
+    this.operations.forEach(o => {
+      if (o.behavior) {
+        o.behavior.disable();
+      }
+    });
+    this.operations = [];
+
+    context.ui().closeEditMenu();
+    context.ui().sidebar.hide();
+    context.filterSystem().forceVisible([]);
+
+    if (this.keybinding) {
+      d3_select(document).call(this.keybinding.unbind);
+      this.keybinding = null;
+    }
+
+    context.editSystem()
+      // .off('change', this._selectElements)
+      .off('undone', this._undoOrRedo)
+      .off('redone', this._undoOrRedo);
+  }
+
+
+  /**
+   * _esc
+   *  return to browse mode
+   */
+  _esc() {
+    const context = this.context;
+    if (context.container().select('.combobox').size()) return;
+    context.enter('browse');
+  }
+
+
+  /**
+   * _undoOrRedo
+   *  on undo or redo, see whether we can stay in this mode
+   */
+  _undoOrRedo() {
+    const context = this.context;
+    const locationSystem = context.locationSystem();
+    let selectedIDs = [];
+
+    for (const [datumID, datum] of this._selectedData) {
+      if (!context.hasEntity(datumID)) continue;   // was deleted
+      if (datum.type === 'node' && locationSystem.blocksAt(datum.loc).length) continue;  // editing is blocked
+      selectedIDs.push(datumID);  // keep it selected
+    }
+
+    if (!selectedIDs.length) {
+      context.enter('browse');
+    } else {
+      context.enter('select-osm', { selectedIDs: selectedIDs });   // reselect whatever remains
+    }
+  }
+
+
+  /**
+   * _chooseParentWay
+   *  when using keyboard navigation, try to stay with the previously focused parent way
+   */
+  _chooseParentWay(entity) {
+    if (!entity) return null;
+
+    const graph = this.context.graph();
+
+    if (entity.type === 'way') {     // selected entity already is a way, so just use it.
+      this._focusedParentID = entity.id;
+
+    } else {
+      const parentIDs = graph.parentWays(entity).map(way => way.id);
+      if (!parentIDs.length) {
+        this._focusedParentID = null;   // no parents
+
+      } else {
+        // We'll try to stick with the already focused parent (e.g. when keyboard navigating along a way).
+        // If we can't do that, just pick the first parent to be the new focused parent.
+        if (!parentIDs.includes(this._focusedParentID)) {
+          this._focusedParentID = parentIDs[0];
+        }
+      }
+    }
+
+    return graph.hasEntity(this._focusedParentID);
+  }
+
+
+
+  /**
+   * _firstVertex
+   *  jump to the first vertex along a way
+   */
+  _firstVertex(d3_event) {
+    d3_event.preventDefault();
+
+    const context = this.context;
+    const way = this._chooseParentWay(this._singularDatum);
+    if (!way) return;
+
+    const node = context.entity(way.first());
+    context.enter('select-osm', { selectedIDs: [node.id] });
+    context.mapSystem().centerEase(node.loc);
+  }
+
+
+  /**
+   * _lastVertex
+   *  jump to the first vertex along a way
+   */
+  _lastVertex(d3_event) {
+    d3_event.preventDefault();
+
+    const context = this.context;
+    const way = this._chooseParentWay(this._singularDatum);
+    if (!way) return;
+
+    const node = context.entity(way.last());
+    context.enter('select-osm', { selectedIDs: [node.id] });
+    context.mapSystem().centerEase(node.loc);
+  }
+
+
+  /**
+   * _previousVertex
+   *  jump to the previous vertex
+   */
+  _previousVertex(d3_event) {
+    d3_event.preventDefault();
+
+    const context = this.context;
+    const entity = this._singularDatum;
+    if (entity?.type !== 'node') return;
+
+    const way = this._chooseParentWay(this._singularDatum);
+    if (!way) return;
+
+    const currIndex = way.nodes.indexOf(entity.id);
+    let nextIndex = -1;
+
+    if (currIndex > 0) {
+      nextIndex = currIndex - 1;
+    } else if (way.isClosed()) {
+      nextIndex = length - 2;
+    }
+
+    if (nextIndex !== -1) {
+      const node = context.entity(way.nodes[nextIndex]);
+      context.enter('select-osm', { selectedIDs: [node.id] });
+      context.mapSystem().centerEase(node.loc);
+    }
+  }
+
+
+  /**
+   * _nextVertex
+   *  jump to the next vertex
+   */
+  _nextVertex(d3_event) {
+    d3_event.preventDefault();
+
+    const context = this.context;
+    const entity = this._singularDatum;
+    if (entity?.type !== 'node') return;
+
+    const way = this._chooseParentWay(this._singularDatum);
+    if (!way) return;
+
+    const currIndex = way.nodes.indexOf(entity.id);
+    let nextIndex = -1;
+
+    if (currIndex < way.nodes.length - 1) {
+      nextIndex = currIndex + 1;
+    } else if (way.isClosed()) {
+      nextIndex = 0;
+    }
+
+    if (nextIndex !== -1) {
+      const node = context.entity(way.nodes[nextIndex]);
+      context.enter('select-osm', { selectedIDs: [node.id] });
+      context.mapSystem().centerEase(node.loc);
+    }
+  }
+
+
+  /**
+   * _focusNextParent
+   *  If the user is at a junction, focus on a different parent way
+   */
+  _focusNextParent(d3_event) {
+    d3_event.preventDefault();
+
+    const entity = this._singularDatum;
+    if (entity?.type !== 'node') return;
+
+    const graph = this.context.graph();
+    const parentIDs = graph.parentWays(entity).map(way => way.id);
+
+    if (parentIDs.length) {
+      const currIndex = parentIDs.indexOf(this._focusedParentID);  // -1 if not found
+      let nextIndex = currIndex + 1;
+      if (nextIndex >= parentIDs.length) {
+        nextIndex = 0;  // wrap
+      }
+
+      this._focusedParentID = parentIDs[nextIndex];
+    }
+
+// won't work
+//    var surface = context.surface();
+//    surface.selectAll('.related')
+//        .classed('related', false);
+//
+//    if (this._focusedParentID) {
+//        surface.selectAll(utilEntitySelector([this._focusedParentID]))
+//            .classed('related', true);
+//    }
+  }
+
+
+
+//  function selectParent(d3_event) {
+//      d3_event.preventDefault();
+//
+//      var currentSelectedIds = mode.selectedIDs();
+//      var parentIDs = this._focusedParentID ? [this._focusedParentID] : parentWaysIdsOfSelection(false);
+//      if (!parentIDs.length) return;
+//
+//      context.enter(
+//          mode.selectedIDs(parentIDs)
+//      );
+//      // set this after re-entering the selection since we normally want it cleared on exit
+//      this._focusedVertexIDs = currentSelectedIds;
+//  }
+//
+//  function selectChild(d3_event) {
+//      d3_event.preventDefault();
+//
+//      var currentSelectedIds = mode.selectedIDs();
+//
+//      var childIds = this._focusedVertexIDs ? this._focusedVertexIDs.filter(id => context.hasEntity(id)) : childNodeIdsOfSelection(true);
+//      if (!childIds || !childIds.length) return;
+//
+//      if (currentSelectedIds.length === 1) this._focusedParentID = currentSelectedIds[0];
+//
+//      context.enter(
+//          mode.selectedIDs(childIds)
+//      );
+//  }
+//
+//  // find the child nodes for selected ways
+//  function childNodeIdsOfSelection(onlyCommon) {
+//      var graph = context.graph();
+//      var childs = [];
+//
+//      for (var i = 0; i < selectedIDs.length; i++) {
+//          var entity = context.hasEntity(selectedIDs[i]);
+//
+//          if (!entity || !['area', 'line'].includes(entity.geometry(graph))){
+//              return [];  // selection includes non-area/non-line
+//          }
+//          var currChilds = graph.childNodes(entity).map(function(node) { return node.id; });
+//          if (!childs.length) {
+//              childs = currChilds;
+//              continue;
+//          }
+//
+//          childs = (onlyCommon ? utilArrayIntersection : utilArrayUnion)(childs, currChilds);
+//          if (!childs.length) {
+//              return [];
+//          }
+//      }
+//
+//      return childs;
+//  }
+//
+
+}
diff --git a/modules/modes/drag_note.js b/modules/modes/drag_note.js
index 38d72a8fa6..99fb5e2224 100644
--- a/modules/modes/drag_note.js
+++ b/modules/modes/drag_note.js
@@ -1,6 +1,5 @@
 import { geomViewportNudge, vecSubtract } from '@rapid-sdk/math';
 
-import { services } from '../services';
 import { actionNoop } from '../actions/noop';
 
 
@@ -23,7 +22,7 @@ export function modeDragNote(context) {
     function startNudge(d3_event, nudge) {
         if (_nudgeInterval) window.clearInterval(_nudgeInterval);
         _nudgeInterval = window.setInterval(function() {
-            context.map().pan(nudge);
+            context.mapSystem().pan(nudge);
             doMove(d3_event, nudge);
         }, 50);
     }
@@ -44,7 +43,7 @@ export function modeDragNote(context) {
 
     function start(d3_event, note) {
         _note = note;
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (osm) {
             // Get latest note from cache.. The marker may have a stale datum bound to it
             // and dragging it around can sometimes delete the users note comment.
@@ -66,7 +65,7 @@ export function modeDragNote(context) {
         _lastLoc = context.projection.invert(point);
 
         doMove(d3_event);
-        var nudge = geomViewportNudge(point, context.map().dimensions);
+        var nudge = geomViewportNudge(point, context.mapSystem().dimensions);
         if (nudge) {
             startNudge(d3_event, nudge);
         } else {
@@ -84,7 +83,7 @@ export function modeDragNote(context) {
 
         _note = _note.move(loc);
 
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (osm) {
             osm.replaceNote(_note);  // update note cache
         }
diff --git a/modules/modes/index.js b/modules/modes/index.js
index 886986cf45..fe4adc734c 100644
--- a/modules/modes/index.js
+++ b/modules/modes/index.js
@@ -1,13 +1,48 @@
-export { ModeAddNote } from './ModeAddNote';
-export { ModeAddPoint } from './ModeAddPoint';
-export { ModeBrowse } from './ModeBrowse';
-export { ModeDragNode } from './ModeDragNode';
-export { ModeDrawArea } from './ModeDrawArea';
-export { ModeDrawLine } from './ModeDrawLine';
-export { ModeMove } from './ModeMove';
-export { ModeRotate } from './ModeRotate';
-export { ModeSave } from './ModeSave';
-export { ModeSelect } from './ModeSelect';
+import { AbstractMode } from './AbstractMode';
+import { AddNoteMode } from './AddNoteMode';
+import { AddPointMode } from './AddPointMode';
+import { BrowseMode } from './BrowseMode';
+import { DragNodeMode } from './DragNodeMode';
+import { DrawAreaMode } from './DrawAreaMode';
+import { DrawLineMode } from './DrawLineMode';
+import { MoveMode } from './MoveMode';
+import { RotateMode } from './RotateMode';
+import { SaveMode } from './SaveMode';
+import { SelectMode } from './SelectMode';
+import { SelectOsmMode } from './SelectOsmMode';
 
+export {
+  AbstractMode,
+  AddNoteMode,
+  AddPointMode,
+  BrowseMode,
+  DragNodeMode,
+  DrawAreaMode,
+  DrawLineMode,
+  MoveMode,
+  RotateMode,
+  SaveMode,
+  SelectMode,
+  SelectOsmMode   // someday, single select mode?
+};
+
+// legacy
 export { modeDragNote } from './drag_note';
-export { modeSelect } from './select';
+
+// At init time, we will instantiate any that are in the 'available' collection.
+export const modes = {
+  available:    new Map(),   // Map (id -> Mode constructor)
+  instantiated: new Map()    // Map (id -> Mode instance)
+};
+
+modes.available.set('add-note', AddNoteMode);
+modes.available.set('add-point', AddPointMode);
+modes.available.set('browse', BrowseMode);
+modes.available.set('drag-node', DragNodeMode);
+modes.available.set('draw-area', DrawAreaMode);
+modes.available.set('draw-line', DrawLineMode);
+modes.available.set('move', MoveMode);
+modes.available.set('rotate', RotateMode);
+modes.available.set('save', SaveMode);
+modes.available.set('select', SelectMode);
+modes.available.set('select-osm', SelectOsmMode);
diff --git a/modules/modes/select.js b/modules/modes/select.js
deleted file mode 100644
index 80bb4dd07b..0000000000
--- a/modules/modes/select.js
+++ /dev/null
@@ -1,546 +0,0 @@
-import { select as d3_select } from 'd3-selection';
-import {
-    utilArrayIntersection, utilArrayUnion, utilDeepMemberSelector,
-    utilEntityOrDeepMemberSelector, utilEntitySelector
-} from '@rapid-sdk/util';
-
-import { t } from '../core/localizer';
-import { locationManager } from '../core/LocationManager';
-import { actionAddMidpoint } from '../actions/add_midpoint';
-import { actionDeleteRelation } from '../actions/delete_relation';
-//import { behaviorLasso } from '../behaviors/lasso';
-//import { BehaviorHover } from '../behaviors/BehaviorHover';
-//import { BehaviorPaste } from '../behaviors/BehaviorPaste';
-//import { BehaviorSelect } from '../behaviors/BehaviorSelect';
-import { geoChooseEdge } from '../geo';
-import { osmNode, osmWay } from '../osm';
-import * as Operations from '../operations/index';
-import { uiCmd } from '../ui/cmd';
-import { utilKeybinding, utilTotalExtent } from '../util';
-
-
-export function modeSelect(context, selectedIDs) {
-    var mode = {
-        id: 'select',
-        button: 'browse'
-    };
-
-    var keybinding = utilKeybinding('select');
-
-    // var _selectBehavior;
-    // var _behaviors = [];
-
-    var _operations = [];
-    var _newFeature = false;
-    var _follow = false;
-
-    // `_focusedParentWayId` is used when we visit a vertex with multiple
-    // parents, and we want to remember which parent line we started on.
-    var _focusedParentWayId;
-    var _focusedVertexIds;
-
-
-    function singular() {
-        if (selectedIDs && selectedIDs.length === 1) {
-            return context.hasEntity(selectedIDs[0]);
-        }
-    }
-
-
-    function checkSelectedIDs() {
-        var ids = [];
-        if (Array.isArray(selectedIDs)) {
-            ids = selectedIDs.filter(function(id) {
-                var entity = context.hasEntity(id);
-                if (!entity) return false;
-                if (entity.type === 'node' && locationManager.blocksAt(entity.loc).length) return false;
-                return true;
-            });
-        }
-
-        if (!ids.length) {
-            context.enter('browse');
-            return false;
-        } else if ((selectedIDs.length > 1 && ids.length === 1) || (selectedIDs.length === 1 && ids.length > 1)) {
-            // switch between single- and multi-select UI
-            context.enter(modeSelect(context, ids));
-            return false;
-        }
-
-        selectedIDs = ids;
-        return true;
-    }
-
-
-    // find the parent ways for nextVertex, previousVertex, and selectParent
-    function parentWaysIdsOfSelection(onlyCommonParents) {
-        var graph = context.graph();
-        var parents = [];
-
-        for (var i = 0; i < selectedIDs.length; i++) {
-            var entity = context.hasEntity(selectedIDs[i]);
-            if (!entity || entity.geometry(graph) !== 'vertex') {
-                return [];  // selection includes some non-vertices
-            }
-
-            var currParents = graph.parentWays(entity).map(function(w) { return w.id; });
-            if (!parents.length) {
-                parents = currParents;
-                continue;
-            }
-
-            parents = (onlyCommonParents ? utilArrayIntersection : utilArrayUnion)(parents, currParents);
-            if (!parents.length) {
-                return [];
-            }
-        }
-
-        return parents;
-    }
-
-    // find the child nodes for selected ways
-    function childNodeIdsOfSelection(onlyCommon) {
-        var graph = context.graph();
-        var childs = [];
-
-        for (var i = 0; i < selectedIDs.length; i++) {
-            var entity = context.hasEntity(selectedIDs[i]);
-
-            if (!entity || !['area', 'line'].includes(entity.geometry(graph))){
-                return [];  // selection includes non-area/non-line
-            }
-            var currChilds = graph.childNodes(entity).map(function(node) { return node.id; });
-            if (!childs.length) {
-                childs = currChilds;
-                continue;
-            }
-
-            childs = (onlyCommon ? utilArrayIntersection : utilArrayUnion)(childs, currChilds);
-            if (!childs.length) {
-                return [];
-            }
-        }
-
-        return childs;
-    }
-
-    function checkFocusedParent() {
-        if (_focusedParentWayId) {
-            var parents = parentWaysIdsOfSelection(true);
-            if (parents.indexOf(_focusedParentWayId) === -1) _focusedParentWayId = null;
-        }
-    }
-
-
-    function parentWayIdForVertexNavigation() {
-        var parentIds = parentWaysIdsOfSelection(true);
-
-        if (_focusedParentWayId && parentIds.indexOf(_focusedParentWayId) !== -1) {
-            // prefer the previously seen parent
-            return _focusedParentWayId;
-        }
-
-        return parentIds.length ? parentIds[0] : null;
-    }
-
-
-    mode.selectedIDs = function(val) {
-        if (!arguments.length) return selectedIDs;
-        selectedIDs = val;
-        return mode;
-    };
-
-
-    mode.newFeature = function(val) {
-        if (!arguments.length) return _newFeature;
-        _newFeature = val;
-        return mode;
-    };
-
-
-    mode.selectBehavior = () =>  {
-      console.error('error: do not call modeSelect.selectBehavior anymore'); // eslint-disable-line no-console
-    };
-    // mode.selectBehavior = function(val) {
-    //     if (!arguments.length) return _selectBehavior;
-    //     _selectBehavior = val;
-    //     return mode;
-    // };
-
-
-    mode.follow = function(val) {
-        if (!arguments.length) return _follow;
-        _follow = val;
-        return mode;
-    };
-
-
-    function loadOperations() {
-      _operations.forEach(o => {
-        if (o.behavior) {
-          o.behavior.disable();
-        }
-      });
-
-      _operations = Object.values(Operations)
-        .map(o => o(context, selectedIDs))
-        .filter(o => (o.id !== 'delete' && o.id !== 'downgrade' && o.id !== 'copy'))
-        .concat([
-            // group copy/downgrade/delete operation together at the end of the list
-            Operations.operationCopy(context, selectedIDs),
-            Operations.operationDowngrade(context, selectedIDs),
-            Operations.operationDelete(context, selectedIDs)
-          ])
-        .filter(o => o.available());
-
-      _operations.forEach(o => {
-        if (o.behavior) {
-          o.behavior.enable();
-        }
-      });
-
-      // remove any displayed menu
-      context.ui().closeEditMenu();
-    }
-
-    mode.operations = function() {
-        return _operations;
-    };
-
-
-    mode.enter = function() {
-        if (!checkSelectedIDs()) return false;
-
-        context.features().forceVisible(selectedIDs);
-        loadOperations();
-
-        context.enableBehaviors(['hover', 'select', 'drag', 'lasso', 'map-interaction', 'paste']);
-
-        keybinding
-            .on(['[', 'pgup'], previousVertex)
-            .on([']', 'pgdown'], nextVertex)
-            .on(['{', uiCmd('⌘['), 'home'], firstVertex)
-            .on(['}', uiCmd('⌘]'), 'end'], lastVertex)
-            .on(['\\', 'pause'], focusNextParent)
-            .on(uiCmd('⌘↑'), selectParent)
-            .on(uiCmd('⌘↓'), selectChild)
-            .on('⎋', esc, true);
-
-        d3_select(document)
-            .call(keybinding);
-
-        context.ui().sidebar
-            .select(selectedIDs, _newFeature);
-
-        context.history()
-            .on('change.select', function() {
-                // reselect after change in case relation members were removed or added
-                selectElements();
-            })
-            .on('undone.select', checkSelectedIDs)
-            .on('redone.select', checkSelectedIDs);
-
-//        context.map()
-//            .on('drawn.select', selectElements);
-
-//        selectElements();
-
-        mode.extent = utilTotalExtent(selectedIDs, context.graph());
-
-        if (_follow) {
-            var loc = mode.extent.center();
-            context.map().centerEase(loc);
-            // we could enter the mode multiple times, so reset follow for next time
-            _follow = false;
-        }
-
-        return true;
-
-//        function didDoubleUp(d3_event, loc) {
-//            var target = d3_select(d3_event.target);
-//
-//            var datum = target.datum();
-//            var entity = datum && datum.properties && datum.properties.entity;
-//            if (!entity) return;
-//
-//            if (entity instanceof osmWay && target.classed('target')) {
-//                var choice = geoChooseEdge(context.graph().childNodes(entity), loc, context.projection);
-//                var prev = entity.nodes[choice.index - 1];
-//                var next = entity.nodes[choice.index];
-//
-//                context.perform(
-//                    actionAddMidpoint({ loc: choice.loc, edge: [prev, next] }, osmNode()),
-//                    t('operations.add.annotation.vertex')
-//                );
-//                context.validator().validate();
-//
-//            } else if (entity.type === 'midpoint') {
-//                context.perform(
-//                    actionAddMidpoint({ loc: entity.loc, edge: entity.edge }, osmNode()),
-//                    t('operations.add.annotation.vertex')
-//                );
-//                context.validator().validate();
-//            }
-//        }
-
-
-        function selectElements() {
-            if (!checkSelectedIDs()) return;
-
-            var surface = context.surface();
-
-            surface.selectAll('.selected-member')
-                .classed('selected-member', false);
-
-            surface.selectAll('.selected')
-                .classed('selected', false);
-
-            surface.selectAll('.related')
-                .classed('related', false);
-
-            // reload `_focusedParentWayId` based on the current selection
-            checkFocusedParent();
-            if (_focusedParentWayId) {
-                surface.selectAll(utilEntitySelector([_focusedParentWayId]))
-                    .classed('related', true);
-            }
-
-            // if (context.map().withinEditableZoom()) {
-                // Apply selection styling if not in wide selection
-
-                surface
-                    .selectAll(utilDeepMemberSelector(selectedIDs, context.graph(), true /* skipMultipolgonMembers */))
-                    .classed('selected-member', true);
-                surface
-                    .selectAll(utilEntityOrDeepMemberSelector(selectedIDs, context.graph()))
-                    .classed('selected', true);
-            // }
-
-        }
-
-
-        function esc() {
-            if (context.container().select('.combobox').size()) return;
-            context.enter('browse');
-        }
-
-
-        function firstVertex(d3_event) {
-            d3_event.preventDefault();
-            var entity = singular();
-            var parentId = parentWayIdForVertexNavigation();
-            var way;
-
-            if (entity && entity.type === 'way') {
-                way = entity;
-            } else if (parentId) {
-                way = context.entity(parentId);
-            }
-            _focusedParentWayId = way && way.id;
-
-            if (way) {
-                context.enter(
-                    mode.selectedIDs([way.first()])
-                        .follow(true)
-                );
-            }
-        }
-
-
-        function lastVertex(d3_event) {
-            d3_event.preventDefault();
-            var entity = singular();
-            var parentId = parentWayIdForVertexNavigation();
-            var way;
-
-            if (entity && entity.type === 'way') {
-                way = entity;
-            } else if (parentId) {
-                way = context.entity(parentId);
-            }
-            _focusedParentWayId = way && way.id;
-
-            if (way) {
-                context.enter(
-                    mode.selectedIDs([way.last()])
-                        .follow(true)
-                );
-            }
-        }
-
-
-        function previousVertex(d3_event) {
-            d3_event.preventDefault();
-            var parentId = parentWayIdForVertexNavigation();
-            _focusedParentWayId = parentId;
-            if (!parentId) return;
-
-            var way = context.entity(parentId);
-            var length = way.nodes.length;
-            var curr = way.nodes.indexOf(selectedIDs[0]);
-            var index = -1;
-
-            if (curr > 0) {
-                index = curr - 1;
-            } else if (way.isClosed()) {
-                index = length - 2;
-            }
-
-            if (index !== -1) {
-                context.enter(
-                    mode.selectedIDs([way.nodes[index]])
-                        .follow(true)
-                );
-            }
-        }
-
-
-        function nextVertex(d3_event) {
-            d3_event.preventDefault();
-            var parentId = parentWayIdForVertexNavigation();
-            _focusedParentWayId = parentId;
-            if (!parentId) return;
-
-            var way = context.entity(parentId);
-            var length = way.nodes.length;
-            var curr = way.nodes.indexOf(selectedIDs[0]);
-            var index = -1;
-
-            if (curr < length - 1) {
-                index = curr + 1;
-            } else if (way.isClosed()) {
-                index = 0;
-            }
-
-            if (index !== -1) {
-                context.enter(
-                    mode.selectedIDs([way.nodes[index]])
-                        .follow(true)
-                );
-            }
-        }
-
-
-        function focusNextParent(d3_event) {
-            d3_event.preventDefault();
-            var parents = parentWaysIdsOfSelection(true);
-            if (!parents || parents.length < 2) return;
-
-            var index = parents.indexOf(_focusedParentWayId);
-            if (index < 0 || index > parents.length - 2) {
-                _focusedParentWayId = parents[0];
-            } else {
-                _focusedParentWayId = parents[index + 1];
-            }
-
-            var surface = context.surface();
-            surface.selectAll('.related')
-                .classed('related', false);
-
-            if (_focusedParentWayId) {
-                surface.selectAll(utilEntitySelector([_focusedParentWayId]))
-                    .classed('related', true);
-            }
-        }
-
-        function selectParent(d3_event) {
-            d3_event.preventDefault();
-
-            var currentSelectedIds = mode.selectedIDs();
-            var parentIds = _focusedParentWayId ? [_focusedParentWayId] : parentWaysIdsOfSelection(false);
-            if (!parentIds.length) return;
-
-            context.enter(
-                mode.selectedIDs(parentIds)
-            );
-            // set this after re-entering the selection since we normally want it cleared on exit
-            _focusedVertexIds = currentSelectedIds;
-        }
-
-        function selectChild(d3_event) {
-            d3_event.preventDefault();
-
-            var currentSelectedIds = mode.selectedIDs();
-
-            var childIds = _focusedVertexIds ? _focusedVertexIds.filter(id => context.hasEntity(id)) : childNodeIdsOfSelection(true);
-            if (!childIds || !childIds.length) return;
-
-            if (currentSelectedIds.length === 1) _focusedParentWayId = currentSelectedIds[0];
-
-            context.enter(
-                mode.selectedIDs(childIds)
-            );
-        }
-    };
-
-
-    mode.exit = function() {
-
-        mode.extent = null;
-
-        // we could enter the mode multiple times but it's only new the first time
-        _newFeature = false;
-
-        _focusedVertexIds = null;
-
-        _operations.forEach(o => {
-          if (o.behavior) {
-            o.behavior.disable();
-          }
-        });
-        _operations = [];
-
-
-        // _behaviors.forEach(context.uninstall);
-
-        d3_select(document)
-            .call(keybinding.unbind);
-
-        context.ui().closeEditMenu();
-
-        context.history()
-            .on('change.select', null)
-            .on('undone.select', null)
-            .on('redone.select', null);
-
-        var surface = context.surface();
-
-        surface
-            .selectAll('.selected-member')
-            .classed('selected-member', false);
-
-        surface
-            .selectAll('.selected')
-            .classed('selected', false);
-
-        surface
-            .selectAll('.highlighted')
-            .classed('highlighted', false);
-
-        surface
-            .selectAll('.related')
-            .classed('related', false);
-
-//        context.map().on('drawn.select', null);
-        context.ui().sidebar.hide();
-        context.features().forceVisible([]);
-
-        var entity = singular();
-        if (_newFeature && entity && entity.type === 'relation' &&
-            // no tags
-            Object.keys(entity.tags).length === 0 &&
-            // no parent relations
-            context.graph().parentRelations(entity).length === 0 &&
-            // no members or one member with no role
-            (entity.members.length === 0 || (entity.members.length === 1 && !entity.members[0].role))
-        ) {
-            // the user added this relation but didn't edit it at all, so just delete it
-            var deleteAction = actionDeleteRelation(entity.id, true /* don't delete untagged members */);
-            context.perform(deleteAction, t('operations.delete.annotation.relation'));
-            context.validator().validate();
-        }
-    };
-
-
-    return mode;
-}
diff --git a/modules/operations/circularize.js b/modules/operations/circularize.js
index 8ab2e4b721..80cbd88ffd 100644
--- a/modules/operations/circularize.js
+++ b/modules/operations/circularize.js
@@ -1,9 +1,7 @@
 import { utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionCircularize } from '../actions/circularize';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util';
 
 
@@ -36,7 +34,7 @@ export function operationCircularize(context, selectedIDs) {
     combinedAction.transitionable = true;
 
     context.perform(combinedAction, operation.annotation());
-    window.setTimeout(() => context.validator().validate(), 300);  // after any transition
+    window.setTimeout(() => context.validationSystem().validate(), 300);  // after any transition
   };
 
 
@@ -67,14 +65,15 @@ export function operationCircularize(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -90,20 +89,20 @@ export function operationCircularize(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.circularize.${disabledReason}.${multi}`) :
-      t(`operations.circularize.description.${multi}`);
+      context.t(`operations.circularize.${disabledReason}.${multi}`) :
+      context.t(`operations.circularize.description.${multi}`);
   };
 
 
   operation.annotation = function() {
-    return t('operations.circularize.annotation.feature', { n: actions.length });
+    return context.t('operations.circularize.annotation.feature', { n: actions.length });
   };
 
 
   operation.id = 'circularize';
-  operation.keys = [ t('operations.circularize.key') ];
-  operation.title = t('operations.circularize.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.circularize.key') ];
+  operation.title = context.t('operations.circularize.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/continue.js b/modules/operations/continue.js
index 64011e6aff..4c571396eb 100644
--- a/modules/operations/continue.js
+++ b/modules/operations/continue.js
@@ -1,7 +1,6 @@
 import { utilArrayGroupBy } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 
 
 export function operationContinue(context, selectedIDs) {
@@ -40,7 +39,7 @@ export function operationContinue(context, selectedIDs) {
 
   operation.available = function() {
     return geometries.vertex.length === 1 && geometries.line.length <= 1 &&
-      !context.features().hasHiddenConnections(continueFromNode, context.graph());
+      !context.filterSystem().hasHiddenConnections(continueFromNode, context.graph());
   };
 
 
@@ -58,20 +57,20 @@ export function operationContinue(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.continue.${disabledReason}`) :
-      t('operations.continue.description');
+      context.t(`operations.continue.${disabledReason}`) :
+      context.t('operations.continue.description');
   };
 
 
   operation.annotation = function() {
-    return t('operations.continue.annotation.line');
+    return context.t('operations.continue.annotation.line');
   };
 
 
   operation.id = 'continue';
-  operation.keys = [ t('operations.continue.key') ];
-  operation.title = t('operations.continue.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.continue.key') ];
+  operation.title = context.t('operations.continue.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/copy.js b/modules/operations/copy.js
index a11e84d31f..2def6ebef8 100644
--- a/modules/operations/copy.js
+++ b/modules/operations/copy.js
@@ -1,8 +1,6 @@
 import { utilArrayGroupBy } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { uiCmd } from '../ui/cmd';
 import { utilTotalExtent } from '../util';
 
@@ -50,12 +48,13 @@ export function operationCopy(context, selectedIDs) {
       }
     }
 
-    context.copyIDs(canCopy);
+    context.copyIDs = canCopy;
+
     if (_point && (canCopy.length !== 1 || graph.entity(canCopy[0]).type !== 'node')) {
       // store the anchor coordinates if copying more than a single node
-      context.copyLoc(context.projection.invert(_point));
+      context.copyLoc = context.projection.invert(_point);
     } else {
-      context.copyLoc(null);
+      context.copyLoc = null;
     }
   };
 
@@ -98,8 +97,9 @@ export function operationCopy(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
   };
 
@@ -114,13 +114,13 @@ export function operationCopy(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.copy.${disabledReason}`, { n: selectedIDs.length }) :
-      t('operations.copy.description', { n: selectedIDs.length });
+      context.t(`operations.copy.${disabledReason}`, { n: selectedIDs.length }) :
+      context.t('operations.copy.description', { n: selectedIDs.length });
   };
 
 
   operation.annotation = function() {
-    return t('operations.copy.annotation', { n: selectedIDs.length });
+    return context.t('operations.copy.annotation', { n: selectedIDs.length });
   };
 
 
@@ -132,8 +132,8 @@ export function operationCopy(context, selectedIDs) {
 
   operation.id = 'copy';
   operation.keys = [ uiCmd('⌘C') ];
-  operation.title = t('operations.copy.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.title = context.t('operations.copy.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/cycle_highway_tag.js b/modules/operations/cycle_highway_tag.js
index fb5e091c4e..5924415565 100644
--- a/modules/operations/cycle_highway_tag.js
+++ b/modules/operations/cycle_highway_tag.js
@@ -1,11 +1,8 @@
 import { utilArrayIdentical } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionChangePreset } from '../actions';
 import { actionNoop } from '../actions/noop';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { modeSelect } from '../modes/select';
-import { presetManager } from '../presets';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 
 let _wasSelectedIDs = [];
 let _wasPresetIDs = [];
@@ -30,6 +27,7 @@ export function operationCycleHighwayTag(context, selectedIDs) {
   // same selection as before?
   const isSameSelection = utilArrayIdentical(selectedIDs, _wasSelectedIDs);
   const presetIDs = new Set(isSameSelection ? _wasPresetIDs : defaultPresetIDs);
+  const presetSystem = context.presetSystem();
 
   // Gather current entities allowed to be cycled
   const entities = selectedIDs
@@ -37,7 +35,7 @@ export function operationCycleHighwayTag(context, selectedIDs) {
     .filter(entity => {
       if (entity?.type !== 'way') return false;
 
-      const preset = presetManager.match(entity, context.graph());
+      const preset = presetSystem.match(entity, context.graph());
       if (allowPresetRegex.some(regex => regex.test(preset.id))) {
         if (!presetIDs.has(preset.id)) presetIDs.add(preset.id);  // make sure we can cycle back to the original preset
         return true;
@@ -56,26 +54,26 @@ export function operationCycleHighwayTag(context, selectedIDs) {
     // If this is the same selection as before, and the previous edit was also a cycle-tags,
     // skip this `perform`, then all tag updates will be coalesced into the previous edit.
     const annotation = operation.annotation();
-    if (!isSameSelection || context.history().undoAnnotation() !== annotation) {
+    if (!isSameSelection || context.editSystem().undoAnnotation() !== annotation) {
       // Start with a no-op edit that will be replaced by all the tag updates we end up doing.
       context.perform(actionNoop(), annotation);
     }
 
     // Pick the next preset..
     const currPresetIDs = Array.from(presetIDs);
-    const currPreset = presetManager.match(entities[0], context.graph());
+    const currPreset = presetSystem.match(entities[0], context.graph());
     const index = currPreset ? currPresetIDs.indexOf(currPreset.id) : -1;
     const newPresetID = currPresetIDs[(index + 1) % currPresetIDs.length];
-    const newPreset = presetManager.item(newPresetID);
+    const newPreset = presetSystem.item(newPresetID);
 
     // Update all selected highways...
     for (const entity of entities) {
-      const oldPreset = presetManager.match(entity, context.graph());
+      const oldPreset = presetSystem.match(entity, context.graph());
       const action = actionChangePreset(entity.id, oldPreset, newPreset, true /* skip field defaults */);
       context.replace(action, annotation);
     }
 
-    context.enter(modeSelect(context, selectedIDs));  // reselect
+    context.enter('select-osm', { selectedIDs: selectedIDs });  // reselect
   };
 
 
@@ -92,20 +90,20 @@ export function operationCycleHighwayTag(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.cycle_highway_tag.${disabledReason}`) :
-      t('operations.cycle_highway_tag.description');
+      context.t(`operations.cycle_highway_tag.${disabledReason}`) :
+      context.t('operations.cycle_highway_tag.description');
   };
 
 
   operation.annotation = function() {
-    return t('operations.cycle_highway_tag.annotation');
+    return context.t('operations.cycle_highway_tag.annotation');
   };
 
 
   operation.id = 'cycle_highway_tag';
-  operation.keys = [ '⇧' + t('operations.cycle_highway_tag.key') ];
-  operation.title = t('operations.cycle_highway_tag.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ '⇧' + context.t('operations.cycle_highway_tag.key') ];
+  operation.title = context.t('operations.cycle_highway_tag.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/delete.js b/modules/operations/delete.js
index 66b7287564..f3ee1be21f 100644
--- a/modules/operations/delete.js
+++ b/modules/operations/delete.js
@@ -1,11 +1,8 @@
 import { geoSphericalDistance } from '@rapid-sdk/math';
 import { utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionDeleteMultiple } from '../actions/delete_multiple';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { modeSelect } from '../modes/select';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { uiCmd } from '../ui/cmd';
 import { utilTotalExtent } from '../util';
 
@@ -21,8 +18,8 @@ export function operationDelete(context, selectedIDs) {
 
 
   let operation = function() {
-    let nextSelectedID;
-    let nextSelectedLoc;
+    let nextNode;
+    let nextLoc;
 
     // If we are deleting a vertex, try to select the next nearest vertex along the way.
     if (entities.length === 1) {
@@ -46,21 +43,19 @@ export function operationDelete(context, selectedIDs) {
           i = a < b ? i - 1 : i + 1;
         }
 
-        nextSelectedID = nodes[i];
-        nextSelectedLoc = context.entity(nextSelectedID).loc;
+        nextNode = context.entity(nodes[i]);
+        nextLoc = nextNode.loc;
       }
     }
 
     context.perform(action, operation.annotation());
-    context.validator().validate();
-
-    if (nextSelectedID && nextSelectedLoc) {
-      if (context.hasEntity(nextSelectedID)) {
-        context.enter(modeSelect(context, [nextSelectedID]).follow(true));
-      } else {
-        context.map().centerEase(nextSelectedLoc);
-        context.enter('browse');
-      }
+    context.validationSystem().validate();
+
+    if (nextNode && nextLoc) {
+      context.mapSystem().centerEase(nextLoc);
+      // Try to select the next node.
+      // It may be deleted and that's ok, we'll fallback to browse mode automatically
+      context.enter('select-osm', { selectedIDs: [nextNode.id] });
     } else {
       context.enter('browse');
     }
@@ -91,14 +86,15 @@ export function operationDelete(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -140,22 +136,22 @@ export function operationDelete(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.delete.${disabledReason}.${multi}`) :
-      t(`operations.delete.description.${multi}`);
+      context.t(`operations.delete.${disabledReason}.${multi}`) :
+      context.t(`operations.delete.description.${multi}`);
   };
 
 
   operation.annotation = function() {
     return selectedIDs.length === 1 ?
-      t('operations.delete.annotation.' + context.graph().geometry(selectedIDs[0])) :
-      t('operations.delete.annotation.feature', { n: selectedIDs.length });
+      context.t('operations.delete.annotation.' + context.graph().geometry(selectedIDs[0])) :
+      context.t('operations.delete.annotation.feature', { n: selectedIDs.length });
   };
 
 
   operation.id = 'delete';
   operation.keys = [ uiCmd('⌘⌫'), uiCmd('⌘⌦'), uiCmd('⌦') ];
-  operation.title = t('operations.delete.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.title = context.t('operations.delete.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/disconnect.js b/modules/operations/disconnect.js
index 6050cccc0b..109a729179 100644
--- a/modules/operations/disconnect.js
+++ b/modules/operations/disconnect.js
@@ -1,9 +1,7 @@
 import { utilArrayUniq, utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionDisconnect } from '../actions/disconnect';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util/util';
 
 
@@ -136,7 +134,7 @@ export function operationDisconnect(context, selectedIDs) {
       return graph;
     };
     context.perform(combinedAction, operation.annotation());
-    context.validator().validate();
+    context.validationSystem().validate();
   };
 
 
@@ -182,14 +180,15 @@ export function operationDisconnect(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = _coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -205,20 +204,20 @@ export function operationDisconnect(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.disconnect.${disabledReason}`) :
-      t(`operations.disconnect.description.${_descriptionID}`);
+      context.t(`operations.disconnect.${disabledReason}`) :
+      context.t(`operations.disconnect.description.${_descriptionID}`);
   };
 
 
   operation.annotation = function() {
-    return t(`operations.disconnect.annotation.${_annotationID}`);
+    return context.t(`operations.disconnect.annotation.${_annotationID}`);
   };
 
 
   operation.id = 'disconnect';
-  operation.keys = [ t('operations.disconnect.key') ];
-  operation.title = t('operations.disconnect.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.disconnect.key') ];
+  operation.title = context.t('operations.disconnect.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/downgrade.js b/modules/operations/downgrade.js
index e8d0129036..f20258fac7 100644
--- a/modules/operations/downgrade.js
+++ b/modules/operations/downgrade.js
@@ -1,9 +1,6 @@
 import { actionChangeTags } from '../actions/change_tags';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { modeSelect } from '../modes/select';
-import { t } from '../core/localizer';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { uiCmd } from '../ui/cmd';
-import { presetManager } from '../presets';
 
 
 export function operationDowngrade(context, selectedIDs) {
@@ -39,7 +36,8 @@ export function operationDowngrade(context, selectedIDs) {
   function downgradeTypeForEntityID(entityID) {
     const graph = context.graph();
     const entity = graph.entity(entityID);
-    const preset = presetManager.match(entity, graph);
+    const presetSystem = context.presetSystem();
+    const preset = presetSystem.match(entity, graph);
 
     if (!preset || preset.isFallback()) return null;
 
@@ -85,10 +83,10 @@ export function operationDowngrade(context, selectedIDs) {
       return graph;
     }, operation.annotation());
 
-    context.validator().validate();
+    context.validationSystem().validate();
 
     // refresh the select mode to enable the delete operation
-    context.enter(modeSelect(context, selectedIDs));
+    context.enter('select-osm', { selectedIDs: selectedIDs });
   };
 
 
@@ -113,8 +111,8 @@ export function operationDowngrade(context, selectedIDs) {
   operation.tooltip = function () {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.downgrade.${disabledReason}.${multi}`) :
-      t(`operations.downgrade.description.${_downgradeType}`);
+      context.t(`operations.downgrade.${disabledReason}.${multi}`) :
+      context.t(`operations.downgrade.description.${_downgradeType}`);
   };
 
 
@@ -125,14 +123,14 @@ export function operationDowngrade(context, selectedIDs) {
     } else {
       suffix = _downgradeType;
     }
-    return t(`operations.downgrade.annotation.${suffix}`, { n: _affectedFeatureCount});
+    return context.t(`operations.downgrade.annotation.${suffix}`, { n: _affectedFeatureCount});
   };
 
 
   operation.id = 'downgrade';
   operation.keys = [ uiCmd('⌫') ];
-  operation.title = t('operations.downgrade.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.title = context.t('operations.downgrade.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/extract.js b/modules/operations/extract.js
index 4fd0f768af..ef743708f6 100644
--- a/modules/operations/extract.js
+++ b/modules/operations/extract.js
@@ -3,14 +3,12 @@ import { utilArrayUniq } from '@rapid-sdk/util';
 
 import { actionExtract } from '../actions/extract';
 import { actionMove } from '../actions/move';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { t } from '../core/localizer';
-import { prefs } from '../core/preferences';
-import { presetManager } from '../presets';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util';
 
 
 export function operationExtract(context, selectedIDs) {
+  const presetSystem = context.presetSystem();
   const multi = selectedIDs.length === 1 ? 'single' : 'multiple';
   const entities = selectedIDs.map(entityID => context.hasEntity(entityID)).filter(Boolean);
   const isNew = entities.every(entity => entity.isNew());
@@ -25,9 +23,9 @@ export function operationExtract(context, selectedIDs) {
     if (entity.type === 'node' && graph.parentWays(entity).length === 0) return null;
 
     if (entity.type !== 'node') {
-      const preset = presetManager.match(entity, graph);
+      const preset = presetSystem.match(entity, graph);
       // only allow extraction from ways/relations if the preset supports points
-      if (preset.geometry.indexOf('point') === -1) return null;
+      if (!preset.geometry.includes('point')) return null;
     }
 
     return actionExtract(entity.id, context.projection);
@@ -45,13 +43,13 @@ export function operationExtract(context, selectedIDs) {
     };
 
     context.perform(combinedAction, operation.annotation());
-    context.validator().validate();
+    context.validationSystem().validate();
 
     // Move the extracted nodes to the mouse cursor location
     const projection = context.projection;
     const extractedNodeIDs = actions.map(action => action.getExtractedNodeID());
     const extractPoint = projection.project(extent.center());
-    const delta = vecSubtract(context.map().mouse(), extractPoint);
+    const delta = vecSubtract(context.mapSystem().mouse(), extractPoint);
     context.perform(actionMove(extractedNodeIDs, delta, projection));  // no annotation, we'll move more after this
 
     // Put the user in move mode so they can place the extracted nodes where they want.
@@ -81,8 +79,9 @@ export function operationExtract(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
   };
 
@@ -90,20 +89,20 @@ export function operationExtract(context, selectedIDs) {
   operation.tooltip = function () {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.extract.${disabledReason}.${multi}`) :
-      t(`operations.extract.description.${geometryType}.${multi}`);
+      context.t(`operations.extract.${disabledReason}.${multi}`) :
+      context.t(`operations.extract.description.${geometryType}.${multi}`);
   };
 
 
   operation.annotation = function () {
-    return t('operations.extract.annotation', { n: selectedIDs.length });
+    return context.t('operations.extract.annotation', { n: selectedIDs.length });
   };
 
 
   operation.id = 'extract';
-  operation.keys = [ t('operations.extract.key') ];
-  operation.title = t('operations.extract.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.extract.key') ];
+  operation.title = context.t('operations.extract.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/merge.js b/modules/operations/merge.js
index 02a6e64a95..bfadffe219 100644
--- a/modules/operations/merge.js
+++ b/modules/operations/merge.js
@@ -1,21 +1,21 @@
-import { t } from '../core/localizer';
-
 import { actionJoin } from '../actions/join';
 import { actionMerge } from '../actions/merge';
 import { actionMergeNodes } from '../actions/merge_nodes';
 import { actionMergePolygon } from '../actions/merge_polygon';
 
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { modeSelect } from '../modes/select';
-import { presetManager } from '../presets';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 
 
 export function operationMerge(context, selectedIDs) {
   let action = chooseAction();
 
   function chooseAction() {
+    const prefs = context.storageSystem();
+    const tagnosticRoadCombine = prefs.getItem('rapid-internal-feature.tagnosticRoadCombine') === 'true';
+    const options = { tagnosticRoadCombine: tagnosticRoadCombine };
+
     // prefer a non-disabled action first
-    const join = actionJoin(selectedIDs);
+    const join = actionJoin(selectedIDs, options);
     if (!join.disabled(context.graph())) return join;
 
     const merge = actionMerge(selectedIDs);
@@ -40,7 +40,7 @@ export function operationMerge(context, selectedIDs) {
     if (operation.disabled()) return;
 
     context.perform(action, operation.annotation());
-    context.validator().validate();
+    context.validationSystem().validate();
 
     let successorIDs = selectedIDs.filter(entityID => context.hasEntity(entityID));
     if (successorIDs.length > 1) {
@@ -49,7 +49,7 @@ export function operationMerge(context, selectedIDs) {
         successorIDs = interestingIDs;
       }
     }
-    context.enter(modeSelect(context, successorIDs));
+    context.enter('select-osm', { selectedIDs: successorIDs });
   };
 
 
@@ -62,8 +62,8 @@ export function operationMerge(context, selectedIDs) {
     const actionDisabled = action.disabled(context.graph());
     if (actionDisabled) return actionDisabled;
 
-    const osm = context.connection();
-    if (osm && action.resultingWayNodesLength && action.resultingWayNodesLength(context.graph()) > osm.maxWayNodes()) {
+    const osm = context.services.get('osm');
+    if (osm && action.resultingWayNodesLength && action.resultingWayNodesLength(context.graph()) > osm.maxWayNodes) {
       return 'too_many_vertices';
     }
 
@@ -73,31 +73,32 @@ export function operationMerge(context, selectedIDs) {
 
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
+    const presetSystem = context.presetSystem();
 
     if (disabledReason) {
       if (disabledReason === 'conflicting_relations') {
-        return t('operations.merge.conflicting_relations');
+        return context.t('operations.merge.conflicting_relations');
       } else if (disabledReason === 'restriction' || disabledReason === 'connectivity') {
-        const preset = presetManager.item('type/' + disabledReason);
-        return t('operations.merge.damage_relation', { relation: preset.name() });
+        const preset = presetSystem.item('type/' + disabledReason);
+        return context.t('operations.merge.damage_relation', { relation: preset.name() });
       } else {
-        return t(`operations.merge.${disabledReason}`);
+        return context.t(`operations.merge.${disabledReason}`);
       }
     } else {
-      return t('operations.merge.description');
+      return context.t('operations.merge.description');
     }
   };
 
 
   operation.annotation = function() {
-    return t('operations.merge.annotation', { n: selectedIDs.length });
+    return context.t('operations.merge.annotation', { n: selectedIDs.length });
   };
 
 
   operation.id = 'merge';
-  operation.keys = [ t('operations.merge.key') ];
-  operation.title = t('operations.merge.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.merge.key') ];
+  operation.title = context.t('operations.merge.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/move.js b/modules/operations/move.js
index 44cc16508c..d2dc55d9a5 100644
--- a/modules/operations/move.js
+++ b/modules/operations/move.js
@@ -1,8 +1,6 @@
 import { utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util/util';
 
 
@@ -44,14 +42,15 @@ export function operationMove(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -71,22 +70,22 @@ export function operationMove(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.move.${disabledReason}.${multi}`) :
-      t(`operations.move.description.${multi}`);
+      context.t(`operations.move.${disabledReason}.${multi}`) :
+      context.t(`operations.move.description.${multi}`);
   };
 
 
   operation.annotation = function() {
     return selectedIDs.length === 1 ?
-      t('operations.move.annotation.' + context.graph().geometry(selectedIDs[0])) :
-      t('operations.move.annotation.feature', { n: selectedIDs.length });
+      context.t('operations.move.annotation.' + context.graph().geometry(selectedIDs[0])) :
+      context.t('operations.move.annotation.feature', { n: selectedIDs.length });
   };
 
 
   operation.id = 'move';
-  operation.keys = [ t('operations.move.key') ];
-  operation.title = t('operations.move.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.move.key') ];
+  operation.title = context.t('operations.move.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   operation.mouseOnly = true;
 
diff --git a/modules/operations/orthogonalize.js b/modules/operations/orthogonalize.js
index dc935a8d01..d76dfc7ef0 100644
--- a/modules/operations/orthogonalize.js
+++ b/modules/operations/orthogonalize.js
@@ -1,9 +1,7 @@
 import { utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionOrthogonalize } from '../actions/orthogonalize';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util';
 
 
@@ -59,7 +57,7 @@ export function operationOrthogonalize(context, selectedIDs) {
     combinedAction.transitionable = true;
 
     context.perform(combinedAction, operation.annotation());
-    window.setTimeout(() => context.validator().validate(), 300);  // after any transition
+    window.setTimeout(() => context.validationSystem().validate(), 300);  // after any transition
   };
 
 
@@ -89,14 +87,15 @@ export function operationOrthogonalize(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -112,20 +111,20 @@ export function operationOrthogonalize(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.orthogonalize.${disabledReason}.${multi}`) :
-      t(`operations.orthogonalize.description.${_type}.${multi}`);
+      context.t(`operations.orthogonalize.${disabledReason}.${multi}`) :
+      context.t(`operations.orthogonalize.description.${_type}.${multi}`);
   };
 
 
   operation.annotation = function() {
-    return t('operations.orthogonalize.annotation.' + _type, { n: actions.length });
+    return context.t('operations.orthogonalize.annotation.' + _type, { n: actions.length });
   };
 
 
   operation.id = 'orthogonalize';
-  operation.keys = [ t('operations.orthogonalize.key') ];
-  operation.title = t('operations.orthogonalize.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.orthogonalize.key') ];
+  operation.title = context.t('operations.orthogonalize.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/paste.js b/modules/operations/paste.js
index cec03591f6..b1110b96d7 100644
--- a/modules/operations/paste.js
+++ b/modules/operations/paste.js
@@ -2,25 +2,22 @@ import { Extent, vecSubtract } from '@rapid-sdk/math';
 
 import { actionCopyEntities } from '../actions/copy_entities';
 import { actionMove } from '../actions/move';
-import { modeSelect } from '../modes/select';
 
-import { t } from '../core/localizer';
 import { uiCmd } from '../ui/cmd';
-import { utilDisplayLabel } from '../util/util';
 
 
-// see also `BehaviorPaste`
+// see also `PasteBehavior`
 export function operationPaste(context) {
   let _pastePoint;
 
   let operation = function() {
     if (!_pastePoint) return;
 
-    const oldIDs = context.copyIDs();
+    const oldIDs = context.copyIDs;
     if (!oldIDs.length) return;
 
     const projection = context.projection;
-    const oldGraph = context.copyGraph();
+    const oldGraph = context.copyGraph;
     let extent = new Extent();
     let newIDs = [];
 
@@ -48,13 +45,13 @@ export function operationPaste(context) {
 
     // Use the location of the copy operation to offset the paste location,
     // or else use the center of the pasted extent
-    const copyLoc = context.copyLoc();
+    const copyLoc = context.copyLoc;
     const copyPoint = (copyLoc && projection.project(copyLoc)) || projection.project(extent.center());
     const delta = vecSubtract(_pastePoint, copyPoint);
 
     // Move the pasted objects to be anchored at the paste location
     context.replace(actionMove(newIDs, delta, projection), operation.annotation());
-    context.enter(modeSelect(context, newIDs));
+    context.enter('select-osm', { selectedIDs: newIDs });
   };
 
 
@@ -70,29 +67,33 @@ export function operationPaste(context) {
 
 
   operation.disabled = function() {
-    return !context.copyIDs().length;
+    return !context.copyIDs.length;
   };
 
 
   operation.tooltip = function() {
-    const oldGraph = context.copyGraph();
-    const ids = context.copyIDs();
+    const l10n = context.localizationSystem();
+    const oldGraph = context.copyGraph;
+    const ids = context.copyIDs;
     if (!ids.length) {
-      return t('operations.paste.nothing_copied');
+      return l10n.t('operations.paste.nothing_copied');
     }
-    return t('operations.paste.description', { feature: utilDisplayLabel(oldGraph.entity(ids[0]), oldGraph), n: ids.length });
+    return l10n.t('operations.paste.description', {
+      feature: l10n.displayLabel(oldGraph.entity(ids[0]), oldGraph),
+      n: ids.length
+    });
   };
 
 
   operation.annotation = function() {
-    const ids = context.copyIDs();
-    return t('operations.paste.annotation', { n: ids.length });
+    const ids = context.copyIDs;
+    return context.t('operations.paste.annotation', { n: ids.length });
   };
 
 
   operation.id = 'paste';
   operation.keys = [ uiCmd('⌘V') ];
-  operation.title = t('operations.paste.title');
+  operation.title = context.t('operations.paste.title');
 
   return operation;
 }
diff --git a/modules/operations/reflect.js b/modules/operations/reflect.js
index df790dbcf8..c9c8af730c 100644
--- a/modules/operations/reflect.js
+++ b/modules/operations/reflect.js
@@ -1,9 +1,7 @@
 import { utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionReflect } from '../actions/reflect';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util/util';
 
 
@@ -31,7 +29,7 @@ export function operationReflect(context, selectedIDs, axis = 'long') {
       .useLongAxis(Boolean(axis === 'long'));
 
     context.perform(action, operation.annotation());
-    window.setTimeout(() => context.validator().validate(), 300);  // after any transition
+    window.setTimeout(() => context.validationSystem().validate(), 300);  // after any transition
   };
 
 
@@ -55,14 +53,15 @@ export function operationReflect(context, selectedIDs, axis = 'long') {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -82,19 +81,19 @@ export function operationReflect(context, selectedIDs, axis = 'long') {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.reflect.${disabledReason}.${multi}`) :
-      t(`operations.reflect.description.${axis}.${multi}`);
+      context.t(`operations.reflect.${disabledReason}.${multi}`) :
+      context.t(`operations.reflect.description.${axis}.${multi}`);
   };
 
 
   operation.annotation = function() {
-    return t(`operations.reflect.annotation.${axis}.feature`, { n: selectedIDs.length });
+    return context.t(`operations.reflect.annotation.${axis}.feature`, { n: selectedIDs.length });
   };
 
   operation.id = `reflect-${axis}`;
-  operation.keys = [ t(`operations.reflect.key.${axis}`) ];
-  operation.title = t(`operations.reflect.title.${axis}`);
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t(`operations.reflect.key.${axis}`) ];
+  operation.title = context.t(`operations.reflect.title.${axis}`);
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/reverse.js b/modules/operations/reverse.js
index 535c529562..0d04c5a934 100644
--- a/modules/operations/reverse.js
+++ b/modules/operations/reverse.js
@@ -1,6 +1,5 @@
-import { t } from '../core/localizer';
 import { actionReverse } from '../actions/reverse';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 
 
 export function operationReverse(context, selectedIDs) {
@@ -46,7 +45,7 @@ export function operationReverse(context, selectedIDs) {
     };
 
     context.perform(combinedAction, operation.annotation());
-    context.validator().validate();
+    context.validationSystem().validate();
   };
 
 
@@ -61,19 +60,19 @@ export function operationReverse(context, selectedIDs) {
 
 
   operation.tooltip = function() {
-    return t(`operations.reverse.description.${reverseType}`);
+    return context.t(`operations.reverse.description.${reverseType}`);
   };
 
 
   operation.annotation = function() {
-    return t(`operations.reverse.annotation.${reverseType}`, { n: actions.length });
+    return context.t(`operations.reverse.annotation.${reverseType}`, { n: actions.length });
   };
 
 
   operation.id = 'reverse';
-  operation.keys = [ t('operations.reverse.key') ];
-  operation.title = t('operations.reverse.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.reverse.key') ];
+  operation.title = context.t('operations.reverse.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/rotate.js b/modules/operations/rotate.js
index c4cc5ac30c..7e6bac8bfb 100644
--- a/modules/operations/rotate.js
+++ b/modules/operations/rotate.js
@@ -1,8 +1,6 @@
 import { utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util/util';
 
 
@@ -44,14 +42,15 @@ export function operationRotate(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -72,22 +71,22 @@ export function operationRotate(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.rotate.${disabledReason}.${multi}`) :
-      t(`operations.rotate.description.${multi}`);
+      context.t(`operations.rotate.${disabledReason}.${multi}`) :
+      context.t(`operations.rotate.description.${multi}`);
   };
 
 
   operation.annotation = function() {
     return selectedIDs.length === 1 ?
-      t('operations.rotate.annotation.' + context.graph().geometry(selectedIDs[0])) :
-      t('operations.rotate.annotation.feature', { n: selectedIDs.length });
+      context.t('operations.rotate.annotation.' + context.graph().geometry(selectedIDs[0])) :
+      context.t('operations.rotate.annotation.feature', { n: selectedIDs.length });
   };
 
 
   operation.id = 'rotate';
-  operation.keys = [ t('operations.rotate.key') ];
-  operation.title = t('operations.rotate.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.rotate.key') ];
+  operation.title = context.t('operations.rotate.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   operation.mouseOnly = true;
 
diff --git a/modules/operations/split.js b/modules/operations/split.js
index 1dbd322a21..8c93cd4b27 100644
--- a/modules/operations/split.js
+++ b/modules/operations/split.js
@@ -1,7 +1,5 @@
-import { t } from '../core/localizer';
 import { actionSplit } from '../actions/split';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { modeSelect } from '../modes/select';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 
 
 export function operationSplit(context, selectedIDs) {
@@ -47,7 +45,7 @@ export function operationSplit(context, selectedIDs) {
 
   let operation = function() {
     const difference = context.perform(action, operation.annotation());
-    context.validator().validate();
+    context.validationSystem().validate();
 
     let idsToSelect = vertexIDs.slice();  // copy
 
@@ -58,7 +56,7 @@ export function operationSplit(context, selectedIDs) {
         idsToSelect.push(entityID);
       }
     }
-    context.enter(modeSelect(context, idsToSelect));
+    context.enter('select-osm', { selectedIDs: idsToSelect });
   };
 
 
@@ -86,20 +84,20 @@ export function operationSplit(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.split.${disabledReason}`) :
-      t(`operations.split.description.${_geometry}.${_waysMulti}.${vertexMulti}_node`);
+      context.t(`operations.split.${disabledReason}`) :
+      context.t(`operations.split.description.${_geometry}.${_waysMulti}.${vertexMulti}_node`);
   };
 
 
   operation.annotation = function() {
-    return t(`operations.split.annotation.${_geometry}`, { n: _splittable.length });
+    return context.t(`operations.split.annotation.${_geometry}`, { n: _splittable.length });
   };
 
 
   operation.id = 'split';
-  operation.keys = [ t('operations.split.key') ];
-  operation.title = t('operations.split.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.split.key') ];
+  operation.title = context.t('operations.split.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/operations/straighten.js b/modules/operations/straighten.js
index 30f8f042e5..a23e9085ad 100644
--- a/modules/operations/straighten.js
+++ b/modules/operations/straighten.js
@@ -1,10 +1,8 @@
 import { utilArrayDifference, utilGetAllNodes } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionStraightenNodes } from '../actions/straighten_nodes';
 import { actionStraightenWay } from '../actions/straighten_way';
-import { BehaviorKeyOperation } from '../behaviors/BehaviorKeyOperation';
-import { prefs } from '../core/preferences';
+import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 import { utilTotalExtent } from '../util/index';
 
 
@@ -79,7 +77,7 @@ export function operationStraighten(context, selectedIDs) {
     if (!action) return;
 
     context.perform(action, operation.annotation());
-    window.setTimeout(() => context.validator().validate(), 300);  // after any transition
+    window.setTimeout(() => context.validationSystem().validate(), 300);  // after any transition
   };
 
 
@@ -105,14 +103,15 @@ export function operationStraighten(context, selectedIDs) {
 
     // If the selection is not 80% contained in view
     function tooLarge() {
-      const allowLargeEdits = prefs('rapid-internal-feature.allowLargeEdits') === 'true';
-      return !allowLargeEdits && extent.percentContainedIn(context.map().extent()) < 0.8;
+      const prefs = context.storageSystem();
+      const allowLargeEdits = prefs.getItem('rapid-internal-feature.allowLargeEdits') === 'true';
+      return !allowLargeEdits && extent.percentContainedIn(context.mapSystem().extent()) < 0.8;
     }
 
     // If fhe selection spans tiles that haven't been downloaded yet
     function notDownloaded() {
-      if (context.inIntro()) return false;
-      const osm = context.connection();
+      if (context.inIntro) return false;
+      const osm = context.services.get('osm');
       if (osm) {
         const missing = coords.filter(loc => !osm.isDataLoaded(loc));
         if (missing.length) {
@@ -128,20 +127,20 @@ export function operationStraighten(context, selectedIDs) {
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
     return disabledReason ?
-      t(`operations.straighten.${disabledReason}.${multi}`) :
-      t(`operations.straighten.description.${geometry}` + (ways.length === 1 ? '' : 's'));
+      context.t(`operations.straighten.${disabledReason}.${multi}`) :
+      context.t(`operations.straighten.description.${geometry}` + (ways.length === 1 ? '' : 's'));
   };
 
 
   operation.annotation = function() {
-    return t(`operations.straighten.annotation.${geometry}`, { n: ways.length ? ways.length : nodes.length });
+    return context.t(`operations.straighten.annotation.${geometry}`, { n: ways.length ? ways.length : nodes.length });
   };
 
 
   operation.id = 'straighten';
-  operation.keys = [ t('operations.straighten.key') ];
-  operation.title = t('operations.straighten.title');
-  operation.behavior = new BehaviorKeyOperation(context, operation);
+  operation.keys = [ context.t('operations.straighten.key') ];
+  operation.title = context.t('operations.straighten.title');
+  operation.behavior = new KeyOperationBehavior(context, operation);
 
   return operation;
 }
diff --git a/modules/osm/changeset.js b/modules/osm/changeset.js
index 22f091f626..705e93bfc3 100644
--- a/modules/osm/changeset.js
+++ b/modules/osm/changeset.js
@@ -1,6 +1,7 @@
-import { osmEntity } from './entity';
 import { Extent } from '@rapid-sdk/math';
 
+import { osmEntity } from './entity';
+
 
 export function osmChangeset() {
     if (!(this instanceof osmChangeset)) {
diff --git a/modules/osm/entity.js b/modules/osm/entity.js
index 7202ccb388..e8c0ccb544 100644
--- a/modules/osm/entity.js
+++ b/modules/osm/entity.js
@@ -1,4 +1,5 @@
 import { utilArrayUnion, utilUnicodeCharsTruncated } from '@rapid-sdk/util';
+
 import { osmIsInterestingTag } from './tags';
 
 
diff --git a/modules/osm/intersection.js b/modules/osm/intersection.js
index 1330474b2d..9f7e4a3f9f 100644
--- a/modules/osm/intersection.js
+++ b/modules/osm/intersection.js
@@ -4,7 +4,7 @@ import { utilArrayDifference, utilArrayUniq } from '@rapid-sdk/util';
 import { actionDeleteRelation } from '../actions/delete_relation';
 import { actionReverse } from '../actions/reverse';
 import { actionSplit } from '../actions/split';
-import { Graph } from '../core/Graph';
+import { Graph } from '../core/lib';
 import { osmEntity } from './entity';
 
 
diff --git a/modules/osm/qa_item.js b/modules/osm/qa_item.js
index 8885f281f8..1b9674f017 100644
--- a/modules/osm/qa_item.js
+++ b/modules/osm/qa_item.js
@@ -3,7 +3,7 @@ export class QAItem {
   constructor(loc, service, itemType, id, props) {
     // Store required properties
     this.loc = loc;
-    this.service = service.title;
+    this.service = service.id;
     this.itemType = itemType;
 
     // All issues must have an ID for selection, use generic if none specified
diff --git a/modules/pixi/PixiEvents.js b/modules/pixi/PixiEvents.js
index 4c9b196ac7..bbb2768392 100644
--- a/modules/pixi/PixiEvents.js
+++ b/modules/pixi/PixiEvents.js
@@ -1,7 +1,6 @@
 import { EventEmitter } from '@pixi/utils';
 
 import { utilDetect } from '../util/detect';
-import { prefs } from '../core/preferences';
 
 
 /**
@@ -18,7 +17,7 @@ import { prefs } from '../core/preferences';
  *   `click`             Fires on stage.click, receives a Pixi FederatedPointerEvent
  *   `keydown`           Fires on window.keydown, receives a DOM KeyboardEvent
  *   `keyup`             Fires on window.keyup, receives a DOM KeyboardEvent
- *   `modifierchanged`   Fires when any modifier key is changed, receives the updated modifierKeys Set
+ *   `modifierchange`    Fires when any modifier key is changed, receives the updated modifierKeys Set
  *   `pointercancel`     Fires on stage.pointercancel, receives a Pixi FederatedPointerEvent
  *   `pointerdown`       Fires on stage.pointerdown, receives a Pixi FederatedPointerEvent
  *   `pointermove`       Fires on stage.pointermove, receives a Pixi FederatedPointerEvent
@@ -189,7 +188,7 @@ export class PixiEvents extends EventEmitter {
     }
 
     if (didChange) {
-      this.emit('modifierchanged', modifiers);
+      this.emit('modifierchange', modifiers);
     }
   }
 
@@ -331,7 +330,8 @@ export class PixiEvents extends EventEmitter {
       speed = 3;
 
     } else {  // consider user mouse_wheel preference
-      const wheelPref = prefs('prefs.mouse_wheel.interaction') ?? this._wheelDefault;
+      const prefs = this.context.storageSystem();
+      const wheelPref = prefs.getItem('prefs.mouse_wheel.interaction') ?? this._wheelDefault;
 
       // User wants to 'pan' by default OR
       // We autodetect - either horizontal scroll present or vertical scroll is a round number...
diff --git a/modules/pixi/PixiFeatureLine.js b/modules/pixi/PixiFeatureLine.js
index 1391b329d3..4e57b027df 100644
--- a/modules/pixi/PixiFeatureLine.js
+++ b/modules/pixi/PixiFeatureLine.js
@@ -78,8 +78,7 @@ export class PixiFeatureLine extends AbstractFeature {
   update(projection, zoom) {
     if (!this.dirty) return;  // nothing to do
 
-    const wireframeMode = this.context.map().wireframeMode;
-    const context = this.context;
+    const wireframeMode = this.context.mapSystem().wireframeMode;
     const textureManager = this.renderer.textures;
     const container = this.container;
     const style = this._style;
diff --git a/modules/pixi/PixiFeaturePoint.js b/modules/pixi/PixiFeaturePoint.js
index 3b07baf0f9..081241d8ab 100644
--- a/modules/pixi/PixiFeaturePoint.js
+++ b/modules/pixi/PixiFeaturePoint.js
@@ -117,7 +117,7 @@ export class PixiFeaturePoint extends AbstractFeature {
     if (!this._styleDirty) return;
 
     const context = this.context;
-    const wireframeMode = context.map().wireframeMode;
+    const wireframeMode = context.mapSystem().wireframeMode;
     const textureManager = this.renderer.textures;
     const style = this._style;
     const isPin = ['pin', 'boldPin', 'improveosm', 'osmose'].includes(style.markerName);
diff --git a/modules/pixi/PixiFeaturePolygon.js b/modules/pixi/PixiFeaturePolygon.js
index 76f6fac372..e3392bd3da 100644
--- a/modules/pixi/PixiFeaturePolygon.js
+++ b/modules/pixi/PixiFeaturePolygon.js
@@ -5,7 +5,6 @@ import { /* geomRotatePoints,*/ vecEqual, vecLength /*, vecSubtract */ } from '@
 
 import { AbstractFeature } from './AbstractFeature';
 import { lineToPoly } from './helpers';
-import { prefs } from '../core/preferences';
 
 const PARTIALFILLWIDTH = 32;
 
@@ -103,7 +102,7 @@ export class PixiFeaturePolygon extends AbstractFeature {
   update(projection, zoom) {
     if (!this.dirty) return;  // nothing to do
 
-    const wireframeMode = this.context.map().wireframeMode;
+    const wireframeMode = this.context.mapSystem().wireframeMode;
 
     //
     // GEOMETRY
@@ -184,7 +183,8 @@ export class PixiFeaturePolygon extends AbstractFeature {
 // I've noticed that we can't use textures from a spritesheet for patterns,
 // and it would be nice to figure out why
 
-    const fillstyle = prefs('area-fill') || 'partial';
+    const prefs = this.context.storageSystem();
+    const fillstyle = prefs.getItem('area-fill') ?? 'partial';
     let doPartialFill = !style.requireFill && (fillstyle === 'partial');
 
     // If this shape is so small that partial filling makes no sense, fill fully (faster?)
diff --git a/modules/pixi/PixiLayerBackgroundTiles.js b/modules/pixi/PixiLayerBackgroundTiles.js
index 54d4032880..5887705997 100644
--- a/modules/pixi/PixiLayerBackgroundTiles.js
+++ b/modules/pixi/PixiLayerBackgroundTiles.js
@@ -56,7 +56,7 @@ export class PixiLayerBackgroundTiles extends AbstractLayer {
    * @param  projection   Pixi projection to use for rendering
    */
   render(frame, projection) {
-    const imagery = this.context.imagery();
+    const imagery = this.context.imagerySystem();
     const groupContainer = this.scene.groups.get('background');
 
     // Collect tile sources - baselayer and overlays
@@ -119,7 +119,7 @@ export class PixiLayerBackgroundTiles extends AbstractLayer {
   renderSource(timestamp, projection, source, sourceContainer, tileMap) {
     const context = this.context;
     const textureManager = this.renderer.textures;
-    const osm = context.connection();
+    const osm = context.services.get('osm');
 
     // The tile debug container lives on the `map-ui` layer so it is drawn over everything
     let showDebug = false;
@@ -207,13 +207,13 @@ export class PixiLayerBackgroundTiles extends AbstractLayer {
 
         tile.loaded = true;
         tile.image = null;  // image is copied to the atlas, we can free it
-        context.map().deferredRedraw();
+        context.mapSystem().deferredRedraw();
       };
 
       image.onerror = () => {
         tile.image = null;
         this._failed.add(tile.url);
-        context.map().deferredRedraw();
+        context.mapSystem().deferredRedraw();
       };
     }
 
diff --git a/modules/pixi/PixiLayerCustomData.js b/modules/pixi/PixiLayerCustomData.js
index fcb6501ae7..31b9288541 100644
--- a/modules/pixi/PixiLayerCustomData.js
+++ b/modules/pixi/PixiLayerCustomData.js
@@ -6,7 +6,6 @@ import stringify from 'fast-json-stable-stringify';
 import { gpx, kml } from '@tmcw/togeojson';
 import { Extent, geomPolygonIntersectsPolygon } from '@rapid-sdk/math';
 import { utilArrayFlatten, utilArrayUnion, utilHashcode } from '@rapid-sdk/util';
-import { services } from '../services';
 import { PixiFeaturePolygon } from './PixiFeaturePolygon';
 
 import { AbstractLayer } from './AbstractLayer';
@@ -35,7 +34,6 @@ export class PixiLayerCustomData extends AbstractLayer {
     // setup the child containers
     // these only go visible if they have something to show
 
-    this._vtService = null;
     this._geojson = {};
     this._template = null;
     this._fileList = null;
@@ -62,26 +60,11 @@ export class PixiLayerCustomData extends AbstractLayer {
       });
 
     // hashchange - pick out the 'gpx' param
-    this.context.urlhash()
+    this.context.urlHashSystem()
       .on('hashchange', q => this.url(q.gpx || '', '.gpx'));
   }
 
 
-  /**
-   * Services are loosely coupled in Rapid, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
-   */
-  getService() {
-    if (services.vectorTile && !this._vtService) {
-      this._vtService = services.vectorTile;
-    } else if (!services.vectorTile && this._vtService) {
-      this._vtService = null;
-    }
-
-    return this._vtService;
-  }
-
-
   // Ensure that all geojson features in a collection have IDs
   ensureIDs(geojson) {
     if (!geojson) return null;
@@ -201,8 +184,9 @@ export class PixiLayerCustomData extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderCustomData(frame, projection, zoom) {
-    let vtService = this.getService();
+    const vtService = this.context.services.get('vectortile');
     let geoData, polygons, lines, points;
+
     if (this._template && vtService) {   // fetch data from vector tile service
       const sourceID = this._template;
       vtService.loadTiles(sourceID, this._template, this.context.projection);
@@ -232,11 +216,11 @@ export class PixiLayerCustomData extends AbstractLayer {
    * @returns a list of linestrings to draw as gridlines.
   */
   createGridLines (lines) {
-    const numSplits = this.context.imagery().numGridSplits;
+    const numSplits = this.context.imagerySystem().numGridSplits;
     let gridLines = [];
 
     //'isTaskRectangular' implies one and only one rectangular linestring.
-    if (this.context.rapidContext().isTaskRectangular && numSplits > 0) {
+    if (this.context.rapidSystem().isTaskRectangular && numSplits > 0) {
       const box = lines[0];
 
       const lats = box.geometry.coordinates.map((f) => f[0]);
@@ -419,15 +403,14 @@ export class PixiLayerCustomData extends AbstractLayer {
     if (!arguments.length) return this._template;
 
     // test source against OSM imagery blocklists..
-    const osm = this.context.connection();
+    const osm = this.context.services.get('osm');
     if (osm) {
-      const blocklists = osm.imageryBlocklists();
+      const blocklists = osm.imageryBlocklists ?? [];
       let fail = false;
       let tested = 0;
       let regex;
 
-      for (let i = 0; i < blocklists.length; i++) {
-        regex = blocklists[i];
+      for (regex of blocklists) {
         fail = regex.test(val);
         tested++;
         if (fail) break;
@@ -528,7 +511,7 @@ export class PixiLayerCustomData extends AbstractLayer {
           setFile(extension, data);
           const isTaskBoundsUrl = extension === '.gpx' && url.indexOf('project') > 0 && url.indexOf('task') > 0;
           if (isTaskBoundsUrl) {
-            this.context.rapidContext().setTaskExtentByGpxData(data);
+            this.context.rapidSystem().setTaskExtentByGpxData(data);
           }
         })
         .catch(e => console.error(e));  // eslint-disable-line
@@ -555,7 +538,7 @@ export class PixiLayerCustomData extends AbstractLayer {
     const features = this.getFeatures(this._geojson);
     if (!features.length) return;
 
-    const map = this.context.map();
+    const map = this.context.mapSystem();
     const viewport = map.trimmedExtent().polygon();
 
     const coords = features.reduce((coords, feature) => {
diff --git a/modules/pixi/PixiLayerEditBlocks.js b/modules/pixi/PixiLayerEditBlocks.js
index c8f698dc93..8575225c09 100644
--- a/modules/pixi/PixiLayerEditBlocks.js
+++ b/modules/pixi/PixiLayerEditBlocks.js
@@ -1,6 +1,5 @@
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeaturePolygon } from './PixiFeaturePolygon';
-import { locationManager } from '../core/LocationManager';
 
 const MINZOOM = 4;
 
@@ -47,8 +46,9 @@ export class PixiLayerEditBlocks extends AbstractLayer {
     let blocks;
 
     if (zoom >= MINZOOM) {
-      const viewport = this.context.map().extent().rectangle();
-      blocks = locationManager.wpblocks().bbox(viewport);
+      const viewport = this.context.mapSystem().extent().rectangle();
+      const locationSystem = this.context.locationSystem();
+      blocks = locationSystem.wpblocks().bbox(viewport);
       this.renderEditBlocks(frame, projection, zoom, blocks);
 
     } else {
@@ -89,6 +89,7 @@ export class PixiLayerEditBlocks extends AbstractLayer {
    * @param  blocks       Array of block data visible in the view
    */
   renderEditBlocks(frame, projection, zoom, blocks) {
+    const locationSystem = this.context.locationSystem();
     const parentContainer = this.scene.groups.get('blocks');
     const BLOCK_STYLE = {
       requireFill: true,    // no partial fill option - must fill fully
@@ -96,7 +97,7 @@ export class PixiLayerEditBlocks extends AbstractLayer {
     };
 
     for (const d of blocks) {
-      const geometry = locationManager.feature(d.locationSetID).geometry;  // get GeoJSON
+      const geometry = locationSystem.feature(d.locationSetID).geometry;  // get GeoJSON
       if (!geometry) continue;
 
       const parts = (geometry.type === 'Polygon') ? [geometry.coordinates]
diff --git a/modules/pixi/PixiLayerImproveOsm.js b/modules/pixi/PixiLayerImproveOsm.js
index 7c6fed566e..fe1e2ebf22 100644
--- a/modules/pixi/PixiLayerImproveOsm.js
+++ b/modules/pixi/PixiLayerImproveOsm.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 
@@ -18,25 +17,15 @@ export class PixiLayerImproveOsm extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.improveOSM && !this._service) {
-      this._service = services.improveOSM;
-      this._service.on('loaded', () => this.context.map().deferredRedraw());
-    } else if (!services.improveOSM && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('improveOSM');
   }
 
 
@@ -47,7 +36,7 @@ export class PixiLayerImproveOsm extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('improveOSM');
     if (!service) return;
 
     const parentContainer = this.scene.groups.get('qa');
@@ -90,20 +79,11 @@ export class PixiLayerImproveOsm extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('improveOSM');
     if (!this._enabled || !service || zoom < MINZOOM) return;
 
     service.loadIssues(this.context.projection);  // note: context.projection !== pixi projection
     this.renderMarkers(frame, projection, zoom);
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
diff --git a/modules/pixi/PixiLayerKartaPhotos.js b/modules/pixi/PixiLayerKartaPhotos.js
index fe938eb86b..5705283a81 100644
--- a/modules/pixi/PixiLayerKartaPhotos.js
+++ b/modules/pixi/PixiLayerKartaPhotos.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeatureLine } from './PixiFeatureLine';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
@@ -32,32 +31,23 @@ export class PixiLayerKartaPhotos extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.kartaview && !this._service) {
-      this._service = services.kartaview;
-      this._service.on('loadedImages', () => this.context.map().deferredRedraw());
-    } else if (!services.kartaview && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('kartaview');
   }
 
 
   filterImages(images) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
-    const usernames = this.context.photos().usernames;
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
+    const usernames = photoSystem.usernames;
 
     if (fromDate) {
       const fromTimestamp = new Date(fromDate).getTime();
@@ -75,9 +65,10 @@ export class PixiLayerKartaPhotos extends AbstractLayer {
 
 
   filterSequences(sequences) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
-    const usernames = this.context.photos().usernames;
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
+    const usernames = photoSystem.usernames;
 
     if (fromDate) {
       const fromTimestamp = new Date(fromDate).getTime();
@@ -101,7 +92,7 @@ export class PixiLayerKartaPhotos extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('kartaview');
     if (!service) return;
 
     const parentContainer = this.scene.groups.get('streetview');
@@ -174,20 +165,11 @@ export class PixiLayerKartaPhotos extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('kartaview');
     if (!this._enabled || !service || zoom < MINZOOM) return;
 
     service.loadImages(this.context.projection);  // note: context.projection !== pixi projection
     this.renderMarkers(frame, projection, zoom);
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
diff --git a/modules/pixi/PixiLayerKeepRight.js b/modules/pixi/PixiLayerKeepRight.js
index 119863e12b..3ba4cbf803 100644
--- a/modules/pixi/PixiLayerKeepRight.js
+++ b/modules/pixi/PixiLayerKeepRight.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 
@@ -18,25 +17,15 @@ export class PixiLayerKeepRight extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.keepRight && !this._service) {
-      this._service = services.keepRight;
-      this._service.on('loaded', () => this.context.map().deferredRedraw());
-    } else if (!services.keepRight && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('keepRight');
   }
 
 
@@ -47,7 +36,7 @@ export class PixiLayerKeepRight extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('keepRight');
     if (!service) return;
 
     const parentContainer = this.scene.groups.get('qa');
@@ -85,20 +74,11 @@ export class PixiLayerKeepRight extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('keepRight');
     if (!this._enabled || !service || zoom < MINZOOM) return;
 
     service.loadIssues(this.context.projection);  // note: context.projection !== pixi projection
     this.renderMarkers(frame, projection, zoom);
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
diff --git a/modules/pixi/PixiLayerLabels.js b/modules/pixi/PixiLayerLabels.js
index 4884a1cf60..7b2f71a548 100644
--- a/modules/pixi/PixiLayerLabels.js
+++ b/modules/pixi/PixiLayerLabels.js
@@ -3,7 +3,6 @@ import RBush from 'rbush';
 import { Extent, vecAdd, vecAngle, vecScale, vecSubtract, geomRotatePoints } from '@rapid-sdk/math';
 
 import { AbstractLayer } from './AbstractLayer';
-import { localizer } from '../core/localizer';
 import { getLineSegments, getDebugBBox, lineToPoly } from './helpers.js';
 
 const MINZOOM = 12;
@@ -485,8 +484,6 @@ this.placeRopeLabel(feature, labelObj, coords);
     const container = feature.container;
     if (!container.visible || !container.renderable) return;
 
-    const TEXTDIRECTION = localizer.textDirection();
-
     // `f` - feature, these bounds are in "scene" coordinates
     const featureID = feature.id;
     const fRect = feature.sceneBounds.clone().pad(1, 0);
@@ -542,16 +539,9 @@ this.placeRopeLabel(feature, labelObj, coords);
     // Prefer placements that are more "visually attached" to the pin (right,bottom,left,top)
     // over placements that are further away (corners)
     let preferences;
-    if (TEXTDIRECTION === 'ltr') {
-      preferences = [
-        'r3', 'r4', 'r2',
-        'b3', 'b4', 'b2', 'b5', 'b1',
-        'l3', 'l4', 'l2',
-        't3', 't4', 't2', 't5', 't1',
-        'r5', 'r1',
-        'l5', 'l1'
-      ];
-    } else {
+    const isRTL = this.context.localizationSystem().isRTL();
+
+    if (isRTL) {   // right to left
       preferences = [
         'l3', 'l4', 'l2',
         'b3', 'b2', 'b4', 'b1', 'b5',
@@ -560,6 +550,15 @@ this.placeRopeLabel(feature, labelObj, coords);
         'l5', 'l1',
         'r5', 'r1'
       ];
+    } else {   // left to right
+      preferences = [
+        'r3', 'r4', 'r2',
+        'b3', 'b4', 'b2', 'b5', 'b1',
+        'l3', 'l4', 'l2',
+        't3', 't4', 't2', 't5', 't1',
+        'r5', 'r1',
+        'l5', 'l1'
+      ];
     }
 
     let picked = null;
diff --git a/modules/pixi/PixiLayerMapillaryFeatures.js b/modules/pixi/PixiLayerMapillaryFeatures.js
index 270423f94c..ff1d8daa81 100644
--- a/modules/pixi/PixiLayerMapillaryFeatures.js
+++ b/modules/pixi/PixiLayerMapillaryFeatures.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 
@@ -18,31 +17,22 @@ export class PixiLayerMapillaryFeatures extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.mapillary && !this._service) {
-      this._service = services.mapillary;
-      this._service.on('loadedMapFeatures', () => this.context.map().deferredRedraw());
-    } else if (!services.mapillary && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('mapillary');
   }
 
 
   filterDetections(detections) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
 
     if (fromDate) {
       const fromTimestamp = new Date(fromDate).getTime();
@@ -66,7 +56,7 @@ export class PixiLayerMapillaryFeatures extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('mapillary');
     if (!service) return;
 
     const parentContainer = this.scene.groups.get('points');
@@ -107,7 +97,7 @@ export class PixiLayerMapillaryFeatures extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('mapillary');
 
     if (this._enabled && service && zoom >= MINZOOM) {
       service.loadMapFeatures(this.context.projection);  // note: context.projection !== pixi projection
@@ -119,14 +109,5 @@ export class PixiLayerMapillaryFeatures extends AbstractLayer {
     }
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
 
diff --git a/modules/pixi/PixiLayerMapillaryPhotos.js b/modules/pixi/PixiLayerMapillaryPhotos.js
index 72244207ce..9db787e97d 100644
--- a/modules/pixi/PixiLayerMapillaryPhotos.js
+++ b/modules/pixi/PixiLayerMapillaryPhotos.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeatureLine } from './PixiFeatureLine';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
@@ -32,34 +31,25 @@ export class PixiLayerMapillaryPhotos extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.mapillary && !this._service) {
-      this._service = services.mapillary;
-      this._service.on('loadedImages', () => this.context.map().deferredRedraw());
-    } else if (!services.mapillary && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('mapillary');
   }
 
 
   filterImages(images) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
-    const usernames = this.context.photos().usernames;
-    const showFlatPhotos = this.context.photos().showsPhotoType('flat');
-    const showPanoramicPhotos = this.context.photos().showsPhotoType('panoramic');
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
+    const usernames = photoSystem.usernames;
+    const showFlatPhotos = photoSystem.showsPhotoType('flat');
+    const showPanoramicPhotos = photoSystem.showsPhotoType('panoramic');
 
     if (!showFlatPhotos && !showPanoramicPhotos) {
       return [];
@@ -85,9 +75,10 @@ export class PixiLayerMapillaryPhotos extends AbstractLayer {
 
 
   filterSequences(sequences) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
-    const usernames = this.context.photos().usernames;
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
+    const usernames = photoSystem.usernames;
 
     // note - Sequences now contains an Array of Linestrings, post #776
     // This is because we can get multiple linestrings for sequences that cross a tile boundary.
@@ -114,7 +105,7 @@ export class PixiLayerMapillaryPhotos extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('mapillary');
     if (!service) return;
 
     // const showMarkers = (zoom >= MINMARKERZOOM);
@@ -191,20 +182,11 @@ export class PixiLayerMapillaryPhotos extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('mapillary');
     if (!this._enabled || !service || zoom < MINZOOM) return;
 
     service.loadImages(this.context.projection);  // note: context.projection !== pixi projection
     this.renderMarkers(frame, projection, zoom);
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
diff --git a/modules/pixi/PixiLayerMapillarySigns.js b/modules/pixi/PixiLayerMapillarySigns.js
index 2e22a6fb3d..1ead936831 100644
--- a/modules/pixi/PixiLayerMapillarySigns.js
+++ b/modules/pixi/PixiLayerMapillarySigns.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 
@@ -18,31 +17,22 @@ export class PixiLayerMapillarySigns extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.mapillary && !this._service) {
-      this._service = services.mapillary;
-      this._service.on('loadedSigns', () => this.context.map().deferredRedraw());
-    } else if (!services.mapillary && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('mapillary');
   }
 
 
   filterDetections(detections) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
 
     if (fromDate) {
       const fromTimestamp = new Date(fromDate).getTime();
@@ -66,7 +56,7 @@ export class PixiLayerMapillarySigns extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('mapillary');
     if (!service) return;
 
     const parentContainer = this.scene.groups.get('points');
@@ -108,7 +98,7 @@ export class PixiLayerMapillarySigns extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('mapillary');
 
     if (this._enabled && service && zoom >= MINZOOM) {
       service.loadSigns(this.context.projection);  // note: context.projection !== pixi projection
@@ -120,13 +110,4 @@ export class PixiLayerMapillarySigns extends AbstractLayer {
     }
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
diff --git a/modules/pixi/PixiLayerOsm.js b/modules/pixi/PixiLayerOsm.js
index b3e2ed5a94..34fec5c407 100644
--- a/modules/pixi/PixiLayerOsm.js
+++ b/modules/pixi/PixiLayerOsm.js
@@ -2,14 +2,10 @@ import * as PIXI from 'pixi.js';
 import geojsonRewind from '@mapbox/geojson-rewind';
 import { vecAngle, vecLength, vecInterp } from '@rapid-sdk/math';
 
-import { services } from '../services';
-import { presetManager } from '../presets';
-
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeatureLine } from './PixiFeatureLine';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 import { PixiFeaturePolygon } from './PixiFeaturePolygon';
-import { utilDisplayName, utilDisplayPOIName } from '../util';
 import { styleMatch } from './styles';
 
 const MINZOOM = 12;
@@ -32,11 +28,8 @@ export class PixiLayerOsm extends AbstractLayer {
     const basemapContainer = this.scene.groups.get('basemap');
 
     this._enabled = true;  // OSM layers should be enabled by default
-    this._service = null;
     this._resolved = new Map();  // Map (entity.id -> GeoJSON feature)
 
-    this.getService();
-
 // experiment for benchmarking
 //    this._alreadyDownloaded = false;
 //    this._saveCannedData = false;
@@ -55,27 +48,12 @@ export class PixiLayerOsm extends AbstractLayer {
   }
 
 
-  /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
-   */
-  getService() {
-    if (services.osm && !this._service) {
-      this._service = services.osm;
-    } else if (!services.osm && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
-  }
-
-
   /**
    * supported
    * Whether the Layer's service exists
    */
   get supported() {
-    return !!this.getService();
+    return this.context.services.has('osm');
   }
 
 
@@ -114,17 +92,16 @@ export class PixiLayerOsm extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
-    if (!this._enabled || !service || zoom < MINZOOM) return;
+    if (!this._enabled || !this.supported || zoom < MINZOOM) return;
 
     const context = this.context;
     const graph = context.graph();
-    const map = context.map();
+    const map = context.mapSystem();
 
     context.loadTiles(context.projection);  // Load tiles of OSM data to cover the view
 
-    let entities = context.history().intersects(map.extent());             // Gather data in view
-    entities = context.features().filter(entities, this.context.graph());  // Apply feature filters
+    let entities = context.editSystem().intersects(map.extent());   // Gather data in view
+    entities = context.filterSystem().filter(entities, graph);   // Apply feature filters
 
     const data = {
       polygons: new Map(),
@@ -152,7 +129,7 @@ export class PixiLayerOsm extends AbstractLayer {
 //    // continuing will fire off the download of the data into a file called 'canned_data.json'.
 //    // move the data into the test/spec/renderer directory.
 //    if (this._saveCannedData && !this._alreadyDownloaded) {
-//      const map = context.map();
+//      const map = context.mapSystem();
 //      const [lng, lat] = map.center();
 //
 //      let viewData = {
@@ -227,7 +204,7 @@ export class PixiLayerOsm extends AbstractLayer {
 
     this.renderVertices(frame, projection, zoom, data, related);
 
-    if (context.mode()?.id === 'select') {
+    if (context.mode()?.id === 'select-osm') {
       this.renderMidpoints(frame, projection, zoom, data, related);
     }
   }
@@ -242,9 +219,12 @@ export class PixiLayerOsm extends AbstractLayer {
    */
   renderPolygons(frame, projection, zoom, data) {
     const entities = data.polygons;
-    const graph = this.context.graph();
+    const context = this.context;
+    const graph = context.graph();
+    const l10n = context.localizationSystem();
+    const presetSystem = context.presetSystem();
     const pointsContainer = this.scene.groups.get('points');
-    const pointsHidden = this.context.features().hidden('points');
+    const showPoints = context.filterSystem().isEnabled('points');
 
     // For deciding if an unlabeled polygon feature is interesting enough to show a virtual pin.
     // Note that labeled polygon features will always get a virtual pin.
@@ -317,19 +297,19 @@ export class PixiLayerOsm extends AbstractLayer {
         this.syncFeatureClasses(feature);
 
         if (feature.dirty) {
-          const preset = presetManager.match(entity, graph);
+          const preset = presetSystem.match(entity, graph);
 
           const style = styleMatch(entity.tags);
           style.labelTint = style.fill.color ?? style.stroke.color ?? 0xeeeeee;
           feature.style = style;
 
-          const label = utilDisplayPOIName(entity);
+          const label = l10n.displayPOIName(entity);
           feature.label = label;
 
           // POI = "Point of Interest" -and- "Pole of Inaccessability"
           // For POIs mapped as polygons, we can create a virtual point feature at the pole of inaccessability.
           // Try to show a virtual pin if there is a label or if the preset is interesting enough..
-          if (!pointsHidden && (label || isInterestingPreset(preset))) {
+          if (showPoints && (label || isInterestingPreset(preset))) {
             feature.poiFeatureID = `${this.layerID}-${entityID}-poi-${i}`;
             feature.poiPreset = preset;
           } else {
@@ -396,7 +376,9 @@ export class PixiLayerOsm extends AbstractLayer {
    */
   renderLines(frame, projection, zoom, data) {
     const entities = data.lines;
-    const graph = this.context.graph();
+    const context = this.context;
+    const graph = context.graph();
+    const l10n = context.localizationSystem();
     const lineContainer = this.lineContainer;
 
     for (const [entityID, entity] of entities) {
@@ -485,7 +467,7 @@ export class PixiLayerOsm extends AbstractLayer {
             }
             feature.style = style;
 
-            feature.label = utilDisplayName(entity);
+            feature.label = l10n.displayName(entity);
           }
 
           feature.update(projection, zoom);
@@ -522,6 +504,8 @@ export class PixiLayerOsm extends AbstractLayer {
     const entities = data.vertices;
     const context = this.context;
     const graph = context.graph();
+    const l10n = context.localizationSystem();
+    const presetSystem = context.presetSystem();
 
     // Vertices related to the selection/hover should be drawn above everything
     const mapUIContainer = this.scene.layers.get('map-ui').container;
@@ -574,7 +558,7 @@ export class PixiLayerOsm extends AbstractLayer {
       feature.parentContainer = parentContainer;   // change layer stacking if necessary
 
       if (feature.dirty) {
-        const preset = presetManager.match(node, graph);
+        const preset = presetSystem.match(node, graph);
         const iconName = preset?.icon;
         const directions = node.directions(graph, context.projection);
 
@@ -609,7 +593,7 @@ export class PixiLayerOsm extends AbstractLayer {
         }
 
         feature.style = markerStyle;
-        feature.label = utilDisplayName(node);
+        feature.label = l10n.displayName(node);
       }
 
       feature.update(projection, zoom);
@@ -627,7 +611,10 @@ export class PixiLayerOsm extends AbstractLayer {
    */
   renderPoints(frame, projection, zoom, data) {
     const entities = data.points;
-    const graph = this.context.graph();
+    const context = this.context;
+    const graph = context.graph();
+    const l10n = context.localizationSystem();
+    const presetSystem = context.presetSystem();
     const pointsContainer = this.scene.groups.get('points');
 
     for (const [nodeID, node] of entities) {
@@ -656,17 +643,17 @@ export class PixiLayerOsm extends AbstractLayer {
       this.syncFeatureClasses(feature);
 
       if (feature.dirty) {
-        let preset = presetManager.match(node, graph);
+        let preset = presetSystem.match(node, graph);
         let iconName = preset?.icon;
 
         // If we matched a generic preset without an icon, try matching it as a 'vertex'
         // This is just to choose a better icon for an otherwise empty-looking pin.
         if (!iconName) {
-          preset = presetManager.matchTags(node.tags, 'vertex');
+          preset = presetSystem.matchTags(node.tags, 'vertex');
           iconName = preset?.icon;
         }
 
-        const directions = node.directions(graph, this.context.projection);
+        const directions = node.directions(graph, context.projection);
 
         // set marker style
         let markerStyle = {
@@ -691,7 +678,7 @@ export class PixiLayerOsm extends AbstractLayer {
         }
 
         feature.style = markerStyle;
-        feature.label = utilDisplayName(node);
+        feature.label = l10n.displayName(node);
       }
 
       feature.update(projection, zoom);
diff --git a/modules/pixi/PixiLayerOsmNotes.js b/modules/pixi/PixiLayerOsmNotes.js
index e2a9e72e85..fc0fc41ef5 100644
--- a/modules/pixi/PixiLayerOsmNotes.js
+++ b/modules/pixi/PixiLayerOsmNotes.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 
@@ -19,9 +18,6 @@ export class PixiLayerOsmNotes extends AbstractLayer {
   constructor(scene, layerID) {
     super(scene, layerID);
 
-    this._service = null;
-    this.getService();
-
 // might use these
 //    const markerHighlight = new PIXI.Graphics()
 //      .lineStyle(4, 0xcccccc, 0.6)
@@ -40,18 +36,11 @@ export class PixiLayerOsmNotes extends AbstractLayer {
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.osm && !this._service) {
-      this._service = services.osm;
-      this._service.on('loadedNotes', () => this.context.map().deferredRedraw());
-    } else if (!services.osm && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return !!this.context.services.has('osm');
   }
 
 
@@ -62,11 +51,11 @@ export class PixiLayerOsmNotes extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
-    if (!service) return;
+    const osm = this.context.services.get('osm');
+    if (!osm) return;
 
     const parentContainer = this.scene.groups.get('qa');
-    const items = service.notes(this.context.projection);
+    const items = osm.notes(this.context.projection);
 
     for (const d of items) {
       const featureID = `${this.layerID}-${d.id}`;
@@ -112,21 +101,12 @@ export class PixiLayerOsmNotes extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
-    if (!this.enabled || !service || zoom < MINZOOM) return;
+    const osm = this.context.services.get('osm');
+    if (!this.enabled || !osm || zoom < MINZOOM) return;
 
-    service.loadNotes(this.context.projection);  // note: context.projection !== pixi projection
+    osm.loadNotes(this.context.projection);  // note: context.projection !== pixi projection
     this.renderMarkers(frame, projection, zoom);
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
 
diff --git a/modules/pixi/PixiLayerOsmose.js b/modules/pixi/PixiLayerOsmose.js
index 85a796c141..1f535faf31 100644
--- a/modules/pixi/PixiLayerOsmose.js
+++ b/modules/pixi/PixiLayerOsmose.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 
@@ -18,25 +17,15 @@ export class PixiLayerOsmose extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.osmose && !this._service) {
-      this._service = services.osmose;
-      this._service.on('loaded', () => this.context.map().deferredRedraw());
-    } else if (!services.osmose && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('osmose');
   }
 
 
@@ -47,7 +36,7 @@ export class PixiLayerOsmose extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('osmose');
     if (!service) return;
 
     const parentContainer = this.scene.groups.get('qa');
@@ -90,20 +79,11 @@ export class PixiLayerOsmose extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('osmose');
     if (!this.enabled || !service || zoom < MINZOOM) return;
 
     service.loadIssues(this.context.projection);  // note: context.projection !== pixi projection
     this.renderMarkers(frame, projection, zoom);
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
diff --git a/modules/pixi/PixiLayerRapid.js b/modules/pixi/PixiLayerRapid.js
index b908049f2b..07e0be33d6 100644
--- a/modules/pixi/PixiLayerRapid.js
+++ b/modules/pixi/PixiLayerRapid.js
@@ -1,12 +1,10 @@
 import * as PIXI from 'pixi.js';
 import geojsonRewind from '@mapbox/geojson-rewind';
 
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeatureLine } from './PixiFeatureLine';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
 import { PixiFeaturePolygon } from './PixiFeaturePolygon';
-import { utilDisplayName } from '../util';
 
 const MINZOOM = 12;
 
@@ -26,13 +24,8 @@ export class PixiLayerRapid extends AbstractLayer {
     super(scene, layerID);
 
     this._enabled = true;     // Rapid features should be enabled by default
-    this._serviceFB = null;
-    this._serviceEsri = null;
     this._resolved = new Map();  // Map (entity.id -> GeoJSON feature)
 
-    this.getServiceFB();
-    this.getServiceEsri();
-
 //// shader experiment:
 //this._uniforms = {
 // u_resolution: [300.0, 300.0],
@@ -113,83 +106,73 @@ export class PixiLayerRapid extends AbstractLayer {
     // These features will be filtered out when drawing
     this._acceptedIDs = new Set();
 
-    this.context.history()
-      .on('undone.rapid', onHistoryUndone.bind(this))
-      .on('change.rapid', onHistoryChange.bind(this))
-      .on('restore.rapid', onHistoryRestore.bind(this));
+    // Make sure the event handlers have `this` bound correctly
+    this._onUndone = this._onUndone.bind(this);
+    this._onChange = this._onChange.bind(this);
+    this._onRestore = this._onRestore.bind(this);
 
+    this.context.editSystem()
+      .on('undone', this._onUndone)
+      .on('change', this._onChange)
+      .on('restore', this._onRestore);
+  }
 
-    function wasRapidEdit(annotation) {
-      return annotation && annotation.type && /^rapid/.test(annotation.type);
-    }
 
 
-    function onHistoryUndone(currentStack, previousStack) {
-      const annotation = previousStack.annotation;
-      if (!wasRapidEdit(annotation)) return;
+  _wasRapidEdit(annotation) {
+    return annotation?.type && /^rapid/.test(annotation.type);
+  }
 
-      this._acceptedIDs.delete(annotation.id);
-      this.context.map().immediateRedraw();
-    }
 
+  _onUndone(currentStack, previousStack) {
+    const annotation = previousStack.annotation;
+    if (!this._wasRapidEdit(annotation)) return;
 
-    function onHistoryChange() {
-      const annotation = this.context.history().peekAnnotation();
-      if (!wasRapidEdit(annotation)) return;
+    this._acceptedIDs.delete(annotation.id);
+    this.context.mapSystem().immediateRedraw();
+  }
 
-      this._acceptedIDs.add(annotation.id);
-      this.context.map().immediateRedraw();
-    }
 
+  _onChange() {
+    const annotation = this.context.editSystem().peekAnnotation();
+    if (!this._wasRapidEdit(annotation)) return;
 
-    function onHistoryRestore() {
-      this._acceptedIDs = new Set();
+    this._acceptedIDs.add(annotation.id);
+    this.context.mapSystem().immediateRedraw();
+  }
 
-      this.context.history().peekAllAnnotations().forEach(annotation => {
-        if (!wasRapidEdit(annotation)) return;
 
-        this._acceptedIDs.add(annotation.id);
+  _onRestore() {
+    this._acceptedIDs = new Set();
 
-        // `origid` (the original entity ID), a.k.a. datum.__origid__,
-        // is a hack used to deal with non-deterministic way-splitting
-        // in the roads service. Each way "split" will have an origid
-        // attribute for the original way it was derived from. In this
-        // particular case, restoring from history on page reload, we
-        // prevent new splits (possibly different from before the page
-        // reload) from being displayed by storing the origid and
-        // checking against it in render().
-        if (annotation.origid) {
-          this._acceptedIDs.add(annotation.origid);
-        }
-      });
+    this.context.editSystem().peekAllAnnotations().forEach(annotation => {
+      if (!this._wasRapidEdit(annotation)) return;
 
-      this.context.map().immediateRedraw();
-    }
+      this._acceptedIDs.add(annotation.id);
+
+      // `origid` (the original entity ID), a.k.a. datum.__origid__,
+      // is a hack used to deal with non-deterministic way-splitting
+      // in the roads service. Each way "split" will have an origid
+      // attribute for the original way it was derived from. In this
+      // particular case, restoring from history on page reload, we
+      // prevent new splits (possibly different from before the page
+      // reload) from being displayed by storing the origid and
+      // checking against it in render().
+      if (annotation.origid) {
+        this._acceptedIDs.add(annotation.origid);
+      }
+    });
+
+    this.context.mapSystem().immediateRedraw();
   }
 
 
   /**
-   * Services are loosely coupled, so we use these functions
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getServiceFB() {
-    if (services.fbMLRoads && !this._serviceFB) {
-      this._serviceFB = services.fbMLRoads;
-      this._serviceFB.on('loadedData', () => this.context.map().deferredRedraw());
-    } else if (!services.fbMLRoads && this._serviceFB) {
-      this._serviceFB = null;
-    }
-    return this._serviceFB;
-  }
-
-  getServiceEsri() {
-    if (services.esriData && !this._serviceEsri) {
-      this._serviceEsri = services.esriData;
-      this._serviceEsri.on('loadedData', () => this.context.map().deferredRedraw());
-    } else if (!services.esriData && this._serviceEsri) {
-      this._serviceEsri = null;
-    }
-    return this._serviceEsri;
+  get supported() {
+    return this.context.services.has('mapwithai') || this.context.services.has('esri');
   }
 
 
@@ -201,9 +184,8 @@ export class PixiLayerRapid extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const rapidContext = this.context.rapidContext();
-    const datasets = Object.values(rapidContext.datasets());
-    if (!this.enabled || !datasets.length || zoom < MINZOOM) return;
+    const rapid = this.context.rapidSystem();
+    if (!this.enabled || !rapid.datasets.size || zoom < MINZOOM) return;
 
 // shader experiment
 //const offset = this.context.pixi.stage.position;
@@ -211,7 +193,7 @@ export class PixiLayerRapid extends AbstractLayer {
 //this._uniforms.translationMatrix = transform.clone().translate(-offset.x, -offset.y);
 //this._uniforms.u_time = frame/10;
 
-    for (const dataset of datasets) {
+    for (const dataset of rapid.datasets.values()) {
       this.renderDataset(dataset, frame, projection, zoom);
     }
   }
@@ -221,18 +203,17 @@ export class PixiLayerRapid extends AbstractLayer {
    * renderDataset
    * Render any data we have, and schedule fetching more of it to cover the view
    *
-   * @param  dataset
+   * @param  dataset      Object
    * @param  frame        Integer frame being rendered
    * @param  projection   Pixi projection to use for rendering
    * @param  zoom         Effective zoom to use for rendering
    */
   renderDataset(dataset, frame, projection, zoom) {
     const context = this.context;
-    const rapidContext = context.rapidContext();
     const dsEnabled = (dataset.added && dataset.enabled);
     if (!dsEnabled) return;
 
-    const service = dataset.service === 'fbml' ? this.getServiceFB(): this.getServiceEsri();
+    const service = context.services.get(dataset.service);  // 'mapwithai' or 'esri'
     if (!service) return;
 
     // Adjust the dataset id for whether we want the data conflated or not.
@@ -249,13 +230,13 @@ export class PixiLayerRapid extends AbstractLayer {
     // let data = { polygons: [], lines: [], points: [], vertices: new Set() };
 
     /* Facebook AI/ML */
-    if (dataset.service === 'fbml') {
+    if (dataset.service === 'mapwithai') {
       if (zoom >= 15) { // avoid firing off too many API requests
-        service.loadTiles(datasetID, context.projection, rapidContext.getTaskExtent());  // fetch more
+        service.loadTiles(datasetID, context.projection);  // fetch more
       }
 
-      const entities = service.intersects(datasetID, context.map().extent())
-        .filter(d => d.type === 'way' && !isAccepted(d));  // see onHistoryRestore()
+      const entities = service.intersects(datasetID, context.mapSystem().extent())
+        .filter(d => d.type === 'way' && !isAccepted(d));  // see this._onRestore()
 
       // fb_ai service gives us roads and buildings together,
       // so filter further according to which dataset we're drawing
@@ -280,10 +261,10 @@ export class PixiLayerRapid extends AbstractLayer {
         service.loadTiles(datasetID, context.projection);  // fetch more
       }
 
-      const entities = service.intersects(datasetID, context.map().extent());
+      const entities = service.intersects(datasetID, context.mapSystem().extent());
 
       for (const entity of entities) {
-        if (isAccepted(entity)) continue;   // skip features already accepted, see onHistoryRestore()
+        if (isAccepted(entity)) continue;   // skip features already accepted, see this._onRestore()
         const geom = entity.geometry(dsGraph);
         if (geom === 'point' && !!entity.__fbid__) {  // standalone points only (not vertices/childnodes)
           data.points.push(entity);
@@ -326,7 +307,8 @@ export class PixiLayerRapid extends AbstractLayer {
    * renderPolygons
    */
   renderPolygons(parentContainer, dataset, graph, frame, projection, zoom, data) {
-    const color = PIXI.utils.string2hex(dataset.color);
+    const color = new PIXI.Color(dataset.color);
+    const l10n = this.context.localizationSystem();
 
     for (const entity of data.polygons) {
       // Cache GeoJSON resolution, as we expect the rewind and asGeoJSON calls to be kinda slow.
@@ -373,7 +355,7 @@ export class PixiLayerRapid extends AbstractLayer {
             // fill: { width: 2, color: color, alpha: 1, pattern: 'stripe' }
           };
           feature.style = style;
-          feature.label = utilDisplayName(entity);
+          feature.label = l10n.displayName(entity);
           feature.update(projection, zoom);
         }
 
@@ -387,7 +369,8 @@ export class PixiLayerRapid extends AbstractLayer {
    * renderLines
    */
   renderLines(parentContainer, dataset, graph, frame, projection, zoom, data) {
-    const color = PIXI.utils.string2hex(dataset.color);
+    const color = new PIXI.Color(dataset.color);
+    const l10n = this.context.localizationSystem();
 
     for (const entity of data.lines) {
       const featureID = `${this.layerID}-${dataset.id}-${entity.id}`;
@@ -417,7 +400,7 @@ export class PixiLayerRapid extends AbstractLayer {
         };
         style.lineMarkerName = entity.isOneWay() ? 'oneway' : '';
         feature.style = style;
-        feature.label = utilDisplayName(entity);
+        feature.label = l10n.displayName(entity);
         feature.update(projection, zoom);
       }
 
@@ -430,7 +413,8 @@ export class PixiLayerRapid extends AbstractLayer {
    * renderPoints
    */
   renderPoints(parentContainer, dataset, graph, frame, projection, zoom, data) {
-    const color = PIXI.utils.string2hex(dataset.color);
+    const color = new PIXI.Color(dataset.color);
+    const l10n = this.context.localizationSystem();
 
     const pointStyle = {
       markerName: 'largeCircle',
@@ -460,7 +444,7 @@ export class PixiLayerRapid extends AbstractLayer {
 
       if (feature.dirty) {
         feature.style = pointStyle;
-        feature.label = utilDisplayName(entity);
+        feature.label = l10n.displayName(entity);
         // experiment: label addresses
         const housenumber = entity.tags['addr:housenumber'];
         if (!feature.label && housenumber) {
@@ -490,7 +474,7 @@ export class PixiLayerRapid extends AbstractLayer {
 
       if (feature.dirty) {
         feature.style = vertexStyle;
-        feature.label = utilDisplayName(entity);
+        feature.label = l10n.displayName(entity);
         // experiment: label addresses
         const housenumber = entity.tags['addr:housenumber'];
         if (!feature.label && housenumber) {
diff --git a/modules/pixi/PixiLayerStreetsidePhotos.js b/modules/pixi/PixiLayerStreetsidePhotos.js
index 09e33b98f2..343b907033 100644
--- a/modules/pixi/PixiLayerStreetsidePhotos.js
+++ b/modules/pixi/PixiLayerStreetsidePhotos.js
@@ -1,4 +1,3 @@
-import { services } from '../services';
 import { AbstractLayer } from './AbstractLayer';
 import { PixiFeatureLine } from './PixiFeatureLine';
 import { PixiFeaturePoint } from './PixiFeaturePoint';
@@ -32,32 +31,23 @@ export class PixiLayerStreetsidePhotos extends AbstractLayer {
    */
   constructor(scene, layerID) {
     super(scene, layerID);
-
-    this._service = null;
-    this.getService();
   }
 
 
   /**
-   * Services are loosely coupled, so we use a `getService` function
-   * to gain access to them, and bind any event handlers a single time.
+   * supported
+   * Whether the Layer's service exists
    */
-  getService() {
-    if (services.streetside && !this._service) {
-      this._service = services.streetside;
-      this._service.on('loadedImages', () => this.context.map().deferredRedraw());
-    } else if (!services.streetside && this._service) {
-      this._service = null;
-    }
-
-    return this._service;
+  get supported() {
+    return this.context.services.has('streetside');
   }
 
 
   filterImages(images) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
-    const usernames = this.context.photos().usernames;
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
+    const usernames = photoSystem.usernames;
 
     if (fromDate) {
       const fromTimestamp = new Date(fromDate).getTime();
@@ -75,9 +65,10 @@ export class PixiLayerStreetsidePhotos extends AbstractLayer {
 
 
   filterSequences(sequences) {
-    const fromDate = this.context.photos().fromDate;
-    const toDate = this.context.photos().toDate;
-    const usernames = this.context.photos().usernames;
+    const photoSystem = this.context.photoSystem();
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
+    const usernames = photoSystem.usernames;
 
     if (fromDate) {
       const fromTimestamp = new Date(fromDate).getTime();
@@ -101,7 +92,7 @@ export class PixiLayerStreetsidePhotos extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   renderMarkers(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('streetside');
     if (!service) return;
 
     const parentContainer = this.scene.groups.get('streetview');
@@ -169,21 +160,12 @@ export class PixiLayerStreetsidePhotos extends AbstractLayer {
    * @param  zoom         Effective zoom to use for rendering
    */
   render(frame, projection, zoom) {
-    const service = this.getService();
+    const service = this.context.services.get('streetside');
     if (!this.enabled || !service || zoom < MINZOOM) return;
 
     service.loadBubbles(this.context.projection);  // note: context.projection !== pixi projection
     this.renderMarkers(frame, projection, zoom);
   }
 
-
-  /**
-   * supported
-   * Whether the Layer's service exists
-   */
-  get supported() {
-    return !!this.getService();
-  }
-
 }
 
diff --git a/modules/pixi/PixiRenderer.js b/modules/pixi/PixiRenderer.js
index 79d017b847..63dfd5a15a 100644
--- a/modules/pixi/PixiRenderer.js
+++ b/modules/pixi/PixiRenderer.js
@@ -65,7 +65,7 @@ export class PixiRenderer extends EventEmitter {
     // Make sure callbacks have `this` bound correctly
     this._tick = this._tick.bind(this);
     this._onHoverChange = this._onHoverChange.bind(this);
-    this._onSelectChange = this._onSelectChange.bind(this);
+    this._onModeChange = this._onModeChange.bind(this);
 
     // Disable mipmapping, we always want textures near the resolution they are at.
     PIXI.BaseTexture.defaultOptions.mipmap = PIXI.MIPMAP_MODES.OFF;
@@ -144,36 +144,25 @@ export class PixiRenderer extends EventEmitter {
     this.textures = _sharedTextures;
 
     // Event listeners to respond to any changes in selection or hover
-    context.on('enter.PixiRenderer', this._onSelectChange);
-    context.behaviors.get('hover').on('hoverchanged', this._onHoverChange);
+    context.on('modechange', this._onModeChange);
+    context.behaviors.get('hover').on('hoverchange', this._onHoverChange);
   }
 
 
   /**
-   * _onSelectChange
-   * Respond to any change in select (called on mode change)
+   * _onModeChange
+   * Respond to any change in selection (called on mode change)
    */
-  _onSelectChange() {
-    const selectedIDs = Array.from(this.context.selectedIDs());
-    const selectedData = this.context.selectedData();
+  _onModeChange(mode) {
     this.scene.clearClass('selected');
 
-    // hacky conversion to get around the id mismatch:
-    for (let dataID of selectedIDs) {
-      let layerID;
-      if (dataID) {
-        const datum = selectedData.get(dataID);
-        if (!datum) {  // Legacy OSM select mode - there is no selectedData so the id is the id
-          layerID = 'osm';
-        } else if (datum?.__fbid__) {
-          layerID = 'rapid';
-        } else {
-          // there are other selectable things - we will not select-style them for now :(
-        }
-      }
-
-      if (layerID && dataID) {
-        this.scene.classData(layerID, dataID, 'selected');
+    for (const [datumID, datum] of this.context.selectedData()) {
+      if (mode.id === 'select' && datum.__fbid__) {  // a Rapid feature
+        this.scene.classData('rapid', datumID, 'selected');
+      } else if (mode.id === 'select-osm') {         // an OSM feature
+        this.scene.classData('osm', datumID, 'selected');
+      } else {
+        // there are other selectable things - we will not select-style them for now :(
       }
     }
 
@@ -191,8 +180,8 @@ export class PixiRenderer extends EventEmitter {
     const dataID = target?.dataID;
 
     const hoverData = target?.data;
-    const mode = this.context.mode();
-    if (mode?.id !== 'select') {
+    const modeID = this.context.mode()?.id;
+    if (modeID !== 'select' && modeID !== 'select-osm') {
       this.context.ui().sidebar.hover(hoverData ? [hoverData] : []);
     }
 
@@ -410,7 +399,7 @@ export class PixiRenderer extends EventEmitter {
     const pixiProjection = this.pixiProjection;
     const currTransform = context.projection.transform();
     const pixiTransform = pixiProjection.transform();
-    const effectiveZoom = context.map().effectiveZoom();
+    const effectiveZoom = context.mapSystem().effectiveZoom();
 
     let offset;
     if (pixiTransform.k !== currTransform.k) {    // zoom changed, reset
diff --git a/modules/presets/category.js b/modules/presets/category.js
deleted file mode 100644
index aadecbbd47..0000000000
--- a/modules/presets/category.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { t } from '../core/localizer';
-import { presetCollection } from './collection';
-
-
-//
-// `presetCategory` builds a `presetCollection` of member presets,
-// decorated with some extra methods for searching and matching geometry
-//
-export function presetCategory(categoryID, category, allPresets) {
-  let _this = Object.assign({}, category);   // shallow copy
-  let _searchName; // cache
-  let _searchNameStripped; // cache
-
-  _this.id = categoryID;
-
-  _this.members = presetCollection(
-    (category.members || []).map(presetID => allPresets[presetID]).filter(Boolean)
-  );
-
-  _this.geometry = _this.members.collection
-    .reduce((acc, preset) => {
-      for (let i in preset.geometry) {
-        const geometry = preset.geometry[i];
-        if (acc.indexOf(geometry) === -1) {
-          acc.push(geometry);
-        }
-      }
-      return acc;
-    }, []);
-
-  _this.matchGeometry = (geom) => _this.geometry.indexOf(geom) >= 0;
-
-  _this.matchAllGeometry = (geometries) => _this.members.collection
-    .some(preset => preset.matchAllGeometry(geometries));
-
-  _this.matchScore = () => -1;
-
-  _this.name = () => t(`_tagging.presets.categories.${categoryID}.name`, { 'default': categoryID });
-  _this.nameLabel = () => t.html(`_tagging.presets.categories.${categoryID}.name`, { 'default': categoryID });
-
-  _this.terms = () => [];
-
-  _this.searchName = () => {
-    if (!_searchName) {
-      _searchName = (_this.suggestion ? _this.originalName : _this.name()).toLowerCase();
-    }
-    return _searchName;
-  };
-
-  _this.searchNameStripped = () => {
-    if (!_searchNameStripped) {
-      _searchNameStripped = _this.searchName();
-      // split combined diacritical characters into their parts
-      if (_searchNameStripped.normalize) _searchNameStripped = _searchNameStripped.normalize('NFD');
-      // remove diacritics
-      _searchNameStripped = _searchNameStripped.replace(/[\u0300-\u036f]/g, '');
-    }
-    return _searchNameStripped;
-  };
-
-  _this.searchAliases = () => [];
-  _this.searchAliasesStripped = () => [];
-
-  return _this;
-}
diff --git a/modules/presets/field.js b/modules/presets/field.js
deleted file mode 100644
index 2613e374c7..0000000000
--- a/modules/presets/field.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { utilSafeString } from '@rapid-sdk/util';
-
-import { localizer, t } from '../core/localizer';
-
-
-//
-// `presetField` decorates a given `field` Object
-// with some extra methods for searching and matching geometry
-//
-export function presetField(fieldID, field, allFields) {
-  allFields = allFields || {};
-  let _this = Object.assign({}, field);   // shallow copy
-
-  _this.id = fieldID;
-
-  // for use in classes, element ids, css selectors
-  _this.safeid = utilSafeString(fieldID);
-
-  _this.matchGeometry = (geom) => !_this.geometry || _this.geometry.indexOf(geom) !== -1;
-
-  _this.matchAllGeometry = (geometries) => {
-    return !_this.geometry || geometries.every(geom => _this.geometry.indexOf(geom) !== -1);
-  };
-
-  _this.t = (scope, options) => t(`_tagging.presets.fields.${fieldID}.${scope}`, options);
-  _this.t.html = (scope, options) => t.html(`_tagging.presets.fields.${fieldID}.${scope}`, options);
-  _this.t.append = (scope, options) => t.append(`_tagging.presets.fields.${fieldID}.${scope}`, options);
-  _this.hasTextForStringId = (scope) => localizer.hasTextForStringId(`_tagging.presets.fields.${fieldID}.${scope}`);
-
-  _this.resolveReference = (prop) => {
-    const referenceRegex = /^\{(.*)\}$/;
-    const match = (field[prop] || '').match(referenceRegex);
-    if (match) {
-      const field = allFields[match[1]];
-      if (field) {
-        return field;
-      }
-      console.error(`Unable to resolve referenced field: ${match[1]}`);  // eslint-disable-line no-console
-    }
-    return _this;
-  };
-
-  _this.title = () => _this.resolveReference('label').t('label', { 'default': fieldID });
-  _this.label = () => _this.resolveReference('label').t.html('label', { 'default': fieldID });
-  // _this.label = () => _this.resolveReference('label').t.append('label', { 'default': fieldID });  // someday?
-
-  _this.originalPlaceholder = (_this.placeholder || '');
-  _this.placeholder = () => _this.resolveReference('placeholder').t('placeholder', { 'default': _this.originalPlaceholder });
-
-  _this.originalTerms = (_this.terms || []).join();
-  _this.terms = () => _this.resolveReference('label').t('terms', { 'default': _this.originalTerms })
-    .toLowerCase().trim().split(/\s*,+\s*/);
-
-  _this.increment = _this.type === 'number' ? (_this.increment || 1) : undefined;
-
-  return _this;
-}
diff --git a/modules/presets/index.js b/modules/presets/index.js
deleted file mode 100644
index 1140c9b6ec..0000000000
--- a/modules/presets/index.js
+++ /dev/null
@@ -1,681 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { utilArrayUniq } from '@rapid-sdk/util';
-
-import { prefs } from '../core/preferences';
-import { fileFetcher } from '../core/file_fetcher';
-import { locationManager } from '../core/LocationManager';
-import { osmNodeGeometriesForTags, osmSetAreaKeys, osmSetPointTags, osmSetVertexTags } from '../osm/tags';
-import { presetCategory } from './category';
-import { presetCollection } from './collection';
-import { presetField } from './field';
-import { presetPreset } from './preset';
-import { utilRebind } from '../util';
-import { uiFields } from '../ui/fields';
-
-export { presetCategory };
-export { presetCollection };
-export { presetField };
-export { presetPreset };
-
-let _mainPresetIndex = presetIndex(); // singleton
-export { _mainPresetIndex as presetManager };
-
-// warn about v6 preset featues we don't support currently
-const VERBOSE = true;
-
-//
-// `presetIndex` wraps a `presetCollection`
-// with methods for loading new data and returning defaults
-//
-export function presetIndex() {
-  const dispatch = d3_dispatch('favoritePreset', 'recentsChange');
-  const MAXRECENTS = 30;         // how many recents to store in localstorage
-  const MAXRECENTS_SHOW = 6;     // how many recents to show on the preset list
-
-
-  // seed the preset lists with geometry fallbacks
-  const POINT = presetPreset('point', { name: 'Point', tags: {}, geometry: ['point', 'vertex'], matchScore: 0.1 } );
-  const LINE = presetPreset('line', { name: 'Line', tags: {}, geometry: ['line'], matchScore: 0.1 } );
-  const AREA = presetPreset('area', { name: 'Area', tags: { area: 'yes' }, geometry: ['area'], matchScore: 0.1 } );
-  const RELATION = presetPreset('relation', { name: 'Relation', tags: {}, geometry: ['relation'], matchScore: 0.1 } );
-
-  let _this = presetCollection([POINT, LINE, AREA, RELATION]);
-  let _presets = { point: POINT, line: LINE, area: AREA, relation: RELATION };
-
-  let _defaults = {
-    point: presetCollection([POINT]),
-    vertex: presetCollection([POINT]),
-    line: presetCollection([LINE]),
-    area: presetCollection([AREA]),
-    relation: presetCollection([RELATION])
-  };
-
-  let _fields = {};
-  let _categories = {};
-  let _universal = [];
-  let _addablePresetIDs = null;   // Set of preset IDs that the user can add
-  let _recents;
-  let _favorites;
-
-  // Index of presets by (geometry, tag key).
-  let _geometryIndex = { point: {}, vertex: {}, line: {}, area: {}, relation: {} };
-  let _loadPromise;
-
-
-  _this.ensureLoaded = () => {
-    if (_loadPromise) return _loadPromise;
-
-    return _loadPromise = Promise.all([
-        fileFetcher.get('preset_categories'),
-        fileFetcher.get('preset_defaults'),
-        fileFetcher.get('preset_presets'),
-        fileFetcher.get('preset_fields')
-      ])
-      .then(vals => {
-        _this.merge({
-          categories: vals[0],
-          defaults: vals[1],
-          presets: vals[2],
-          fields: vals[3]
-        });
-        osmSetAreaKeys(_this.areaKeys());
-        osmSetPointTags(_this.pointTags());
-        osmSetVertexTags(_this.vertexTags());
-      });
-  };
-
-
-  // `merge` accepts an object containing new preset data (all properties optional):
-  // {
-  //   fields: {},
-  //   presets: {},
-  //   categories: {},
-  //   defaults: {},
-  //   featureCollection: {}
-  //}
-  _this.merge = (d) => {
-    let newLocationSets = [];
-
-    // Merge Fields
-    if (d.fields) {
-      Object.keys(d.fields).forEach(fieldID => {
-        let f = d.fields[fieldID];
-
-        if (f) {   // add or replace
-// field type not supported
-if (!uiFields[f.type]) {
-  if (VERBOSE) console.warn(`"${f.type}" type not supported for ${fieldID}`);  // eslint-disable-line no-console
-  return;
-}
-          f = presetField(fieldID, f, _fields);
-          if (f.locationSet) newLocationSets.push(f);
-          _fields[fieldID] = f;
-
-        } else {   // remove
-          delete _fields[fieldID];
-        }
-      });
-    }
-
-    // Merge Presets
-    if (d.presets) {
-      Object.keys(d.presets).forEach(presetID => {
-        let p = d.presets[presetID];
-
-        if (p) {   // add or replace
-          const isAddable = !_addablePresetIDs || _addablePresetIDs.has(presetID);
-
-// Rename icon identifiers to match the rapid spritesheet
-if (p.icon) p.icon = p.icon.replace(/^iD-/, 'rapid-');
-
-// A few overrides to use better icons than the ones provided by the id-tagging-schema project
-if (presetID === 'address') p.icon ='maki-circle-stroked';
-if (presetID === 'highway/crossing/traffic_signals') p.icon ='temaki-pedestrian_crosswalk';
-
-          p = presetPreset(presetID, p, isAddable, _fields, _presets);
-          if (p.locationSet) newLocationSets.push(p);
-          _presets[presetID] = p;
-
-        } else {   // remove (but not if it's a fallback)
-          const existing = _presets[presetID];
-          if (existing && !existing.isFallback()) {
-            delete _presets[presetID];
-          }
-        }
-      });
-    }
-
-    // Merge Categories
-    if (d.categories) {
-      Object.keys(d.categories).forEach(categoryID => {
-        let c = d.categories[categoryID];
-
-        if (c) {   // add or replace
-// Rename icon identifiers to match the rapid spritesheet
-if (c.icon) c.icon = c.icon.replace(/^iD-/, 'rapid-');
-          c = presetCategory(categoryID, c, _presets);
-          if (c.locationSet) newLocationSets.push(c);
-          _categories[categoryID] = c;
-
-        } else {   // remove
-          delete _categories[categoryID];
-        }
-      });
-    }
-
-    // Rebuild _this.collection after changing presets and categories
-    _this.collection = Object.values(_presets).concat(Object.values(_categories));
-
-    // Merge Defaults
-    if (d.defaults) {
-      Object.keys(d.defaults).forEach(geometry => {
-        const def = d.defaults[geometry];
-        if (Array.isArray(def)) {   // add or replace
-          _defaults[geometry] = presetCollection(
-            def.map(id => _presets[id] || _categories[id]).filter(Boolean)
-          );
-        } else {   // remove
-          delete _defaults[geometry];
-        }
-      });
-    }
-
-    // Rebuild universal fields array
-    _universal = Object.values(_fields).filter(field => field.universal);
-
-    // Reset all the preset fields - they'll need to be resolved again
-    Object.values(_presets).forEach(preset => preset.resetFields());
-
-    // Rebuild geometry index
-    _geometryIndex = { point: {}, vertex: {}, line: {}, area: {}, relation: {} };
-    _this.collection.forEach(preset => {
-      (preset.geometry || []).forEach(geometry => {
-        let g = _geometryIndex[geometry];
-        for (let key in preset.tags) {
-          g[key] = g[key] || {};
-          let value = preset.tags[key];
-          (g[key][value] = g[key][value] || []).push(preset);
-        }
-      });
-    });
-
-    // Merge Custom Features
-    if (d.featureCollection && Array.isArray(d.featureCollection.features)) {
-      locationManager.mergeCustomGeoJSON(d.featureCollection);
-    }
-
-    // Resolve all locationSet features.
-    if (newLocationSets.length) {
-      locationManager.mergeLocationSets(newLocationSets);
-    }
-
-    return _this;
-  };
-
-
-  _this.match = (entity, resolver) => {
-    return resolver.transient(entity, 'presetMatch', () => {
-      let geometry = entity.geometry(resolver);
-      // Treat entities on addr:interpolation lines as points, not vertices - #3241
-      if (geometry === 'vertex' && entity.isOnAddressLine(resolver)) {
-        geometry = 'point';
-      }
-      const entityExtent = entity.extent(resolver);
-      return _this.matchTags(entity.tags, geometry, entityExtent.center());
-    });
-  };
-
-
-  _this.matchTags = (tags, geometry, loc) => {
-    const keyIndex = _geometryIndex[geometry];
-    let bestScore = -1;
-    let bestMatch;
-    let matchCandidates = [];
-
-    for (let k in tags) {
-      let indexMatches = [];
-
-      let valueIndex = keyIndex[k];
-      if (!valueIndex) continue;
-
-      let keyValueMatches = valueIndex[tags[k]];
-      if (keyValueMatches) indexMatches.push(...keyValueMatches);
-      let keyStarMatches = valueIndex['*'];
-      if (keyStarMatches) indexMatches.push(...keyStarMatches);
-
-      if (indexMatches.length === 0) continue;
-
-      for (let i = 0; i < indexMatches.length; i++) {
-        const candidate = indexMatches[i];
-        const score = candidate.matchScore(tags);
-
-        if (score === -1){
-          continue;
-        }
-        matchCandidates.push({score, candidate});
-
-        if (score > bestScore) {
-          bestScore = score;
-          bestMatch = candidate;
-        }
-      }
-    }
-
-    if (bestMatch && bestMatch.locationSetID && bestMatch.locationSetID !== '+[Q2]' && Array.isArray(loc)) {
-      const validHere = locationManager.locationSetsAt(loc);
-      if (!validHere[bestMatch.locationSetID]) {
-        matchCandidates.sort((a, b) => (a.score < b.score) ? 1 : -1);
-        for (let i = 0; i < matchCandidates.length; i++){
-          const candidateScore = matchCandidates[i];
-          if (!candidateScore.candidate.locationSetID || validHere[candidateScore.candidate.locationSetID]) {
-            bestMatch = candidateScore.candidate;
-            bestScore = candidateScore.score;
-            break;
-          }
-        }
-      }
-    }
-
-    // If any part of an address is present, allow fallback to "Address" preset - #4353
-    if (!bestMatch || bestMatch.isFallback()) {
-      for (let k in tags){
-          if (/^addr:/.test(k) && keyIndex['addr:*'] && keyIndex['addr:*']['*']) {
-            bestMatch = keyIndex['addr:*']['*'][0];
-            break;
-          }
-      }
-    }
-
-    return bestMatch || _this.fallback(geometry);
-  };
-
-  _this.allowsVertex = (entity, resolver) => {
-    if (entity.type !== 'node') return false;
-    if (Object.keys(entity.tags).length === 0) return true;
-
-    return resolver.transient(entity, 'vertexMatch', () => {
-      // address lines allow vertices to act as standalone points
-      if (entity.isOnAddressLine(resolver)) return true;
-
-      const geometries = osmNodeGeometriesForTags(entity.tags);
-      if (geometries.vertex) return true;
-      if (geometries.point) return false;
-      // allow vertices for unspecified points
-      return true;
-    });
-  };
-
-
-  // Because of the open nature of tagging, we will never have a complete
-  // list of tags used in OSM, so we want it to have logic like "assume
-  // that a closed way with an amenity tag is an area, unless the amenity
-  // is one of these specific types". This function computes a structure
-  // that allows testing of such conditions, based on the presets designated
-  // as as supporting (or not supporting) the area geometry.
-  //
-  // The returned object L is a keeplist/discardlist of tags. A closed way
-  // with a tag (k, v) is considered to be an area if `k in L && !(v in L[k])`
-  // (see `Way#isArea()`). In other words, the keys of L form the keeplist,
-  // and the subkeys form the discardlist.
-  _this.areaKeys = () => {
-    // The ignore list is for keys that imply lines. (We always add `area=yes` for exceptions)
-    const ignore = ['barrier', 'highway', 'footway', 'railway', 'junction', 'type'];
-    let areaKeys = {};
-
-    // ignore name-suggestion-index and deprecated presets
-    const presets = _this.collection.filter(p => !p.suggestion && !p.replacement);
-
-    // keeplist
-    presets.forEach(p => {
-      const keys = p.tags && Object.keys(p.tags);
-      const key = keys && keys.length && keys[0];  // pick the first tag
-      if (!key) return;
-      if (ignore.indexOf(key) !== -1) return;
-
-      if (p.geometry.indexOf('area') !== -1) {    // probably an area..
-        areaKeys[key] = areaKeys[key] || {};
-      }
-    });
-
-    // discardlist
-    presets.forEach(p => {
-      let key;
-      for (key in p.addTags) {
-        // examine all addTags to get a better sense of what can be tagged on lines - #6800
-        const value = p.addTags[key];
-        if (key in areaKeys &&                    // probably an area...
-          p.geometry.indexOf('line') !== -1 &&    // but sometimes a line
-          value !== '*') {
-          areaKeys[key][value] = true;
-        }
-      }
-    });
-
-    return areaKeys;
-  };
-
-
-  _this.pointTags = () => {
-    return _this.collection.reduce((pointTags, d) => {
-      // ignore name-suggestion-index, deprecated, and generic presets
-      if (d.suggestion || d.replacement || d.searchable === false) return pointTags;
-
-      // only care about the primary tag
-      const keys = d.tags && Object.keys(d.tags);
-      const key = keys && keys.length && keys[0];  // pick the first tag
-      if (!key) return pointTags;
-
-      // if this can be a point
-      if (d.geometry.indexOf('point') !== -1) {
-        pointTags[key] = pointTags[key] || {};
-        pointTags[key][d.tags[key]] = true;
-      }
-      return pointTags;
-    }, {});
-  };
-
-
-  _this.vertexTags = () => {
-    return _this.collection.reduce((vertexTags, d) => {
-      // ignore name-suggestion-index, deprecated, and generic presets
-      if (d.suggestion || d.replacement || d.searchable === false) return vertexTags;
-
-      // only care about the primary tag
-      const keys = d.tags && Object.keys(d.tags);
-      const key = keys && keys.length && keys[0];  // pick the first tag
-      if (!key) return vertexTags;
-
-      // if this can be a vertex
-      if (d.geometry.indexOf('vertex') !== -1) {
-        vertexTags[key] = vertexTags[key] || {};
-        vertexTags[key][d.tags[key]] = true;
-      }
-      return vertexTags;
-    }, {});
-  };
-
-
-  _this.field = (id) => _fields[id];
-
-  _this.universal = () => _universal;
-
-
-  _this.defaults = (geometry, n, startWithRecents, loc) => {
-    let recents = [];
-    if (startWithRecents) {
-      recents = _this.recent().matchGeometry(geometry).collection.slice(0, MAXRECENTS_SHOW);
-    }
-
-    let defaults;
-    if (_addablePresetIDs) {
-      defaults = Array.from(_addablePresetIDs).map(function(id) {
-        var preset = _this.item(id);
-        if (preset && preset.matchGeometry(geometry)) return preset;
-        return null;
-      }).filter(Boolean);
-    } else {
-      defaults = _defaults[geometry].collection.concat(_this.fallback(geometry));
-    }
-
-    let result = presetCollection(
-      utilArrayUniq(recents.concat(defaults)).slice(0, n - 1)
-    );
-
-    if (Array.isArray(loc)) {
-      const validHere = locationManager.locationSetsAt(loc);
-      result.collection = result.collection.filter(a => !a.locationSetID || validHere[a.locationSetID]);
-    }
-
-    return result;
-  };
-
-  // pass a Set of addable preset ids
-  _this.addablePresetIDs = function(val) {
-    if (!arguments.length) return _addablePresetIDs;
-
-    // accept and convert arrays
-    if (Array.isArray(val)) val = new Set(val);
-
-    _addablePresetIDs = val;
-    if (_addablePresetIDs) {   // reset all presets
-      _this.collection.forEach(p => {
-        // categories aren't addable
-        if (p.addable) p.addable(_addablePresetIDs.has(p.id));
-      });
-    } else {
-      _this.collection.forEach(p => {
-        if (p.addable) p.addable(true);
-      });
-    }
-
-    return _this;
-  };
-
-
-  _this.recent = () => {
-    return presetCollection(
-      utilArrayUniq(_this.getRecents().map(d => d.preset))
-    );
-  };
-
-
-  function RibbonItem(preset, source) {
-    let item = {};
-    item.preset = preset;
-    item.source = source;
-
-    item.isFavorite = () => item.source === 'favorite';
-    item.isRecent = () => item.source === 'recent';
-    item.matches = (preset) => item.preset.id === preset.id;
-    item.minified = () => ({ pID: item.preset.id });
-
-    return item;
-  }
-
-
-  function ribbonItemForMinified(d, source) {
-    if (d && d.pID) {
-      const preset = _this.item(d.pID);
-      if (!preset) return null;
-      return RibbonItem(preset, source);
-    }
-    return null;
-  }
-
-
-  _this.getGenericRibbonItems = () => {
-    return ['point', 'line', 'area'].map(id => RibbonItem(_this.item(id), 'generic'));
-  };
-
-
-  _this.getAddable = () => {
-      if (!_addablePresetIDs) return [];
-
-      return _addablePresetIDs.map((id) => {
-        const preset = _this.item(id);
-        if (preset) return RibbonItem(preset, 'addable');
-        return null;
-      }).filter(Boolean);
-  };
-
-
-  function setRecents(items) {
-    _recents = items;
-    const minifiedItems = items.map(d => d.minified());
-    prefs('preset_recents', JSON.stringify(minifiedItems));
-    dispatch.call('recentsChange');
-  }
-
-
-  _this.getRecents = () => {
-    if (!_recents) {
-      // fetch from local storage
-      _recents = (JSON.parse(prefs('preset_recents')) || [])
-        .reduce((acc, d) => {
-          let item = ribbonItemForMinified(d, 'recent');
-          if (item && item.preset.addable()) acc.push(item);
-          return acc;
-        }, []);
-    }
-    return _recents;
-  };
-
-
-  _this.addRecent = (preset, besidePreset, after) => {
-    const recents = _this.getRecents();
-
-    const beforeItem = _this.recentMatching(besidePreset);
-    let toIndex = recents.indexOf(beforeItem);
-    if (after) toIndex += 1;
-
-    const newItem = RibbonItem(preset, 'recent');
-    recents.splice(toIndex, 0, newItem);
-    setRecents(recents);
-  };
-
-
-  _this.removeRecent = (preset) => {
-    const item = _this.recentMatching(preset);
-    if (item) {
-      let items = _this.getRecents();
-      items.splice(items.indexOf(item), 1);
-      setRecents(items);
-    }
-  };
-
-
-  _this.recentMatching = (preset) => {
-    const items = _this.getRecents();
-    for (let i in items) {
-      if (items[i].matches(preset)) {
-        return items[i];
-      }
-    }
-    return null;
-  };
-
-
-  _this.moveItem = (items, fromIndex, toIndex) => {
-    if (fromIndex === toIndex ||
-      fromIndex < 0 || toIndex < 0 ||
-      fromIndex >= items.length || toIndex >= items.length
-    ) return null;
-
-    items.splice(toIndex, 0, items.splice(fromIndex, 1)[0]);
-    return items;
-  };
-
-
-  _this.moveRecent = (item, beforeItem) => {
-    const recents = _this.getRecents();
-    const fromIndex = recents.indexOf(item);
-    const toIndex = recents.indexOf(beforeItem);
-    const items = _this.moveItem(recents, fromIndex, toIndex);
-    if (items) setRecents(items);
-  };
-
-
-  _this.setMostRecent = (preset) => {
-    if (preset.searchable === false) return;
-
-    let items = _this.getRecents();
-    let item = _this.recentMatching(preset);
-    if (item) {
-      items.splice(items.indexOf(item), 1);
-    } else {
-      item = RibbonItem(preset, 'recent');
-    }
-
-    // remove the last recent (first in, first out)
-    while (items.length >= MAXRECENTS) {
-      items.pop();
-    }
-
-    // prepend array
-    items.unshift(item);
-    setRecents(items);
-  };
-
-  function setFavorites(items) {
-    _favorites = items;
-    const minifiedItems = items.map(d => d.minified());
-    prefs('preset_favorites', JSON.stringify(minifiedItems));
-
-    // call update
-    dispatch.call('favoritePreset');
-  }
-
-  _this.addFavorite = (preset, besidePreset, after) => {
-      const favorites = _this.getFavorites();
-
-      const beforeItem = _this.favoriteMatching(besidePreset);
-      let toIndex = favorites.indexOf(beforeItem);
-      if (after) toIndex += 1;
-
-      const newItem = RibbonItem(preset, 'favorite');
-      favorites.splice(toIndex, 0, newItem);
-      setFavorites(favorites);
-  };
-
-  _this.toggleFavorite = (preset) => {
-    const favs = _this.getFavorites();
-    const favorite = _this.favoriteMatching(preset);
-    if (favorite) {
-      favs.splice(favs.indexOf(favorite), 1);
-    } else {
-      // only allow 10 favorites
-      if (favs.length === 10) {
-          // remove the last favorite (last in, first out)
-          favs.pop();
-      }
-      // append array
-      favs.push(RibbonItem(preset, 'favorite'));
-    }
-    setFavorites(favs);
-  };
-
-
-  _this.removeFavorite = (preset) => {
-    const item = _this.favoriteMatching(preset);
-    if (item) {
-      const items = _this.getFavorites();
-      items.splice(items.indexOf(item), 1);
-      setFavorites(items);
-    }
-  };
-
-
-  _this.getFavorites = () => {
-    if (!_favorites) {
-
-      // fetch from local storage
-      let rawFavorites = JSON.parse(prefs('preset_favorites'));
-
-      if (!rawFavorites) {
-        rawFavorites = [];
-        prefs('preset_favorites', JSON.stringify(rawFavorites));
-      }
-
-      _favorites = rawFavorites.reduce((output, d) => {
-        const item = ribbonItemForMinified(d, 'favorite');
-        if (item && item.preset.addable()) output.push(item);
-        return output;
-      }, []);
-    }
-    return _favorites;
-  };
-
-
-  _this.favoriteMatching = (preset) => {
-    const favs = _this.getFavorites();
-    for (let index in favs) {
-      if (favs[index].matches(preset)) {
-        return favs[index];
-      }
-    }
-    return null;
-  };
-
-
-  return utilRebind(_this, dispatch, 'on');
-}
diff --git a/modules/presets/preset.js b/modules/presets/preset.js
deleted file mode 100644
index 6758f219b4..0000000000
--- a/modules/presets/preset.js
+++ /dev/null
@@ -1,362 +0,0 @@
-import { utilArrayUniq, utilObjectOmit, utilSafeString } from '@rapid-sdk/util';
-
-import { t } from '../core/localizer';
-import { osmAreaKeys } from '../osm/tags';
-
-
-//
-// `presetPreset` decorates a given `preset` Object
-// with some extra methods for searching and matching geometry
-//
-export function presetPreset(presetID, preset, addable, allFields, allPresets) {
-  allFields = allFields || {};
-  allPresets = allPresets || {};
-
-  let _this = Object.assign({}, preset);   // shallow copy
-  let _addable = addable || false;
-  let _resolved = { fields: null, moreFields: null };  // cache
-  let _searchName;            // cache
-  let _searchNameStripped;    // cache
-  let _searchAliases;         // cache
-  let _searchAliasesStripped; // cache
-
-  const referenceRegex = /^\{(.*)\}$/;
-
-  _this.id = presetID;
-
-  _this.safeid = utilSafeString(presetID);  // for use in css classes, selectors, element ids
-
-  _this.originalTerms = (_this.terms || []).join();
-
-  _this.originalName = _this.name || '';
-
-  _this.originalAliases = (_this.aliases || []).join('\n');
-
-  _this.originalScore = _this.matchScore || 1;
-
-  _this.originalReference = _this.reference || {};
-
-  _this.originalFields = (_this.fields || []);
-
-  _this.originalMoreFields = (_this.moreFields || []);
-
-  _this.fields = () => _resolved.fields || (_resolved.fields = resolveFields('fields'));
-
-  _this.moreFields = () => _resolved.moreFields || (_resolved.moreFields = resolveFields('moreFields'));
-
-  _this.resetFields = () => _resolved = { fields: null, moreFields: null };
-
-  _this.tags = _this.tags || {};
-
-  _this.addTags = _this.addTags || _this.tags;
-
-  _this.removeTags = _this.removeTags || _this.addTags;
-
-  _this.geometry = (_this.geometry || []);
-
-  _this.matchGeometry = (geom) => _this.geometry.indexOf(geom) >= 0;
-
-  _this.matchAllGeometry = (geoms) => geoms.every(_this.matchGeometry);
-
-  _this.matchScore = (entityTags) => {
-    const tags = _this.tags;
-    let seen = {};
-    let score = 0;
-
-    // match on tags
-    for (let k in tags) {
-      seen[k] = true;
-      if (entityTags[k] === tags[k]) {
-        score += _this.originalScore;
-      } else if (tags[k] === '*' && k in entityTags) {
-        score += _this.originalScore / 2;
-      } else {
-        return -1;
-      }
-    }
-
-    // boost score for additional matches in addTags - #6802
-    const addTags = _this.addTags;
-    for (let k in addTags) {
-      if (!seen[k] && entityTags[k] === addTags[k]) {
-        score += _this.originalScore;
-      }
-    }
-
-    return score;
-  };
-
-
-  _this.t = (scope, options) => {
-    return t(`_tagging.presets.presets.${presetID}.${scope}`, options);
-  };
-
-  _this.t.html = (scope, options) => {
-    return t.html(`_tagging.presets.presets.${presetID}.${scope}`, options);
-  };
-
-  _this.t.append = (scope, options) => {
-    return t.append(`_tagging.presets.presets.${presetID}.${scope}`, options);
-  };
-
-  _this.name = () => {
-    return resolveName('originalName').t('name', { 'default': _this.originalName || presetID });
-  };
-
-  _this.nameLabel = () => {
-    return resolveName('originalName').t.html('name', { 'default': _this.originalName || presetID });
-    // return resolveName('originalName').t.append('name', { 'default': _this.originalName || presetID });  // someday?
-  };
-
-  _this.subtitle = () => {
-    if (_this.suggestion) {
-      let path = presetID.split('/');
-      path.pop();  // remove brand name
-      return t('_tagging.presets.presets.' + path.join('/') + '.name');
-    }
-    return null;
-  };
-
-  _this.subtitleLabel = () => {
-    if (_this.suggestion) {
-      let path = presetID.split('/');
-      path.pop();  // remove brand name
-      return t.html('_tagging.presets.presets.' + path.join('/') + '.name');
-    }
-    return null;
-  };
-
-
-  _this.aliases = () => {
-    return resolveName('originalName')
-      .t('aliases', { 'default': _this.originalAliases }).trim().split(/\s*[\r\n]+\s*/);
-  };
-
-
-  _this.terms = () => {
-    return resolveName('originalName')
-      .t('terms', { 'default': _this.originalTerms })
-      .toLowerCase().trim().split(/\s*,+\s*/);
-  };
-
-
-  _this.searchName = () => {
-    if (!_searchName) {
-      _searchName = (_this.suggestion ? _this.originalName : _this.name()).toLowerCase();
-    }
-    return _searchName;
-  };
-
-
-  _this.searchNameStripped = () => {
-    if (!_searchNameStripped) {
-      _searchNameStripped = stripDiacritics(_this.searchName());
-    }
-    return _searchNameStripped;
-  };
-
-
-  _this.searchAliases = () => {
-    if (!_searchAliases) {
-      _searchAliases = _this.aliases().map(alias => alias.toLowerCase());
-    }
-    return _searchAliases;
-  };
-
-
-  _this.searchAliasesStripped = () => {
-    if (!_searchAliasesStripped) {
-      _searchAliasesStripped = _this.searchAliases();
-      _searchAliasesStripped = _searchAliasesStripped.map(stripDiacritics);
-    }
-    return _searchAliasesStripped;
-  };
-
-
-  _this.isFallback = () => {
-    const tagCount = Object.keys(_this.tags).length;
-    return tagCount === 0 || (tagCount === 1 && _this.tags.hasOwnProperty('area'));
-  };
-
-
-  _this.addable = function(val) {
-    if (!arguments.length) return _addable;
-    _addable = val;
-    return _this;
-  };
-
-
-  _this.reference = () => {
-    // Lookup documentation on Wikidata...
-    const qid = (
-      _this.tags.wikidata ||
-      _this.tags['flag:wikidata'] ||
-      _this.tags['brand:wikidata'] ||
-      _this.tags['network:wikidata'] ||
-      _this.tags['operator:wikidata']
-    );
-    if (qid) {
-      return { qid: qid };
-    }
-
-    // Lookup documentation on OSM Wikibase...
-    let key = _this.originalReference.key || Object.keys(utilObjectOmit(_this.tags, 'name'))[0];
-    let value = _this.originalReference.value || _this.tags[key];
-
-    if (value === '*') {
-      return { key: key };
-    } else {
-      return { key: key, value: value };
-    }
-  };
-
-
-  _this.unsetTags = (tags, geometry, ignoringKeys, skipFieldDefaults) => {
-    // allow manually keeping some tags
-    let removeTags = ignoringKeys ? utilObjectOmit(_this.removeTags, ignoringKeys) : _this.removeTags;
-    tags = utilObjectOmit(tags, Object.keys(removeTags));
-
-    if (geometry && !skipFieldDefaults) {
-      _this.fields().forEach(field => {
-        if (field.matchGeometry(geometry) && field.key && field.default === tags[field.key]) {
-          delete tags[field.key];
-        }
-      });
-    }
-
-    delete tags.area;
-    return tags;
-  };
-
-
-  _this.setTags = (tags, geometry, skipFieldDefaults) => {
-    const addTags = _this.addTags;
-    tags = Object.assign({}, tags);   // shallow copy
-
-    for (let k in addTags) {
-      if (addTags[k] === '*') {
-        // if this tag is ancillary, don't override an existing value since any value is okay
-        if (_this.tags[k] || !tags[k] || tags[k] === 'no') {
-          tags[k] = 'yes';
-        }
-      } else {
-        tags[k] = addTags[k];
-      }
-    }
-
-    // Add area=yes if necessary.
-    // This is necessary if the geometry is already an area (e.g. user drew an area) AND any of:
-    // 1. chosen preset could be either an area or a line (`barrier=city_wall`)
-    // 2. chosen preset doesn't have a key in osmAreaKeys (`railway=station`)
-    if (!addTags.hasOwnProperty('area')) {
-      delete tags.area;
-      if (geometry === 'area') {
-        let needsAreaTag = true;
-        if (_this.geometry.indexOf('line') === -1) {
-          for (let k in addTags) {
-            if (k in osmAreaKeys) {
-              needsAreaTag = false;
-              break;
-            }
-          }
-        }
-        if (needsAreaTag) {
-          tags.area = 'yes';
-        }
-      }
-    }
-
-    if (geometry && !skipFieldDefaults) {
-      _this.fields().forEach(field => {
-        if (field.matchGeometry(geometry) && field.key && !tags[field.key] && field.default) {
-          tags[field.key] = field.default;
-        }
-      });
-    }
-
-    return tags;
-  };
-
-
-  function stripDiacritics(s) {
-    // split combined diacritical characters into their parts
-    if (s.normalize) s = s.normalize('NFD');
-    // remove diacritics
-    s = s.replace(/[\u0300-\u036f]/g, '');
-    return s;
-  }
-
-  // For a preset without its own name, use names from another preset.
-  // Replace {preset} placeholders with the name of the specified presets.
-  function resolveName(prop) {
-    const match = (_this[prop] || '').match(referenceRegex);
-    if (match) {
-      const preset = allPresets[match[1]];
-      if (preset) {
-        return preset;
-      } else {
-        console.warn(`Unable to resolve referenced preset: ${match[1]}.${prop}`);  // eslint-disable-line no-console
-      }
-    }
-    return _this;
-  }
-
-  // For a preset without fields, use the fields of the parent preset.
-  // Replace {preset} placeholders with the fields of the specified presets.
-  function resolveFields(prop) {
-    const fieldIDs = (prop === 'fields' ? _this.originalFields : _this.originalMoreFields);
-    let resolved = [];
-
-    fieldIDs.forEach(fieldID => {
-      const match = fieldID.match(referenceRegex);
-      if (match !== null) {    // a presetID wrapped in braces {}
-        resolved = resolved.concat(inheritFields(match[1], prop));
-      } else if (allFields[fieldID]) {    // a normal fieldID
-        resolved.push(allFields[fieldID]);
-      } else {
-        console.warn(`Cannot resolve "${fieldID}" found in ${_this.id}.${prop}`);  // eslint-disable-line no-console
-      }
-    });
-
-    // no fields resolved, so use the parent's if possible
-    if (!resolved.length) {
-      const endIndex = _this.id.lastIndexOf('/');
-      const parentID = endIndex && _this.id.substring(0, endIndex);
-      if (parentID) {
-        resolved = inheritFields(parentID, prop);
-      }
-    }
-
-    return utilArrayUniq(resolved);
-
-
-    // returns an array of fields to inherit from the given presetID, if found
-    function inheritFields(presetID, prop) {
-      const parent = allPresets[presetID];
-      if (!parent) return [];
-
-      if (prop === 'fields') {
-        return parent.fields().filter(shouldInherit);
-      } else if (prop === 'moreFields') {
-        return parent.moreFields();
-      } else {
-        return [];
-      }
-    }
-
-
-    // Skip `fields` for the keys which define the preset.
-    // These are usually `typeCombo` fields like `shop=*`
-    function shouldInherit(f) {
-      if (f.key && _this.tags[f.key] !== undefined &&
-        // inherit anyway if multiple values are allowed or just a checkbox
-        f.type !== 'multiCombo' && f.type !== 'semiCombo' && f.type !== 'manyCombo' && f.type !== 'check'
-      ) return false;
-
-      return true;
-    }
-  }
-
-
-  return _this;
-}
diff --git a/modules/renderer/features.js b/modules/renderer/features.js
deleted file mode 100644
index 4289ac9c0b..0000000000
--- a/modules/renderer/features.js
+++ /dev/null
@@ -1,628 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { utilArrayGroupBy, utilArrayUnion } from '@rapid-sdk/util';
-
-import { prefs } from '../core/preferences';
-import { osmEntity, osmLifecyclePrefixes } from '../osm';
-import { utilRebind } from '../util/rebind';
-
-
-export function rendererFeatures(context) {
-    var dispatch = d3_dispatch('change');
-    var features = utilRebind({}, dispatch, 'on');
-    var _deferred = new Set();
-
-    var traffic_roads = {
-        'motorway': true,
-        'motorway_link': true,
-        'trunk': true,
-        'trunk_link': true,
-        'primary': true,
-        'primary_link': true,
-        'secondary': true,
-        'secondary_link': true,
-        'tertiary': true,
-        'tertiary_link': true,
-        'residential': true,
-        'unclassified': true,
-        'living_street': true
-    };
-
-    var service_roads = {
-        'busway': true,
-        'service': true,
-        'road': true,
-        'track': true
-    };
-
-    var paths = {
-        'path': true,
-        'footway': true,
-        'cycleway': true,
-        'bridleway': true,
-        'steps': true,
-        'pedestrian': true
-    };
-
-    var _cullFactor = 1;
-    var _cache = {};
-    var _rules = {};
-    var _stats = {};
-    var _keys = [];
-    var _hidden = [];
-    var _forceVisible = {};
-
-
-
-    /**
-     * _hashchange
-     * Respond to any changes appearing in the url hash
-     * @param  q   Object containing key/value pairs of the current query parameters
-     */
-    function _hashchange(q) {
-      // disable_features
-      let toDisableIDs = new Set();
-      if (typeof q.disable_features === 'string') {
-        toDisableIDs = new Set(q.disable_features.replace(/;/g, ',').split(','));
-      }
-
-      let didChange = false;
-      for (const k in _rules) {
-        if (_rules[k].enabled && toDisableIDs.has(k)) {
-          _rules[k].disable();
-          didChange = true;
-        } else if (!_rules[k].enabled && !toDisableIDs.has(k)) {
-          _rules[k].enable();
-          didChange = true;
-        }
-      }
-
-      if (didChange) {
-        update();
-      }
-    }
-
-
-    /**
-     *  update
-     *  Called whenever the enabled/disabled rules change
-     *  Used to push changes in state to the urlhash and the localStorage
-     */
-    function update() {
-      const ruleIDs = features.disabled().join(',');
-
-      // update url hash
-      const urlhash = context.urlhash();
-      urlhash.setParam('disable_features', ruleIDs.length ? ruleIDs : null);
-
-      // update localstorage
-      prefs('disabled-features', ruleIDs);
-
-      _hidden = features.hidden();
-      dispatch.call('change');
-    }
-
-
-    /**
-     *  defineRule
-     */
-    function defineRule(k, filter, max) {
-        var isEnabled = true;
-
-        _keys.push(k);
-        _rules[k] = {
-            filter: filter,
-            enabled: isEnabled,   // whether the user wants it enabled..
-            count: 0,
-            currentMax: (max || Infinity),
-            defaultMax: (max || Infinity),
-            enable: function() { this.enabled = true; this.currentMax = this.defaultMax; },
-            disable: function() { this.enabled = false; this.currentMax = 0; },
-            hidden: function() {
-                return (this.count === 0 && !this.enabled) ||
-                    this.count > this.currentMax * _cullFactor;
-            },
-            autoHidden: function() { return this.hidden() && this.currentMax > 0; }
-        };
-    }
-
-
-    defineRule('points', function isPoint(tags, geometry) {
-        return geometry === 'point';
-    }, 200);
-
-    defineRule('traffic_roads', function isTrafficRoad(tags) {
-        return traffic_roads[tags.highway];
-    });
-
-    defineRule('service_roads', function isServiceRoad(tags) {
-        return service_roads[tags.highway];
-    });
-
-    defineRule('paths', function isPath(tags) {
-        return paths[tags.highway];
-    });
-
-    defineRule('buildings', function isBuilding(tags) {
-        return (
-            (!!tags.building && tags.building !== 'no') ||
-            tags.parking === 'multi-storey' ||
-            tags.parking === 'sheds' ||
-            tags.parking === 'carports' ||
-            tags.parking === 'garage_boxes'
-        );
-    }, 250);
-
-    defineRule('building_parts', function isBuildingPart(tags) {
-        return tags['building:part'];
-    });
-
-    defineRule('indoor', function isIndoor(tags) {
-        return tags.indoor;
-    });
-
-    defineRule('landuse', function isLanduse(tags, geometry) {
-        return geometry === 'area' &&
-            !_rules.buildings.filter(tags) &&
-            !_rules.building_parts.filter(tags) &&
-            !_rules.indoor.filter(tags) &&
-            !_rules.water.filter(tags) &&
-            !_rules.pistes.filter(tags);
-    });
-
-    defineRule('boundaries', function isBoundary(tags) {
-        return (
-            !!tags.boundary
-        ) && !(
-            traffic_roads[tags.highway] ||
-            service_roads[tags.highway] ||
-            paths[tags.highway] ||
-            tags.waterway ||
-            tags.railway ||
-            tags.landuse ||
-            tags.natural ||
-            tags.building ||
-            tags.power
-        );
-    });
-
-    defineRule('water', function isWater(tags) {
-        return (
-            !!tags.waterway ||
-            tags.natural === 'water' ||
-            tags.natural === 'coastline' ||
-            tags.natural === 'bay' ||
-            tags.landuse === 'pond' ||
-            tags.landuse === 'basin' ||
-            tags.landuse === 'reservoir' ||
-            tags.landuse === 'salt_pond'
-        );
-    });
-
-    defineRule('rail', function isRail(tags) {
-        return (
-            !!tags.railway ||
-            tags.landuse === 'railway'
-        ) && !(
-            traffic_roads[tags.highway] ||
-            service_roads[tags.highway] ||
-            paths[tags.highway]
-        );
-    });
-
-    defineRule('pistes', function isPiste(tags) {
-        return tags['piste:type'];
-    });
-
-    defineRule('aerialways', function isPiste(tags) {
-        return tags.aerialway &&
-            tags.aerialway !== 'yes' &&
-            tags.aerialway !== 'station';
-    });
-
-    defineRule('power', function isPower(tags) {
-        return !!tags.power;
-    });
-
-    // contains a past/future tag, but not in active use as a road/path/cycleway/etc..
-    defineRule('past_future', function isPastFuture(tags) {
-        if (
-            traffic_roads[tags.highway] ||
-            service_roads[tags.highway] ||
-            paths[tags.highway]
-        ) { return false; }
-
-        var strings = Object.keys(tags);
-
-        for (var i = 0; i < strings.length; i++) {
-            var s = strings[i];
-            if (osmLifecyclePrefixes[s] || osmLifecyclePrefixes[tags[s]]) return true;
-        }
-        return false;
-    });
-
-    // Lines or areas that don't match another feature filter.
-    // IMPORTANT: The 'others' feature must be the last one defined,
-    //   so that code in getMatches can skip this test if `hasMatch = true`
-    defineRule('others', function isOther(tags, geometry) {
-        return (geometry === 'line' || geometry === 'area');
-    });
-
-
-
-    features.features = function() {
-        return _rules;
-    };
-
-
-    features.keys = function() {
-        return _keys;
-    };
-
-
-    features.enabled = function(k) {
-        if (!arguments.length) {
-            return _keys.filter(function(k) { return _rules[k].enabled; });
-        }
-        return _rules[k] && _rules[k].enabled;
-    };
-
-
-    features.disabled = function(k) {
-        if (!arguments.length) {
-            return _keys.filter(function(k) { return !_rules[k].enabled; });
-        }
-        return _rules[k] && !_rules[k].enabled;
-    };
-
-
-    features.hidden = function(k) {
-        if (!arguments.length) {
-            return _keys.filter(function(k) { return _rules[k].hidden(); });
-        }
-        return _rules[k] && _rules[k].hidden();
-    };
-
-
-    features.autoHidden = function(k) {
-        if (!arguments.length) {
-            return _keys.filter(function(k) { return _rules[k].autoHidden(); });
-        }
-        return _rules[k] && _rules[k].autoHidden();
-    };
-
-
-    features.enable = function(k) {
-        if (_rules[k] && !_rules[k].enabled) {
-            _rules[k].enable();
-            update();
-        }
-    };
-
-    features.enableAll = function() {
-        var didEnable = false;
-        for (var k in _rules) {
-            if (!_rules[k].enabled) {
-                didEnable = true;
-                _rules[k].enable();
-            }
-        }
-        if (didEnable) update();
-    };
-
-
-    features.disable = function(k) {
-        if (_rules[k] && _rules[k].enabled) {
-            _rules[k].disable();
-            update();
-        }
-    };
-
-    features.disableAll = function() {
-        var didDisable = false;
-        for (var k in _rules) {
-            if (_rules[k].enabled) {
-                didDisable = true;
-                _rules[k].disable();
-            }
-        }
-        if (didDisable) update();
-    };
-
-
-    features.toggle = function(k) {
-        if (_rules[k]) {
-            (function(f) { return f.enabled ? f.disable() : f.enable(); }(_rules[k]));
-            update();
-        }
-    };
-
-
-    features.resetStats = function() {
-        for (var i = 0; i < _keys.length; i++) {
-            _rules[_keys[i]].count = 0;
-        }
-        dispatch.call('change');
-    };
-
-
-    features.gatherStats = function(d, resolver, dimensions) {
-        var needsRedraw = false;
-        var types = utilArrayGroupBy(d, 'type');
-        var entities = [].concat(types.relation || [], types.way || [], types.node || []);
-        var currHidden, geometry, matches, i, j;
-
-        for (i = 0; i < _keys.length; i++) {
-            _rules[_keys[i]].count = 0;
-        }
-
-        // adjust the threshold for point/building culling based on viewport size..
-        // a _cullFactor of 1 corresponds to a 1000x1000px viewport..
-        _cullFactor = dimensions[0] * dimensions[1] / 1000000;
-
-        for (i = 0; i < entities.length; i++) {
-            geometry = entities[i].geometry(resolver);
-            matches = Object.keys(features.getMatches(entities[i], resolver, geometry));
-            for (j = 0; j < matches.length; j++) {
-                _rules[matches[j]].count++;
-            }
-        }
-
-        currHidden = features.hidden();
-        if (currHidden !== _hidden) {
-            _hidden = currHidden;
-            needsRedraw = true;
-            dispatch.call('change');
-        }
-
-        return needsRedraw;
-    };
-
-
-    features.stats = function() {
-        for (var i = 0; i < _keys.length; i++) {
-            _stats[_keys[i]] = _rules[_keys[i]].count;
-        }
-
-        return _stats;
-    };
-
-
-    features.clear = function(d) {
-        for (var i = 0; i < d.length; i++) {
-            features.clearEntity(d[i]);
-        }
-    };
-
-
-    features.clearEntity = function(entity) {
-        delete _cache[osmEntity.key(entity)];
-    };
-
-
-    features.reset = function() {
-        Array.from(_deferred).forEach(function(handle) {
-            window.cancelIdleCallback(handle);
-            _deferred.delete(handle);
-        });
-
-        _cache = {};
-    };
-
-    // only certain relations are worth checking
-    function relationShouldBeChecked(relation) {
-        // multipolygon features have `area` geometry and aren't checked here
-        return relation.tags.type === 'boundary';
-    }
-
-    features.getMatches = function(entity, resolver, geometry) {
-        if (geometry === 'vertex' ||
-            (geometry === 'relation' && !relationShouldBeChecked(entity))) return {};
-
-        var ent = osmEntity.key(entity);
-        if (!_cache[ent]) {
-            _cache[ent] = {};
-        }
-
-        if (!_cache[ent].matches) {
-            var matches = {};
-            var hasMatch = false;
-
-            for (var i = 0; i < _keys.length; i++) {
-                if (_keys[i] === 'others') {
-                    if (hasMatch) continue;
-
-                    // If an entity...
-                    //   1. is a way that hasn't matched other 'interesting' feature rules,
-                    if (entity.type === 'way') {
-                        var parents = features.getParents(entity, resolver, geometry);
-
-                        //   2a. belongs only to a single multipolygon relation
-                        if ((parents.length === 1 && parents[0].isMultipolygon()) ||
-                            // 2b. or belongs only to boundary relations
-                            (parents.length > 0 && parents.every(function(parent) { return parent.tags.type === 'boundary'; }))) {
-
-                            // ...then match whatever feature rules the parent relation has matched.
-                            // see #2548, #2887
-                            //
-                            // IMPORTANT:
-                            // For this to work, getMatches must be called on relations before ways.
-                            //
-                            var pkey = osmEntity.key(parents[0]);
-                            if (_cache[pkey] && _cache[pkey].matches) {
-                                matches = Object.assign({}, _cache[pkey].matches);  // shallow copy
-                                continue;
-                            }
-                        }
-                    }
-                }
-
-                if (_rules[_keys[i]].filter(entity.tags, geometry)) {
-                    matches[_keys[i]] = hasMatch = true;
-                }
-            }
-            _cache[ent].matches = matches;
-        }
-
-        return _cache[ent].matches;
-    };
-
-
-    features.getParents = function(entity, resolver, geometry) {
-        if (geometry === 'point') return [];
-
-        var ent = osmEntity.key(entity);
-        if (!_cache[ent]) {
-            _cache[ent] = {};
-        }
-
-        if (!_cache[ent].parents) {
-            var parents = [];
-            if (geometry === 'vertex') {
-                parents = resolver.parentWays(entity);
-            } else {   // 'line', 'area', 'relation'
-                parents = resolver.parentRelations(entity);
-            }
-            _cache[ent].parents = parents;
-        }
-        return _cache[ent].parents;
-    };
-
-
-    features.isHiddenPreset = function(preset, geometry) {
-        if (!_hidden.length) return false;
-        if (!preset.tags) return false;
-
-        var test = preset.setTags({}, geometry);
-        for (var key in _rules) {
-            if (_rules[key].filter(test, geometry)) {
-                if (_hidden.indexOf(key) !== -1) {
-                    return key;
-                }
-                return false;
-            }
-        }
-        return false;
-    };
-
-
-    features.isHiddenFeature = function(entity, resolver, geometry) {
-        if (!_hidden.length) return false;
-        if (!entity.version) return false;
-        if (_forceVisible[entity.id]) return false;
-
-        var matches = Object.keys(features.getMatches(entity, resolver, geometry));
-        return matches.length && matches.every(function(k) { return features.hidden(k); });
-    };
-
-
-    features.isHiddenChild = function(entity, resolver, geometry) {
-        if (!_hidden.length) return false;
-        if (!entity.version || geometry === 'point') return false;
-        if (_forceVisible[entity.id]) return false;
-
-        var parents = features.getParents(entity, resolver, geometry);
-        if (!parents.length) return false;
-
-        for (var i = 0; i < parents.length; i++) {
-            if (!features.isHidden(parents[i], resolver, parents[i].geometry(resolver))) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-
-    features.hasHiddenConnections = function(entity, resolver) {
-        if (!_hidden.length) return false;
-
-        var childNodes, connections;
-        if (entity.type === 'midpoint') {
-            childNodes = [resolver.entity(entity.edge[0]), resolver.entity(entity.edge[1])];
-            connections = [];
-        } else {
-            childNodes = entity.nodes ? resolver.childNodes(entity) : [];
-            connections = features.getParents(entity, resolver, entity.geometry(resolver));
-        }
-
-        // gather ways connected to child nodes..
-        connections = childNodes.reduce(function(result, e) {
-            return resolver.isShared(e) ? utilArrayUnion(result, resolver.parentWays(e)) : result;
-        }, connections);
-
-        return connections.some(function(e) {
-            return features.isHidden(e, resolver, e.geometry(resolver));
-        });
-    };
-
-
-    features.isHidden = function(entity, resolver, geometry) {
-        if (!_hidden.length) return false;
-        if (!entity.version) return false;
-
-        var fn = (geometry === 'vertex' ? features.isHiddenChild : features.isHiddenFeature);
-        return fn(entity, resolver, geometry);
-    };
-
-
-    features.filter = function(d, resolver) {
-        if (!_hidden.length) return d;
-
-        var result = [];
-        for (var i = 0; i < d.length; i++) {
-            var entity = d[i];
-            if (!features.isHidden(entity, resolver, entity.geometry(resolver))) {
-                result.push(entity);
-            }
-        }
-        return result;
-    };
-
-
-    features.forceVisible = function(entityIDs) {
-        if (!arguments.length) return Object.keys(_forceVisible);
-
-        _forceVisible = {};
-        for (var i = 0; i < entityIDs.length; i++) {
-            _forceVisible[entityIDs[i]] = true;
-            var entity = context.hasEntity(entityIDs[i]);
-            if (entity && entity.type === 'relation') {
-                // also show relation members (one level deep)
-                for (var j in entity.members) {
-                    _forceVisible[entity.members[j].id] = true;
-                }
-            }
-        }
-        return features;
-    };
-
-
-    features.init = function() {
-        var storage = prefs('disabled-features');
-        if (storage) {
-            var storageDisabled = storage.replace(/;/g, ',').split(',');
-            storageDisabled.forEach(features.disable);
-        }
-
-        context.urlhash().on('hashchange', _hashchange);
-    };
-
-
-//    // warm up the feature matching cache upon merging fetched data
-//    context.history().on('merge.features', function(newEntities) {
-//        if (!newEntities) return;
-//        var handle = window.requestIdleCallback(function() {
-//            var graph = context.graph();
-//            var types = utilArrayGroupBy(newEntities, 'type');
-//            // ensure that getMatches is called on relations before ways
-//            var entities = [].concat(types.relation || [], types.way || [], types.node || []);
-//            for (var i = 0; i < entities.length; i++) {
-//                var geometry = entities[i].geometry(graph);
-//                features.getMatches(entities[i], graph, geometry);
-//            }
-//        });
-//        _deferred.add(handle);
-//    });
-
-
-    return features;
-}
diff --git a/modules/renderer/index.js b/modules/renderer/index.js
deleted file mode 100644
index 9df170753e..0000000000
--- a/modules/renderer/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export { RendererImagery } from './RendererImagery';
-export { RendererImagerySource } from './RendererImagerySource';
-export { RendererMap } from './RendererMap';
-export { RendererPhotos } from './RendererPhotos';
-
-export { rendererFeatures } from './features';
diff --git a/modules/services/AbstractService.js b/modules/services/AbstractService.js
new file mode 100644
index 0000000000..395c1ec35c
--- /dev/null
+++ b/modules/services/AbstractService.js
@@ -0,0 +1,44 @@
+import { EventEmitter } from '@pixi/utils';
+
+
+/**
+ * "Services" are components of Rapid that connect to other web services and fetch data.
+ * They are owned by the context.
+ * They are the closest thing to 'plugins' that Rapid has.
+ *
+ * `AbstractService` is the base class from which all services inherit.
+ *  It provides common methods `init` and `reset` to be overridden in derived classes.
+ *  All services are event emitters.
+ *
+ * Properties you can access:
+ *   `id`   `String` identifier for the service (e.g. 'osm')
+ */
+export class AbstractService extends EventEmitter {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super();
+    this.context = context;
+    this.id = '';
+  }
+
+
+  /**
+   * init
+   * Called one time after all objects have been instantiated.
+   */
+  init() {
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+  }
+
+}
diff --git a/modules/services/EsriService.js b/modules/services/EsriService.js
new file mode 100644
index 0000000000..bbba8e8e7f
--- /dev/null
+++ b/modules/services/EsriService.js
@@ -0,0 +1,424 @@
+import { json as d3_json } from 'd3-fetch';
+import { select as d3_select } from 'd3-selection';
+import { Tiler } from '@rapid-sdk/math';
+import { utilQsString } from '@rapid-sdk/util';
+
+import { AbstractService } from './AbstractService';
+import { Graph, Tree } from '../core/lib';
+import { osmNode, osmRelation, osmWay } from '../osm';
+
+
+const GROUPID = 'bdf6c800b3ae453b9db239e03d7c1727';
+const APIROOT = 'https://openstreetmap.maps.arcgis.com/sharing/rest/content';
+const HOMEROOT = 'https://openstreetmap.maps.arcgis.com/home';
+const TILEZOOM = 14;
+
+
+/**
+ * `EsriService`
+ *
+ * Events available:
+ *   `loadedData`
+ */
+export class EsriService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'esri';
+    this.context = context;
+
+    this._tiler = new Tiler().zoomRange(TILEZOOM);
+    this._datasets = {};
+    this._gotDatasets = false;
+    this._off = false;
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this._parseDataset = this._parseDataset.bind(this);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    for (const ds of Object.values(this._datasets)) {
+      if (ds.cache.inflight) {
+        Object.values(ds.cache.inflight).forEach(controller => this._abortRequest(controller));
+      }
+      ds.graph = new Graph();
+      ds.tree = new Tree(ds.graph);
+      ds.cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {}, firstNodeIDs: new Set() };
+    }
+  }
+
+
+  graph(datasetID)  {
+    const ds = this._datasets[datasetID];
+    return ds?.graph;
+  }
+
+
+  intersects(datasetID, extent) {
+    const ds = this._datasets[datasetID];
+    if (!ds || !ds.tree || !ds.graph) return [];
+    return ds.tree.intersects(extent, ds.graph);
+  }
+
+
+  toggle(val) {
+    this._off = !val;
+  }
+
+
+  loadTiles(datasetID, projection) {
+    if (this._off) return;
+
+    // `loadDatasetsAsync` and `loadLayerAsync` are asynchronous,
+    // so ensure both have completed before we start requesting tiles.
+    const ds = this._datasets[datasetID];
+    if (!ds || !ds.layer) return;
+
+    const cache = ds.cache;
+    const locationSystem = this.context.locationSystem();
+    const tiles = this._tiler.getTiles(projection).tiles;
+
+    // abort inflight requests that are no longer needed
+    for (const k of Object.keys(cache.inflight)) {
+      const wanted = tiles.find(tile => tile.id === k);
+      if (!wanted) {
+        this._abortRequest(cache.inflight[k]);
+        delete cache.inflight[k];
+      }
+    }
+
+    for (const tile of tiles) {
+      if (cache.loaded[tile.id] || cache.inflight[tile.id]) continue;
+
+      // exit if this tile covers a blocked region (all corners are blocked)
+      const corners = tile.wgs84Extent.polygon().slice(0, 4);
+      const tileBlocked = corners.every(loc => locationSystem.blocksAt(loc).length);
+      if (tileBlocked) {
+        cache.loaded[tile.id] = true;  // don't try again
+        continue;
+      }
+
+      this._loadTilePage(ds, tile, 0);
+    }
+  }
+
+
+  loadDatasetsAsync() {
+    if (this._gotDatasets) {
+      return Promise.resolve(this._datasets);
+
+    } else {
+      const thiz = this;
+      return new Promise((resolve, reject) => {
+        let start = 1;
+        fetchMore(start);
+
+        function fetchMore(start) {
+          d3_json(thiz._searchURL(start))
+            .then(json => {
+              for (const ds of json.results ?? []) {
+                thiz._parseDataset(ds);
+              }
+
+              if (json.nextStart > 0) {
+                fetchMore(json.nextStart);  // fetch next page
+              } else {
+                thiz._gotDatasets = true;   // no more pages
+                resolve(thiz._datasets);
+              }
+            })
+            .catch(e => {
+              thiz._gotDatasets = false;
+              reject(e);
+            });
+        }
+      });
+    }
+  }
+
+
+  loadLayerAsync(datasetID) {
+    let ds = this._datasets[datasetID];
+    if (!ds || !ds.url) {
+      return Promise.reject(`Unknown datasetID: ${datasetID}`);
+    } else if (ds.layer) {
+      return Promise.resolve(ds.layer);
+    }
+
+    return d3_json(this._layerURL(ds.url))
+      .then(json => {
+        if (!json.layers || !json.layers.length) {
+          throw new Error(`Missing layer info for datasetID: ${datasetID}`);
+        }
+
+        ds.layer = json.layers[0];  // should return a single layer
+
+        // Use the field metadata to map to OSM tags
+        let tagmap = {};
+        for (const f of ds.layer.fields) {
+          if (f.type === 'esriFieldTypeOID') {  // this is an id field, remember it
+            ds.layer.idfield = f.name;
+          }
+          if (!f.editable) continue;   // 1. keep "editable" fields only
+          tagmap[f.name] = f.alias;    // 2. field `name` -> OSM tag (stored in `alias`)
+        }
+        ds.layer.tagmap = tagmap;
+
+        return ds.layer;
+      })
+      .catch(e => {
+        if (e.name === 'AbortError') return;
+        console.error(e);  // eslint-disable-line
+      });
+  }
+
+
+
+  _abortRequest(controller) {
+    controller.abort();
+  }
+
+
+  // API
+  //https://developers.arcgis.com/rest/users-groups-and-items/search.htm
+  _searchURL(start) {
+    const params = {
+      f: 'json',
+      sortField: 'title',
+      sortOrder: 'asc',
+      num: 100,
+      start: start
+    };
+    return `${APIROOT}/groups/${GROUPID}/search?` + utilQsString(params);
+    // use to get
+    // .results[]
+    //   .extent
+    //   .id
+    //   .thumbnail
+    //   .title
+    //   .snippet
+    //   .url (featureServer)
+  }
+
+  _layerURL(featureServerURL) {
+    return `${featureServerURL}/layers?f=json`;
+    // should return single layer(?)
+    // .layers[0]
+    //   .copyrightText
+    //   .fields
+    //   .geometryType   "esriGeometryPoint" or "esriGeometryPolygon" ?
+  }
+
+  _itemURL(itemID) {
+    return `${HOMEROOT}/item.html?id=${itemID}`;
+  }
+
+  _tileURL(ds, extent, page) {
+    page = page || 0;
+    const layerID = ds.layer.id;
+    const maxRecordCount = ds.layer.maxRecordCount || 2000;
+    const resultOffset = maxRecordCount * page;
+    const params = {
+      f: 'geojson',
+      outfields: '*',
+      outSR: 4326,
+      geometryType: 'esriGeometryEnvelope',
+      geometry: extent.toParam(),
+      resultOffset: resultOffset,
+      resultRecordCount: maxRecordCount
+    };
+    return `${ds.url}/${layerID}/query?` + utilQsString(params);
+  }
+
+
+  // Add each dataset to this._datasets, create internal state
+  _parseDataset(ds) {
+    if (this._datasets[ds.id]) return;  // unless we've seen it already
+
+    this._datasets[ds.id] = ds;
+    ds.graph = new Graph();
+    ds.tree = new Tree(ds.graph);
+    ds.cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {} };
+
+    // cleanup the `licenseInfo` field by removing styles  (not used currently)
+    let license = d3_select(document.createElement('div'));
+    license.html(ds.licenseInfo);       // set innerHtml
+    license.selectAll('*')
+      .attr('style', null)
+      .attr('size', null);
+    ds.license_html = license.html();   // get innerHtml
+
+    // generate public link to this item
+    ds.itemURL = this._itemURL(ds.id);
+  }
+
+
+  _loadTilePage(ds, tile, page) {
+    const cache = ds.cache;
+    if (cache.loaded[tile.id]) return;
+
+    const controller = new AbortController();
+    const url = this._tileURL(ds, tile.wgs84Extent, page);
+
+    d3_json(url, { signal: controller.signal })
+      .then(geojson => {
+        if (!geojson) throw new Error('no geojson');
+
+        this._parseTile(ds, tile, geojson, (err, results) => {
+          if (err) throw new Error(err);
+          ds.graph.rebase(results, [ds.graph], true);
+          ds.tree.rebase(results, true);
+        });
+        return geojson.properties?.exceededTransferLimit;
+      })
+      .then(hasMorePages => {
+        if (hasMorePages) {
+          this._loadTilePage(ds, tile, ++page);
+        } else {
+          cache.loaded[tile.id] = true;
+          delete cache.inflight[tile.id];
+
+          this.context.deferredRedraw();
+          this.emit('loadedData');
+        }
+      })
+      .catch(e => {
+        if (e.name === 'AbortError') return;
+        console.error(e);  // eslint-disable-line
+      });
+
+    cache.inflight[tile.id] = controller;
+  }
+
+
+  _parseTile(dataset, tile, geojson, callback) {
+    if (!geojson) return callback({ message: 'No GeoJSON', status: -1 });
+
+    // expect a FeatureCollection with `features` array
+    let results = [];
+    for (const f of geojson.features ?? []) {
+      const entities = this._parseFeature(f, dataset);
+      if (entities) results.push.apply(results, entities);
+    }
+
+    callback(null, results);
+  }
+
+
+  _parseFeature(feature, dataset) {
+    const geom = feature.geometry;
+    const props = feature.properties;
+    if (!geom || !props) return null;
+
+    const featureID = props[dataset.layer.idfield] || props.OBJECTID || props.FID || props.id;
+    if (!featureID) return null;
+
+    // skip if we've seen this feature already on another tile
+    if (dataset.cache.seen[featureID]) return null;
+    dataset.cache.seen[featureID] = true;
+
+    const id = `${dataset.id}-${featureID}`;
+    const metadata = { __fbid__: id, __origid__: id, __service__: 'esri', __datasetid__: dataset.id };
+    let entities = [];
+    let nodemap = new Map();
+
+    // Point:  make a single node
+    if (geom.type === 'Point') {
+      return [ new osmNode({ loc: geom.coordinates, tags: parseTags(props) }, metadata) ];
+
+    // LineString:  make nodes, single way
+    } else if (geom.type === 'LineString') {
+      const nodelist = parseCoordinates(geom.coordinates);
+      if (nodelist.length < 2) return null;
+
+      const w = new osmWay({ nodes: nodelist, tags: parseTags(props) }, metadata);
+      entities.push(w);
+      return entities;
+
+    // Polygon:  make nodes, way(s), possibly a relation
+    } else if (geom.type === 'Polygon') {
+      let ways = [];
+      for (const ring of geom.coordinates ?? []) {
+        const nodelist = parseCoordinates(ring);
+        if (nodelist.length < 3) continue;
+
+        const first = nodelist[0];
+        const last = nodelist[nodelist.length - 1];
+        if (first !== last) nodelist.push(first);   // sanity check, ensure rings are closed
+
+        const w = new osmWay({ nodes: nodelist });
+        ways.push(w);
+      }
+
+      if (ways.length === 1) {  // single ring, assign tags and return
+        entities.push(
+          ways[0].update( Object.assign({ tags: parseTags(props) }, metadata) )
+        );
+      } else {  // multiple rings, make a multipolygon relation with inner/outer members
+        const members = ways.map((w, i) => {
+          entities.push(w);
+          return { id: w.id, role: (i === 0 ? 'outer' : 'inner'), type: 'way' };
+        });
+        const tags = Object.assign(parseTags(props), { type: 'multipolygon' });
+        const r = new osmRelation({ members: members, tags: tags }, metadata);
+        entities.push(r);
+      }
+
+      return entities;
+    }
+    // no Multitypes for now (maybe not needed)
+
+    function parseCoordinates(coords) {
+      let nodelist = [];
+      for (const coord of coords) {
+        const key = coord.toString();
+        let n = nodemap.get(key);
+        if (!n) {
+          n = new osmNode({ loc: coord });
+          entities.push(n);
+          nodemap.set(key, n);
+        }
+        nodelist.push(n.id);
+      }
+      return nodelist;
+    }
+
+    function parseTags(props) {
+      let tags = {};
+      for (const prop of Object.keys(props)) {
+        const k = clean(dataset.layer.tagmap[prop]);
+        const v = clean(props[prop]);
+        if (k && v) {
+          tags[k] = v;
+        }
+      }
+
+      tags.source = `esri/${dataset.name}`;
+      return tags;
+    }
+
+    function clean(val) {
+      return val ? val.toString().trim() : null;
+    }
+  }
+
+
+}
diff --git a/modules/services/improveOSM.js b/modules/services/ImproveOsmService.js
similarity index 53%
rename from modules/services/improveOSM.js
rename to modules/services/ImproveOsmService.js
index ac55902715..7b9c6ff0b8 100644
--- a/modules/services/improveOSM.js
+++ b/modules/services/ImproveOsmService.js
@@ -1,25 +1,18 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { json as d3_json } from 'd3-fetch';
 import { Extent, Tiler, vecAdd, vecScale} from '@rapid-sdk/math';
 import { utilQsString } from '@rapid-sdk/util';
 import RBush from 'rbush';
 
-import { fileFetcher } from '../core/file_fetcher';
+import { AbstractService } from './AbstractService';
 import { QAItem } from '../osm';
-import { serviceOsm } from './index';
-import { t } from '../core/localizer';
-import { utilRebind } from '../util';
 
 
 const TILEZOOM = 14;
-const tiler = new Tiler().zoomRange(TILEZOOM);
-const dispatch = d3_dispatch('loaded');
-const _impOsmUrls = {
+const IMPOSM_API = {
   ow: 'https://grab.community.improve-osm.org/directionOfFlowService',
   mr: 'https://grab.community.improve-osm.org/missingGeoService',
   tr: 'https://grab.community.improve-osm.org/turnRestrictionService'
 };
-let _impOsmData = { icons: {} };
 
 // A mapping of improveOSM error types and their respective tint colors.
 const IMPOSM_COLORS = new Map();
@@ -31,123 +24,55 @@ IMPOSM_COLORS.set('mr-parking', 0xeeee00); // missing parking
 IMPOSM_COLORS.set('mr-both', 0xffa500);    // missing road + parking
 
 
-// This gets reassigned if reset
-let _cache;
+/**
+ * `ImproveOsmService`
+ *
+ * Events available:
+ *   `loadedData`
+ */
+export class ImproveOsmService extends AbstractService {
 
-function abortRequest(i) {
-  Object.values(i).forEach(controller => {
-    if (controller) {
-      controller.abort();
-    }
-  });
-}
-
-function abortUnwantedRequests(cache, tiles) {
-  Object.keys(cache.inflightTile).forEach(k => {
-    const wanted = tiles.find(tile => k === tile.id);
-    if (!wanted) {
-      abortRequest(cache.inflightTile[k]);
-      delete cache.inflightTile[k];
-    }
-  });
-}
-
-function encodeIssueRtree(d) {
-  return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d };
-}
-
-// Replace or remove QAItem from rtree
-function updateRtree(item, replace) {
-  _cache.rtree.remove(item, (a, b) => a.data.id === b.data.id);
-
-  if (replace) {
-    _cache.rtree.insert(item);
-  }
-}
-
-function linkErrorObject(d) {
-  return `<a class="error_object_link">${d}</a>`;
-}
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'improveOSM';
 
-function linkEntity(d) {
-  return `<a class="error_entity_link">${d}</a>`;
-}
+    // persistent data - loaded at init
+    this._impOsmData = { icons: {} };
 
-function pointAverage(points) {
-  if (points.length) {
-    const sum = points.reduce(
-      (acc, point) => vecAdd(acc, [point.lon, point.lat]),
-      [0,0]
-    );
-    return vecScale(sum, 1 / points.length);
-  } else {
-    return [0,0];
+    this._cache = null;   // cache gets replaced on init/reset
+    this._tiler = new Tiler().zoomRange(TILEZOOM).skipNullIsland(true);
   }
-}
-
-function relativeBearing(p1, p2) {
-  let angle = Math.atan2(p2.lon - p1.lon, p2.lat - p1.lat);
-  if (angle < 0) {
-    angle += 2 * Math.PI;
-  }
-
-  // Return degrees
-  return angle * 180 / Math.PI;
-}
-
-// Assuming range [0,360)
-function cardinalDirection(bearing) {
-  const dir = 45 * Math.round(bearing / 45);
-  const compass = {
-    0: 'north',
-    45: 'northeast',
-    90: 'east',
-    135: 'southeast',
-    180: 'south',
-    225: 'southwest',
-    270: 'west',
-    315: 'northwest',
-    360: 'north'
-  };
-
-  return t(`QA.improveOSM.directions.${compass[dir]}`);
-}
 
-// Errors shouldn't obscure each other
-function preventCoincident(loc, bumpUp) {
-  let coincident = false;
-  do {
-    // first time, move marker up. after that, move marker right.
-    let delta = coincident ? [0.00001, 0] :
-        bumpUp ? [0, 0.00001] :
-        [0, 0];
-    loc = vecAdd(loc, delta);
-    let bbox = new Extent(loc).bbox();
-    coincident = _cache.rtree.search(bbox).length;
-  } while (coincident);
-
-  return loc;
-}
-
-export default {
-  title: 'improveOSM',
 
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
   init() {
-    fileFetcher.get('qa_data')
-      .then(d => _impOsmData = d.improveOSM);
+    this.reset();
 
-    if (!_cache) {
-      this.reset();
-    }
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+    dataLoaderSystem.get('qa_data')
+      .then(d => this._impOsmData = d.improveOSM);
+  }
 
-    this.event = utilRebind(this, dispatch, 'on');
-  },
 
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
   reset() {
-    if (_cache) {
-      Object.values(_cache.inflightTile).forEach(abortRequest);
+    if (this._cache) {
+      for (const requests of Object.values(this._cache.inflightTile)) {
+        this._abortRequest(requests);
+      }
     }
-    _cache = {
+
+    this._cache = {
       data: {},
       loadedTile: {},
       inflightTile: {},
@@ -155,8 +80,13 @@ export default {
       closed: {},
       rtree: new RBush()
     };
-  },
+  }
+
 
+  /**
+   * loadIssues
+   * @param  projection
+   */
   loadIssues(projection) {
     const options = {
       client: 'Rapid',
@@ -165,39 +95,39 @@ export default {
     };
 
     // determine the needed tiles to cover the view
-    const tiles = tiler.getTiles(projection).tiles;
+    const context = this.context;
+    const tiles = this._tiler.getTiles(projection).tiles;
 
     // abort inflight requests that are no longer needed
-    abortUnwantedRequests(_cache, tiles);
+    this._abortUnwantedRequests(this._cache, tiles);
 
     // issue new requests..
-    tiles.forEach(tile => {
-      if (_cache.loadedTile[tile.id] || _cache.inflightTile[tile.id]) return;
+    for (const tile of tiles) {
+      if (this._cache.loadedTile[tile.id] || this._cache.inflightTile[tile.id]) continue;
 
       const [ east, north, west, south ] = tile.wgs84Extent.rectangle();
       const params = Object.assign({}, options, { east, south, west, north });
 
-      // 3 separate requests to store for each tile
+      // 3 separate requests to send for each tile
       const requests = {};
-
-      Object.keys(_impOsmUrls).forEach(k => {
+      for (const k of Object.keys(IMPOSM_API)) {
         // We exclude WATER from missing geometry as it doesn't seem useful
         // We use most confident one-way and turn restrictions only, still have false positives
         const kParams = Object.assign({},
           params,
           (k === 'mr') ? { type: 'PARKING,ROAD,BOTH,PATH' } : { confidenceLevel: 'C1' }
         );
-        const url = `${_impOsmUrls[k]}/search?` + utilQsString(kParams);
+        const url = `${IMPOSM_API[k]}/search?` + utilQsString(kParams);
         const controller = new AbortController();
 
         requests[k] = controller;
 
         d3_json(url, { signal: controller.signal })
           .then(data => {
-            delete _cache.inflightTile[tile.id][k];
-            if (!Object.keys(_cache.inflightTile[tile.id]).length) {
-              delete _cache.inflightTile[tile.id];
-              _cache.loadedTile[tile.id] = true;
+            delete this._cache.inflightTile[tile.id][k];
+            if (!Object.keys(this._cache.inflightTile[tile.id]).length) {
+              delete this._cache.inflightTile[tile.id];
+              this._cache.loadedTile[tile.id] = true;
             }
 
             // Road segments at high zoom == oneways
@@ -212,14 +142,14 @@ export default {
                 // Even number of points, find midpoint of the middle two
                 // Odd number of points, use position of very middle point
                 if (mid % 1 === 0) {
-                  loc = pointAverage([points[mid - 1], points[mid]]);
+                  loc = this._pointAverage([points[mid - 1], points[mid]]);
                 } else {
                   mid = points[Math.floor(mid)];
                   loc = [mid.lon, mid.lat];
                 }
 
                 // One-ways can land on same segment in opposite direction
-                loc = preventCoincident(loc, false);
+                loc = this._preventCoincident(loc, false);
 
                 let d = new QAItem(loc, this, k, itemId, {
                   issueKey: k, // used as a category
@@ -236,13 +166,13 @@ export default {
                 d.replacements = {
                   percentage: feature.percentOfTrips,
                   num_trips: feature.numberOfTrips,
-                  highway: linkErrorObject(t('QA.keepRight.error_parts.highway')),
-                  from_node: linkEntity('n' + feature.fromNodeId),
-                  to_node: linkEntity('n' + feature.toNodeId)
+                  highway: this._linkErrorObject(context.t('QA.keepRight.error_parts.highway')),
+                  from_node: this._linkEntity('n' + feature.fromNodeId),
+                  to_node: this._linkEntity('n' + feature.toNodeId)
                 };
 
-                _cache.data[d.id] = d;
-                _cache.rtree.insert(encodeIssueRtree(d));
+                this._cache.data[d.id] = d;
+                this._cache.rtree.insert(this._encodeIssueRtree(d));
               });
             }
 
@@ -255,8 +185,8 @@ export default {
 
                 // Average of recorded points should land on the missing geometry
                 // Missing geometry could happen to land on another error
-                let loc = pointAverage(feature.points);
-                loc = preventCoincident(loc, false);
+                let loc = this._pointAverage(feature.points);
+                loc = this._preventCoincident(loc, false);
 
                 let d = new QAItem(loc, this, `${k}-${geoType}`, itemId, {
                   issueKey: k,
@@ -265,16 +195,16 @@ export default {
 
                 d.replacements = {
                   num_trips: numberOfTrips,
-                  geometry_type: t(`QA.improveOSM.geometry_types.${geoType}`)
+                  geometry_type: context.t(`QA.improveOSM.geometry_types.${geoType}`)
                 };
 
                 // -1 trips indicates data came from a 3rd party
                 if (numberOfTrips === -1) {
-                  d.desc = t('QA.improveOSM.error_types.mr.description_alt', d.replacements);
+                  d.desc = context.t('QA.improveOSM.error_types.mr.description_alt', d.replacements);
                 }
 
-                _cache.data[d.id] = d;
-                _cache.rtree.insert(encodeIssueRtree(d));
+                this._cache.data[d.id] = d;
+                this._cache.rtree.insert(this._encodeIssueRtree(d));
               });
             }
 
@@ -286,7 +216,7 @@ export default {
 
                 // Turn restrictions could be missing at same junction
                 // We also want to bump the error up so node is accessible
-                const loc = preventCoincident([point.lon, point.lat], true);
+                const loc = this._preventCoincident([point.lon, point.lat], true);
 
                 // Elements are presented in a strange way
                 const ids = id.split(',');
@@ -303,40 +233,48 @@ export default {
 
                 // Travel direction along from_way clarifies the turn restriction
                 const [ p1, p2 ] = segments[0].points;
-                const dir_of_travel = cardinalDirection(relativeBearing(p1, p2));
+                const dir_of_travel = this._cardinalDirection(this._relativeBearing(p1, p2));
 
                 // Variables used in the description
                 d.replacements = {
                   num_passed: numberOfPasses,
                   num_trips: segments[0].numberOfTrips,
                   turn_restriction: turnType.toLowerCase(),
-                  from_way: linkEntity('w' + from_way),
-                  to_way: linkEntity('w' + to_way),
+                  from_way: this._linkEntity('w' + from_way),
+                  to_way: this._linkEntity('w' + to_way),
                   travel_direction: dir_of_travel,
-                  junction: linkErrorObject(t('QA.keepRight.error_parts.this_node'))
+                  junction: this._linkErrorObject(context.t('QA.keepRight.error_parts.this_node'))
                 };
 
-                _cache.data[d.id] = d;
-                _cache.rtree.insert(encodeIssueRtree(d));
-                dispatch.call('loaded');
+                this._cache.data[d.id] = d;
+                this._cache.rtree.insert(this._encodeIssueRtree(d));
+
+                this.context.deferredRedraw();
+                this.emit('loadedData');
               });
             }
           })
           .catch(e => {
             console.error(e);  // eslint-disable-line
-            delete _cache.inflightTile[tile.id][k];
-            if (!Object.keys(_cache.inflightTile[tile.id]).length) {
-              delete _cache.inflightTile[tile.id];
-              _cache.loadedTile[tile.id] = true;
+            delete this._cache.inflightTile[tile.id][k];
+            if (!Object.keys(this._cache.inflightTile[tile.id]).length) {
+              delete this._cache.inflightTile[tile.id];
+              this._cache.loadedTile[tile.id] = true;
             }
           });
-      });
+      }
+
+      this._cache.inflightTile[tile.id] = requests;
+    }
+  }
 
-      _cache.inflightTile[tile.id] = requests;
-    });
-  },
 
-  getComments(item) {
+  /**
+   * getCommentsAsync
+   * @param   item
+   * @return  Promise
+   */
+  getCommentsAsync(item) {
     // If comments already retrieved no need to do so again
     if (item.comments) {
       return Promise.resolve(item);
@@ -354,7 +292,7 @@ export default {
       qParams.targetId = item.identifier;
     }
 
-    const url = `${_impOsmUrls[key]}/retrieveComments?` + utilQsString(qParams);
+    const url = `${IMPOSM_API[key]}/retrieveComments?` + utilQsString(qParams);
     const cacheComments = data => {
       // Assign directly for immediate use afterwards
       // comments are served newest to oldest
@@ -363,24 +301,31 @@ export default {
     };
 
     return d3_json(url).then(cacheComments).then(() => item);
-  },
+  }
+
 
+  /**
+   * postUpdate
+   * @param   d
+   * @param   callback
+   */
   postUpdate(d, callback) {
-    if (!serviceOsm.authenticated()) { // Username required in payload
+    const osm = this.context.services.get('osm');
+    if (!osm || !osm.authenticated()) { // Username required in payload
       return callback({ message: 'Not Authenticated', status: -3}, d);
     }
-    if (_cache.inflightPost[d.id]) {
-      return callback({ message: 'Error update already inflight', status: -2 }, d);
+    if (this._cache.inflightPost[d.id]) {
+     return callback({ message: 'Error update already inflight', status: -2 }, d);
     }
 
     // Payload can only be sent once username is established
-    serviceOsm.userDetails(sendPayload.bind(this));
+    osm.userDetails(sendPayload.bind(this));
 
     function sendPayload(err, user) {
       if (err) { return callback(err, d); }
 
       const key = d.issueKey;
-      const url = `${_impOsmUrls[key]}/comment`;
+      const url = `${IMPOSM_API[key]}/comment`;
       const payload = {
         username: user.display_name,
         targetIds: [ d.identifier ]
@@ -397,7 +342,7 @@ export default {
       }
 
       const controller = new AbortController();
-      _cache.inflightPost[d.id] = controller;
+      this._cache.inflightPost[d.id] = controller;
 
       const options = {
         method: 'POST',
@@ -407,7 +352,7 @@ export default {
 
       d3_json(url, options)
         .then(() => {
-          delete _cache.inflightPost[d.id];
+          delete this._cache.inflightPost[d.id];
 
           // Just a comment, update error in cache
           if (!d.newStatus) {
@@ -428,66 +373,202 @@ export default {
             this.removeItem(d);
             if (d.newStatus === 'SOLVED') {
               // Keep track of the number of issues closed per type to tag the changeset
-              if (!(d.issueKey in _cache.closed)) {
-                _cache.closed[d.issueKey] = 0;
+              if (!(d.issueKey in this._cache.closed)) {
+                this._cache.closed[d.issueKey] = 0;
               }
-              _cache.closed[d.issueKey] += 1;
+              this._cache.closed[d.issueKey] += 1;
             }
           }
           if (callback) callback(null, d);
         })
         .catch(e => {
-          delete _cache.inflightPost[d.id];
+          delete this._cache.inflightPost[d.id];
           if (callback) callback(e.message);
         });
     }
-  },
+  }
 
 
-  // Get all cached QAItems covering the viewport
+  /**
+   * getItems
+   * Get all cached QAItems covering the viewport
+   * @param   projection
+   * @return  Array
+   */
   getItems(projection) {
     const viewport = projection.dimensions();
     const min = [viewport[0][0], viewport[1][1]];
     const max = [viewport[1][0], viewport[0][1]];
     const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
 
-    return _cache.rtree.search(bbox).map(d => d.data);
-  },
+    return this._cache.rtree.search(bbox).map(d => d.data);
+  }
+
 
-  // Get a QAItem from cache
+  /**
+   * getError
+   * Get a QAItem from cache
+   * @param   id
+   * @return  QAItem
+   */
   getError(id) {
-    return _cache.data[id];
-  },
+    return this._cache.data[id];
+  }
 
-  // get the color associated with this item type
+
+  /**
+   * getColor
+   * Get the color associated with this issue type
+   * @param   itemType
+   * @return  hex color
+   */
   getColor(itemType) {
     return IMPOSM_COLORS.get(itemType) ?? 0xffffff;
-  },
+  }
 
-  // get the name of the icon to display for this item
+
+  /**
+   * getIcon
+   * Get the icon to use for the given itemType
+   * @param   itemType
+   * @return  icon name
+   */
   getIcon(itemType) {
-    return _impOsmData.icons[itemType];
-  },
+    return this._impOsmData.icons[itemType];
+  }
+
 
-  // Replace a single QAItem in the cache
+  /**
+   * replaceItem
+   * Replace a single QAItem in the cache
+   * @param   item
+   * @return  the item, or `null` if it couldn't be replaced
+   */
   replaceItem(issue) {
     if (!(issue instanceof QAItem) || !issue.id) return;
 
-    _cache.data[issue.id] = issue;
-    updateRtree(encodeIssueRtree(issue), true); // true = replace
+    this._cache.data[issue.id] = issue;
+    this._updateRtree(this._encodeIssueRtree(issue), true); // true = replace
     return issue;
-  },
+  }
+
 
-  // Remove a single QAItem from the cache
+  /**
+   * removeItem
+   * Remove a single QAItem from the cache
+   * @param   item to remove
+   */
   removeItem(issue) {
     if (!(issue instanceof QAItem) || !issue.id) return;
 
-    delete _cache.data[issue.id];
-    updateRtree(encodeIssueRtree(issue), false); // false = remove
-  },
+    delete this._cache.data[issue.id];
+    this._updateRtree(this._encodeIssueRtree(issue), false); // false = remove
+  }
 
-  // Used to populate `closed:improveosm:*` changeset tags
+
+  /**
+   * getClosedCounts
+   * Used to populate `closed:improveosm:*` changeset tags
+   * @return   the closed cache
+   */
   getClosedCounts() {
-    return _cache.closed;
+    return this._cache.closed;
   }
-};
+
+
+  _abortRequest(requests) {
+    for (const controller of Object.values(requests)) {
+      controller.abort();
+    }
+  }
+
+  _abortUnwantedRequests(cache, tiles) {
+    for (const k of Object.keys(cache.inflightTile)) {
+      const wanted = tiles.find(tile => k === tile.id);
+      if (!wanted) {
+        this._abortRequest(cache.inflightTile[k]);
+        delete cache.inflightTile[k];
+      }
+    }
+  }
+
+  _encodeIssueRtree(d) {
+    return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d };
+  }
+
+  // Replace or remove QAItem from rtree
+  _updateRtree(item, replace) {
+    this._cache.rtree.remove(item, (a, b) => a.data.id === b.data.id);
+
+    if (replace) {
+      this._cache.rtree.insert(item);
+    }
+  }
+
+  _linkErrorObject(d) {
+    return `<a class="error_object_link">${d}</a>`;
+  }
+
+  _linkEntity(d) {
+    return `<a class="error_entity_link">${d}</a>`;
+  }
+
+  _pointAverage(points) {
+    if (points.length) {
+      const sum = points.reduce(
+        (acc, point) => vecAdd(acc, [point.lon, point.lat]),
+        [0,0]
+      );
+      return vecScale(sum, 1 / points.length);
+    } else {
+      return [0,0];
+    }
+  }
+
+  _relativeBearing(p1, p2) {
+    let angle = Math.atan2(p2.lon - p1.lon, p2.lat - p1.lat);
+    if (angle < 0) {
+      angle += 2 * Math.PI;
+    }
+
+    // Return degrees
+    return angle * 180 / Math.PI;
+  }
+
+
+  // Assuming range [0,360)
+  _cardinalDirection(bearing) {
+    const dir = 45 * Math.round(bearing / 45);
+    const compass = {
+      0: 'north',
+      45: 'northeast',
+      90: 'east',
+      135: 'southeast',
+      180: 'south',
+      225: 'southwest',
+      270: 'west',
+      315: 'northwest',
+      360: 'north'
+    };
+
+    return this.context.t(`QA.improveOSM.directions.${compass[dir]}`);
+  }
+
+
+  // Errors shouldn't obscure each other
+  _preventCoincident(loc, bumpUp) {
+    let coincident = false;
+    do {
+      // first time, move marker up. after that, move marker right.
+      let delta = coincident ? [0.00001, 0] :
+          bumpUp ? [0, 0.00001] :
+          [0, 0];
+      loc = vecAdd(loc, delta);
+      let bbox = new Extent(loc).bbox();
+      coincident = this._cache.rtree.search(bbox).length;
+    } while (coincident);
+
+    return loc;
+  }
+
+}
diff --git a/modules/services/kartaview.js b/modules/services/KartaviewService.js
similarity index 56%
rename from modules/services/kartaview.js
rename to modules/services/KartaviewService.js
index c0fbfe0ae7..ce130b26c8 100644
--- a/modules/services/kartaview.js
+++ b/modules/services/KartaviewService.js
@@ -1,168 +1,67 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { json as d3_json } from 'd3-fetch';
 import { zoom as d3_zoom, zoomIdentity as d3_zoomIdentity } from 'd3-zoom';
 import { Extent, Tiler, geoScaleToZoom } from '@rapid-sdk/math';
 import { utilArrayUnion, utilQsString } from '@rapid-sdk/util';
 import RBush from 'rbush';
 
-import { localizer } from '../core/localizer';
-import { utilRebind, utilSetTransform } from '../util';
+import { AbstractService } from './AbstractService';
+import { utilSetTransform } from '../util';
 
 
-const apibase = 'https://kartaview.org';
-const maxResults = 1000;
+const KARTAVIEW_API = 'https://kartaview.org';
+const MAXRESULTS = 1000;
 const TILEZOOM = 14;
-const tiler = new Tiler().skipNullIsland(true);
-const dispatch = d3_dispatch('loadedImages');
-
-let _imgZoom = d3_zoom()
-  .extent([[0, 0], [320, 240]])
-  .translateExtent([[0, 0], [320, 240]])
-  .scaleExtent([1, 15]);
-
-let _kartaviewCache;
-let _kartaviewSelectedImage;
-let _loadViewerPromise;
-
-
-function maxPageAtZoom(z) {
-  if (z < 15)   return 2;
-  if (z === 15) return 5;
-  if (z === 16) return 10;
-  if (z === 17) return 20;
-  if (z === 18) return 40;
-  if (z > 18)   return 80;
-}
-
 
-function loadTiles(projection) {
-  const currZoom = Math.floor(geoScaleToZoom(projection.scale()));
-  // Determine the needed tiles to cover the view
-  const needTiles = tiler.zoomRange(TILEZOOM).getTiles(projection).tiles;
-
-  // Abort inflight requests that are no longer needed
-  for (const [k, inflight] of _kartaviewCache.inflight.entries()) {
-    const needed = needTiles.find(tile => k.indexOf(tile.id) === 0);
-    if (!needed) {
-      inflight.controller.abort();
-    }
-  }
 
-  // Fetch files that are needed
-  for (const tile of needTiles) {
-    loadNextTilePage(currZoom, tile);
+/**
+ * `KartaviewService`
+ *
+ * Events available:
+ *   `loadedData`
+ */
+export class KartaviewService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'kartaview';
+
+    this._imgZoom = d3_zoom()
+      .extent([[0, 0], [320, 240]])
+      .translateExtent([[0, 0], [320, 240]])
+      .scaleExtent([1, 15]);
+
+    this._cache = {};
+    this._selectedImage = null;
+    this._loadViewerPromise = null;
+    this._tiler = new Tiler().zoomRange(TILEZOOM).skipNullIsland(true);
   }
-}
-
-
-function loadNextTilePage(currZoom, tile) {
-  const bbox = tile.wgs84Extent.bbox();
-  const maxPages = maxPageAtZoom(currZoom);
-  const nextPage = _kartaviewCache.nextPage.get(tile.id) ?? 1;
-
-  if (nextPage > maxPages) return;
-
-  const k = `${tile.id},${nextPage}`;
-  if (_kartaviewCache.loaded.has(k) || _kartaviewCache.inflight.has(k)) return;
-
-  const params = utilQsString({
-    ipp: maxResults,
-    page: nextPage,
-    // client_id: clientId,
-    bbTopLeft: [bbox.maxY, bbox.minX].join(','),
-    bbBottomRight: [bbox.minY, bbox.maxX].join(',')
-  }, true);
-
-  const controller = new AbortController();
-  const options = {
-    method: 'POST',
-    signal: controller.signal,
-    body: params,
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-  };
-
-  const url = `${apibase}/1.0/list/nearby-photos/`;
-  const promise = d3_json(url, options)
-    .then(data => {
-      _kartaviewCache.loaded.add(k);
-      if (!data || !data.currentPageItems || !data.currentPageItems.length) {
-        throw new Error('No Data');
-      }
-
-      const boxes = data.currentPageItems.map(image => {
-        if (_kartaviewCache.images.has(image.id)) return null;  // skip duplicates
-
-        const loc = [+image.lng, +image.lat];
-        const d = {
-          id: image.id,
-          loc: loc,
-          ca: +image.heading,
-          captured_at: (image.shot_date || image.date_added),
-          captured_by: image.username,
-          imagePath: image.lth_name,
-          sequenceID: image.sequence_id,
-          sequenceIndex: +image.sequence_index
-        };
-        // cache image info
-        _kartaviewCache.images.set(d.id, d);
-
-        // cache sequence info
-        let sequence = _kartaviewCache.sequences.get(d.sequenceID);
-        if (!sequence) {
-          sequence = { rotation: 0, images: [], v: 0 };
-          _kartaviewCache.sequences.set(d.sequenceID, sequence);
-        }
-        // add image to sequence - note that `images` may be a sparse array
-        sequence.images[d.sequenceIndex] = d;
-        sequence.v++;
-
-        return {
-          minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d
-        };
-      }).filter(Boolean);
-
-      _kartaviewCache.rtree.load(boxes);
-
-      if (data.currentPageItems.length === maxResults) {   // more pages to load
-        _kartaviewCache.nextPage.set(tile.id, nextPage + 1);
-        loadNextTilePage(currZoom, tile);      // recurse
-      } else {
-        _kartaviewCache.nextPage.set(tile.id, Infinity);   // no more pages to load
-      }
-
-      dispatch.call('loadedImages');
-    })
-    .catch(err => {
-      if (err.name === 'AbortError') return;          // ok
-      if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
-    })
-    .finally(() => {
-      _kartaviewCache.inflight.delete(k);
-    });
-
-  _kartaviewCache.inflight.set(k, { promise: promise, controller: controller });
-}
-
 
 
-export default {
-
-  init: function() {
-    if (!_kartaviewCache) {
-      this.reset();
-    }
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+  }
 
-    this.event = utilRebind(this, dispatch, 'on');
-  },
 
-  reset: function() {
-    if (_kartaviewCache) {
-      for (const inflight of _kartaviewCache.inflight.values()) {
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    if (this._cache.inflight) {
+      for (const inflight of this._cache.inflight.values()) {
         inflight.controller.abort();
       }
     }
 
-    _kartaviewCache = {
+    this._cache = {
       inflight:  new Map(),   // Map(k -> { Promise, AbortController})
       loaded:    new Set(),   // Set(k)   (where k is like `${tile.id},${nextPage}`)
       nextPage:  new Map(),   // Map(tileID -> Number)
@@ -171,20 +70,20 @@ export default {
       rtree:     new RBush()
     };
 
-    _kartaviewSelectedImage = null;
-  },
+    this._selectedImage = null;
+  }
 
 
-  images: function(projection) {
+  images(projection) {
     const viewport = projection.dimensions();
     const min = [viewport[0][0], viewport[1][1]];
     const max = [viewport[1][0], viewport[0][1]];
     const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
-    return _kartaviewCache.rtree.search(box).map(d => d.data);
-  },
+    return this._cache.rtree.search(box).map(d => d.data);
+  }
 
 
-  sequences: function(projection) {
+  sequences(projection) {
     const viewport = projection.dimensions();
     const min = [viewport[0][0], viewport[1][1]];
     const max = [viewport[1][0], viewport[0][1]];
@@ -192,14 +91,14 @@ export default {
     let sequenceIDs = new Set();
 
     // Gather sequences for images in viewport
-    for (const box of _kartaviewCache.rtree.search(bbox)) {
+    for (const box of this._cache.rtree.search(bbox)) {
       if (box.data.sequenceID) sequenceIDs.add(box.data.sequenceID);
     }
 
     // Make GeoJSON LineStrings from those sequences..
     let lineStrings = [];
     for (const sequenceID of sequenceIDs) {
-      const sequence = _kartaviewCache.sequences.get(sequenceID);
+      const sequence = this._cache.sequences.get(sequenceID);
       const images = sequence?.images ?? [];   // note that `images` may be a sparse array
       if (!images.length) continue;
 
@@ -215,21 +114,37 @@ export default {
       });
     }
     return lineStrings;
-  },
+  }
+
+
+  cachedImage(imageID) {
+    return this._cache.images.get(imageID);
+  }
 
 
-  cachedImage: function(imageID) {
-    return _kartaviewCache.images.get(imageID);
-  },
+  loadImages(projection) {
+    const currZoom = Math.floor(geoScaleToZoom(projection.scale()));
+    // Determine the needed tiles to cover the view
+    const needTiles = this._tiler.getTiles(projection).tiles;
 
+    // Abort inflight requests that are no longer needed
+    for (const [k, inflight] of this._cache.inflight) {
+      const needed = needTiles.find(tile => k.indexOf(tile.id) === 0);
+      if (!needed) {
+        inflight.controller.abort();
+      }
+    }
 
-  loadImages: function(projection) {
-    loadTiles(projection);
-  },
+    // Fetch files that are needed
+    for (const tile of needTiles) {
+      this._loadNextTilePage(currZoom, tile);
+    }
+  }
 
 
-  loadViewerAsync: function(context) {
-    if (_loadViewerPromise) return _loadViewerPromise;
+  loadViewerAsync() {
+    if (this._loadViewerPromise) return this._loadViewerPromise;
+    const context = this.context;
 
     // add osc-wrapper
     let wrap = context.container().select('.photoviewer').selectAll('.osc-wrapper')
@@ -239,7 +154,7 @@ export default {
       .append('div')
       .attr('class', 'photo-wrapper osc-wrapper')
       .classed('hide', true)
-      .call(_imgZoom.on('zoom', zoomPan))
+      .call(this._imgZoom.on('zoom', zoomPan))
       .on('dblclick.zoom', null);
 
     wrapEnter
@@ -279,7 +194,7 @@ export default {
 
     // Register viewer resize handler
     context.ui().photoviewer.on('resize.kartaview', dimensions => {
-      _imgZoom = d3_zoom()
+      this._imgZoom = d3_zoom()
         .extent([[0, 0], dimensions])
         .translateExtent([[0, 0], dimensions])
         .scaleExtent([1, 15])
@@ -295,9 +210,9 @@ export default {
 
 
     function rotate(deg) {
-      if (!_kartaviewSelectedImage) return;
-      const sequenceID = _kartaviewSelectedImage.sequenceID;
-      const sequence = _kartaviewCache.sequences.get(sequenceID);
+      if (!this._selectedImage) return;
+      const sequenceID = this._selectedImage.sequenceID;
+      const sequence = this._cache.sequences.get(sequenceID);
       if (!sequence) return;
 
       let r = sequence.rotation || 0;
@@ -312,7 +227,7 @@ export default {
       wrap
         .transition()
         .duration(100)
-        .call(_imgZoom.transform, d3_zoomIdentity);
+        .call(this._imgZoom.transform, d3_zoomIdentity);
 
       wrap.selectAll('.osc-image')
         .transition()
@@ -321,28 +236,26 @@ export default {
     }
 
     function step(stepBy) {
-      if (!_kartaviewSelectedImage) return;
-      const sequenceID = _kartaviewSelectedImage.sequenceID;
-      const sequence = _kartaviewCache.sequences.get(sequenceID);
+      if (!this._selectedImage) return;
+      const sequenceID = this._selectedImage.sequenceID;
+      const sequence = this._cache.sequences.get(sequenceID);
       if (!sequence) return;
 
-      const nextIndex = _kartaviewSelectedImage.sequenceIndex + stepBy;
+      const nextIndex = this._selectedImage.sequenceIndex + stepBy;
       const nextImage = sequence.images[nextIndex];
       if (!nextImage) return;
 
-      context.map().centerEase(nextImage.loc);
-      context.photos().selectPhoto('kartaview', nextImage.id);
+      context.mapSystem().centerEase(nextImage.loc);
+      context.photoSystem().selectPhoto('kartaview', nextImage.id);
     }
 
     // don't need any async loading so resolve immediately
-    _loadViewerPromise = Promise.resolve();
-
-    return _loadViewerPromise;
-  },
+    return this._loadViewerPromise = Promise.resolve();
+  }
 
 
-  showViewer: function(context) {
-    let viewer = context.container().select('.photoviewer')
+  showViewer() {
+    let viewer = this.context.container().select('.photoviewer')
       .classed('hide', false);
 
     let isHidden = viewer.selectAll('.photo-wrapper.osc-wrapper.hide').size();
@@ -358,12 +271,13 @@ export default {
     }
 
     return this;
-  },
+  }
 
 
-  hideViewer: function(context) {
-    _kartaviewSelectedImage = null;
-    context.photos().selectPhoto(null);
+  hideViewer() {
+    this._selectedImage = null;
+    const context = this.context;
+    context.photoSystem().selectPhoto(null);
 
     let viewer = context.container().select('.photoviewer');
     if (!viewer.empty()) viewer.datum(null);
@@ -377,14 +291,17 @@ export default {
       .classed('currentView', false);
 
     return this.setStyles(context, null, true);
-  },
+  }
 
 
-  // note: call `context.photos().selectPhoto(layerID, photoID)` instead
+  // note: call `context.photoSystem().selectPhoto(layerID, photoID)` instead
   // That will deal with the URL and call this function
-  selectImage: function(context, imageKey) {
-    let d = this.cachedImage(imageKey);
-    _kartaviewSelectedImage = d;
+  selectImage(imageID) {
+    let d = this.cachedImage(imageID);
+    this._selectedImage = d;
+
+    const context = this.context;
+    if (!context.container()) return;
 
     let viewer = context.container().select('.photoviewer');
     if (!viewer.empty()) viewer.datum(d);
@@ -403,20 +320,20 @@ export default {
     wrap
       .transition()
       .duration(100)
-      .call(_imgZoom.transform, d3_zoomIdentity);
+      .call(this._imgZoom.transform, d3_zoomIdentity);
 
     imageWrap
       .selectAll('.osc-image')
       .remove();
 
     if (d) {
-      const sequence = _kartaviewCache.sequences.get(d.sequenceID);
+      const sequence = this._cache.sequences.get(d.sequenceID);
       const r = sequence?.rotation ?? 0;
 
       imageWrap
         .append('img')
         .attr('class', 'osc-image')
-        .attr('src', `${apibase}/${d.imagePath}`)
+        .attr('src', `${KARTAVIEW_API}/${d.imagePath}`)
         .style('transform', `rotate(${r}deg)`);
 
       if (d.captured_by) {
@@ -459,20 +376,22 @@ export default {
       const options = { day: 'numeric', month: 'short', year: 'numeric' };
       const d = new Date(s);
       if (isNaN(d.getTime())) return null;
-      return d.toLocaleDateString(localizer.localeCode(), options);
+
+      const localeCode = this.context.localizationSystem().localeCode();
+      return d.toLocaleDateString(localeCode, options);
     }
-  },
+  }
 
 
-  getSelectedImage: function() {
-    return _kartaviewSelectedImage;
-  },
+  getSelectedImage() {
+    return this._selectedImage;
+  }
 
 
   // Updates the currently highlighted sequence and selected bubble.
   // Reset is only necessary when interacting with the viewport because
   // this implicitly changes the currently selected bubble/sequence
-  setStyles: function(context, hovered, reset) {
+  setStyles(context, hovered, reset) {
     if (reset) {  // reset all layers
       context.container().selectAll('.viewfield-group')
         .classed('highlighted', false)
@@ -486,14 +405,14 @@ export default {
 
     let hoveredImageID = hovered?.id;
     let hoveredSequenceID = hovered?.sequenceID;
-    let hoveredSequence = hoveredSequenceID && _kartaviewCache.sequences.get(hoveredSequenceID);
+    let hoveredSequence = hoveredSequenceID && this._cache.sequences.get(hoveredSequenceID);
     let hoveredImageIDs = (hoveredSequence && hoveredSequence.images.map(function (d) { return d.id; })) || [];
 
     let viewer = context.container().select('.photoviewer');
     let selected = viewer.empty() ? undefined : viewer.datum();
     let selectedImageID = selected?.id;
     let selectedSequenceID = selected?.sequenceID;
-    let selectedSequence = selectedSequenceID && _kartaviewCache.sequences.get(selectedSequenceID);
+    let selectedSequence = selectedSequenceID && this._cache.sequences.get(selectedSequenceID);
     let selectedImageIDs = (selectedSequence && selectedSequence.images.map(function (d) { return d.id; })) || [];
 
     // highlight sibling viewfields on either the selected or the hovered sequences
@@ -522,11 +441,106 @@ export default {
     }
 
     return this;
-  },
+  }
+
 
+  _maxPageAtZoom(z) {
+    if (z < 15)   return 2;
+    if (z === 15) return 5;
+    if (z === 16) return 10;
+    if (z === 17) return 20;
+    if (z === 18) return 40;
+    if (z > 18)   return 80;
+  }
+
+
+  _loadNextTilePage(currZoom, tile) {
+    const bbox = tile.wgs84Extent.bbox();
+    const maxPages = this._maxPageAtZoom(currZoom);
+    const nextPage = this._cache.nextPage.get(tile.id) ?? 1;
+
+    if (nextPage > maxPages) return;
+
+    const k = `${tile.id},${nextPage}`;
+    if (this._cache.loaded.has(k) || this._cache.inflight.has(k)) return;
+
+    const params = utilQsString({
+      ipp: MAXRESULTS,
+      page: nextPage,
+      // client_id: clientId,
+      bbTopLeft: [bbox.maxY, bbox.minX].join(','),
+      bbBottomRight: [bbox.minY, bbox.maxX].join(',')
+    }, true);
+
+    const controller = new AbortController();
+    const options = {
+      method: 'POST',
+      signal: controller.signal,
+      body: params,
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+    };
 
-  cache: function() {
-    return _kartaviewCache;
+    const url = `${KARTAVIEW_API}/1.0/list/nearby-photos/`;
+    const promise = d3_json(url, options)
+      .then(data => {
+        this._cache.loaded.add(k);
+        if (!data || !data.currentPageItems || !data.currentPageItems.length) {
+          throw new Error('No Data');
+        }
+
+        const boxes = data.currentPageItems.map(image => {
+          if (this._cache.images.has(image.id)) return null;  // skip duplicates
+
+          const loc = [+image.lng, +image.lat];
+          const d = {
+            id: image.id,
+            loc: loc,
+            ca: +image.heading,
+            captured_at: (image.shot_date || image.date_added),
+            captured_by: image.username,
+            imagePath: image.lth_name,
+            sequenceID: image.sequence_id,
+            sequenceIndex: +image.sequence_index
+          };
+          // cache image info
+          this._cache.images.set(d.id, d);
+
+          // cache sequence info
+          let sequence = this._cache.sequences.get(d.sequenceID);
+          if (!sequence) {
+            sequence = { rotation: 0, images: [], v: 0 };
+            this._cache.sequences.set(d.sequenceID, sequence);
+          }
+          // add image to sequence - note that `images` may be a sparse array
+          sequence.images[d.sequenceIndex] = d;
+          sequence.v++;
+
+          return {
+            minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d
+          };
+        }).filter(Boolean);
+
+        this._cache.rtree.load(boxes);
+
+        if (data.currentPageItems.length === MAXRESULTS) {   // more pages to load
+          this._cache.nextPage.set(tile.id, nextPage + 1);
+          this._loadNextTilePage(currZoom, tile);      // recurse
+        } else {
+          this._cache.nextPage.set(tile.id, Infinity);   // no more pages to load
+        }
+
+        this.context.deferredRedraw();
+        this.emit('loadedData');
+      })
+      .catch(err => {
+        if (err.name === 'AbortError') return;          // ok
+        if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
+      })
+      .finally(() => {
+        this._cache.inflight.delete(k);
+      });
+
+    this._cache.inflight.set(k, { promise: promise, controller: controller });
   }
 
-};
+}
diff --git a/modules/services/KeepRightService.js b/modules/services/KeepRightService.js
new file mode 100644
index 0000000000..cb237ce6da
--- /dev/null
+++ b/modules/services/KeepRightService.js
@@ -0,0 +1,585 @@
+import { json as d3_json } from 'd3-fetch';
+import { Extent, Tiler, vecAdd} from '@rapid-sdk/math';
+import { utilQsString } from '@rapid-sdk/util';
+import RBush from 'rbush';
+
+import { AbstractService } from './AbstractService';
+import { QAItem } from '../osm';
+
+
+const KEEPRIGHT_API = 'https://www.keepright.at';
+const TILEZOOM = 14;
+
+const KR_RULES = [
+  // no 20 - multiple node on same spot - these are mostly boundaries overlapping roads
+  30, 40, 50, 60, 70, 90, 100, 110, 120, 130, 150, 160, 170, 180,
+  190, 191, 192, 193, 194, 195, 196, 197, 198,
+  200, 201, 202, 203, 204, 205, 206, 207, 208, 210, 220,
+  230, 231, 232, 270, 280, 281, 282, 283, 284, 285,
+  290, 291, 292, 293, 294, 295, 296, 297, 298, 300, 310, 311, 312, 313,
+  320, 350, 360, 370, 380, 390, 400, 401, 402, 410, 411, 412, 413
+];
+
+// A mapping of KeepRight rule numbers to their respective colors.
+const KR_COLORS = new Map();
+['20', '40', '210', '270', '310', '320', '350'].forEach(key => KR_COLORS.set(key, 0xffff99));
+['60', '70', '90', '100', '110', '150', '220', '380'].forEach(key => KR_COLORS.set(key, 0x55dd00));
+['360', '370', '410'].forEach(key => KR_COLORS.set(key, 0xff99bb));
+KR_COLORS.set('50',  0xffff99);
+KR_COLORS.set('120', 0xcc3355);
+KR_COLORS.set('130', 0xffaa33);
+KR_COLORS.set('160', 0xbb6600);
+KR_COLORS.set('170', 0xffff00);
+KR_COLORS.set('180', 0xaaccee);
+KR_COLORS.set('190', 0xff3333);
+KR_COLORS.set('200', 0xfdbf6f);
+KR_COLORS.set('230', 0xbb6600);
+KR_COLORS.set('280', 0x5f47a0);
+KR_COLORS.set('290', 0xaaccee);
+KR_COLORS.set('300', 0x009900);
+KR_COLORS.set('390', 0x009900);
+KR_COLORS.set('400', 0xcc3355);
+
+
+/**
+ * `KeepRightService`
+ *
+ * Events available:
+ *   `loadedData`
+ */
+export class KeepRightService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'keepRight';
+
+    // persistent data - loaded at init
+    this._krData = { errorTypes: {}, localizeStrings: {} };
+
+    this._cache = null;   // cache gets replaced on init/reset
+    this._tiler = new Tiler().zoomRange(TILEZOOM).skipNullIsland(true);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+    dataLoaderSystem.get('keepRight')
+      .then(d => this._krData = d);
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    if (this._cache) {
+      Object.values(this._cache.inflightTile).forEach(controller => this._abortRequest(controller));
+    }
+
+    this._cache = {
+      data: {},
+      loadedTile: {},
+      inflightTile: {},
+      inflightPost: {},
+      closed: {},
+      rtree: new RBush()
+    };
+  }
+
+
+  /**
+   * loadIssues
+   * KeepRight API:  http://osm.mueschelsoft.de/keepright/interfacing.php
+   * @param  projection
+   */
+  loadIssues(projection) {
+    const options = {
+      format: 'geojson',
+      ch: KR_RULES
+    };
+
+    // determine the needed tiles to cover the view
+    const tiles = this._tiler.getTiles(projection).tiles;
+
+    // abort inflight requests that are no longer needed
+    this._abortUnwantedRequests(this._cache, tiles);
+
+    // issue new requests..
+    for (const tile of tiles) {
+      if (this._cache.loadedTile[tile.id] || this._cache.inflightTile[tile.id]) continue;
+
+      const [ left, top, right, bottom ] = tile.wgs84Extent.rectangle();
+      const params = Object.assign({}, options, { left, bottom, right, top });
+      const url = `${KEEPRIGHT_API}/export.php?` + utilQsString(params);
+      const controller = new AbortController();
+
+      this._cache.inflightTile[tile.id] = controller;
+
+      d3_json(url, { signal: controller.signal })
+        .then(data => {
+          delete this._cache.inflightTile[tile.id];
+          this._cache.loadedTile[tile.id] = true;
+          if (!data || !data.features || !data.features.length) {
+            throw new Error('No Data');
+          }
+
+          for (const feature of data.features) {
+            const {
+              properties: {
+                error_type: itemType,
+                error_id: id,
+                comment = null,
+                object_id: objectId,
+                object_type: objectType,
+                schema,
+                title
+              }
+            } = feature;
+            let {
+              geometry: { coordinates: loc },
+              properties: { description = '' }
+            } = feature;
+
+            // if there is a parent, save its error type e.g.:
+            //  Error 191 = "highway-highway"
+            //  Error 190 = "intersections without junctions"  (parent)
+            const issueTemplate = this._krData.errorTypes[itemType];
+            const parentIssueType = (Math.floor(itemType / 10) * 10).toString();
+
+            // try to handle error type directly, fallback to parent error type.
+            const whichType = issueTemplate ? itemType : parentIssueType;
+            const whichTemplate = this._krData.errorTypes[whichType];
+
+            // Rewrite a few of the errors at this point..
+            // This is done to make them easier to linkify and translate.
+            switch (whichType) {
+              case '170':
+                description = `This feature has a FIXME tag: ${description}`;
+                break;
+              case '292':
+              case '293':
+                description = description.replace('A turn-', 'This turn-');
+                break;
+              case '294':
+              case '295':
+              case '296':
+              case '297':
+              case '298':
+                description = `This turn-restriction~${description}`;
+                break;
+              case '300':
+                description = 'This highway is missing a maxspeed tag';
+                break;
+              case '411':
+              case '412':
+              case '413':
+                description = `This feature~${description}`;
+                break;
+            }
+
+            // move markers slightly so it doesn't obscure the geometry,
+            // then move markers away from other coincident markers
+            let coincident = false;
+            do {
+              // first time, move marker up. after that, move marker right.
+              let delta = coincident ? [0.00001, 0] : [0, 0.00001];
+              loc = vecAdd(loc, delta);
+              let bbox = new Extent(loc).bbox();
+              coincident = this._cache.rtree.search(bbox).length;
+            } while (coincident);
+
+            let d = new QAItem(loc, this, itemType, id, {
+              comment,
+              description,
+              whichType,
+              parentIssueType,
+              severity: whichTemplate.severity || 'error',
+              objectId,
+              objectType,
+              schema,
+              title
+            });
+
+            d.replacements = this._tokenReplacements(d);
+
+            this._cache.data[id] = d;
+            this._cache.rtree.insert(this._encodeIssueRtree(d));
+          }
+
+          this.context.deferredRedraw();
+          this.emit('loadedData');
+        })
+        .catch(() => {
+          delete this._cache.inflightTile[tile.id];
+          this._cache.loadedTile[tile.id] = true;
+        });
+
+    }
+  }
+
+
+  /**
+   * postUpdate
+   * @param  d
+   * @param  callback
+   */
+  postUpdate(d, callback) {
+    if (this._cache.inflightPost[d.id]) {
+      return callback({ message: 'Error update already inflight', status: -2 }, d);
+    }
+
+    const params = { schema: d.schema, id: d.id };
+
+    if (d.newStatus) {
+      params.st = d.newStatus;
+    }
+    if (d.newComment !== undefined) {
+      params.co = d.newComment;
+    }
+
+    // NOTE: This throws a CORS err, but it seems successful.
+    // We don't care too much about the response, so this is fine.
+    const url = `${KEEPRIGHT_API}/comment.php?` + utilQsString(params);
+    const controller = new AbortController();
+
+    this._cache.inflightPost[d.id] = controller;
+
+    // Since this is expected to throw an error just continue as if it worked
+    // (worst case scenario the request truly fails and issue will show up if Rapid restarts)
+    d3_json(url, { signal: controller.signal })
+      .finally(() => {
+        delete this._cache.inflightPost[d.id];
+
+        if (d.newStatus === 'ignore') {    // ignore permanently (false positive)
+          this.removeItem(d);
+        } else if (d.newStatus === 'ignore_t') {   // ignore temporarily (error fixed)
+          this.removeItem(d);
+          this._cache.closed[`${d.schema}:${d.id}`] = true;
+        } else {
+          d = this.replaceItem(d.update({
+            comment: d.newComment,
+            newComment: undefined,
+            newState: undefined
+          }));
+        }
+
+        if (callback) callback(null, d);
+      });
+  }
+
+
+  /**
+   * getItems
+   * Get all cached QAItems covering the viewport
+   * @param   projection
+   * @return  Array
+   */
+  getItems(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
+
+    return this._cache.rtree.search(bbox).map(d => d.data);
+  }
+
+
+  /**
+   * getError
+   * Get a QAItem from cache
+   * @param   id
+   * @return  QAItem
+   */
+  getError(id) {
+    return this._cache.data[id];
+  }
+
+
+  /**
+   * getColor
+   * Get the color associated with this issue type
+   * @param   parentIssueType
+   * @return  hex color
+   */
+  getColor(parentIssueType) {
+    return KR_COLORS.get(parentIssueType) ?? 0xffffff;
+  }
+
+
+  /**
+   * replaceItem
+   * Replace a single QAItem in the cache
+   * @param   item
+   * @return  the item, or `null` if it couldn't be replaced
+   */
+  replaceItem(item) {
+    if (!(item instanceof QAItem) || !item.id) return null;
+
+    this._cache.data[item.id] = item;
+    this._updateRtree(this._encodeIssueRtree(item), true); // true = replace
+    return item;
+  }
+
+
+  /**
+   * removeItem
+   * Remove a single QAItem from the cache
+   * @param   item to remove
+   */
+  removeItem(item) {
+    if (!(item instanceof QAItem) || !item.id) return;
+
+    delete this._cache.data[item.id];
+    this._updateRtree(this._encodeIssueRtree(item), false); // false = remove
+  }
+
+
+  /**
+   * issueURL
+   * Returns the url to link to details about an item
+   * @param   item
+   * @return  the url
+   */
+  issueURL(item) {
+    return `${KEEPRIGHT_API}/report_map.php?schema=${item.schema}&error=${item.id}`;
+  }
+
+  /**
+   * getClosedIDs
+   * Get an array of issues closed during this session.
+   * Used to populate `closed:keepright` changeset tag
+   * @return  Array of closed item ids
+   */
+  getClosedIDs() {
+    return Object.keys(this._cache.closed).sort();
+  }
+
+
+
+  _abortRequest(controller) {
+    if (controller) {
+      controller.abort();
+    }
+  }
+
+  _abortUnwantedRequests(cache, tiles) {
+    Object.keys(cache.inflightTile).forEach(k => {
+      const wanted = tiles.find(tile => k === tile.id);
+      if (!wanted) {
+        this._abortRequest(cache.inflightTile[k]);
+        delete cache.inflightTile[k];
+      }
+    });
+  }
+
+  _encodeIssueRtree(d) {
+    return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d };
+  }
+
+
+  // Replace or remove QAItem from rtree
+  _updateRtree(item, replace) {
+    this._cache.rtree.remove(item, (a, b) => a.data.id === b.data.id);
+
+    if (replace) {
+      this._cache.rtree.insert(item);
+    }
+  }
+
+
+  _tokenReplacements(d) {
+    if (!(d instanceof QAItem)) return;
+
+    const htmlRegex = new RegExp(/<\/[a-z][\s\S]*>/);
+    const replacements = {};
+
+    const issueTemplate = this._krData.errorTypes[d.whichType];
+    if (!issueTemplate) {
+      /* eslint-disable no-console */
+      console.log('No Template: ', d.whichType);
+      console.log('  ', d.description);
+      /* eslint-enable no-console */
+      return;
+    }
+
+    // some descriptions are just fixed text
+    if (!issueTemplate.regex) return;
+
+    // regex pattern should match description with variable details captured
+    const errorRegex = new RegExp(issueTemplate.regex, 'i');
+    const errorMatch = errorRegex.exec(d.description);
+    if (!errorMatch) {
+      /* eslint-disable no-console */
+      console.log('Unmatched: ', d.whichType);
+      console.log('  ', d.description);
+      console.log('  ', errorRegex);
+      /* eslint-enable no-console */
+      return;
+    }
+
+    for (let i = 1; i < errorMatch.length; i++) {   // skip first
+      let capture = errorMatch[i];
+      let idType;
+
+      idType = 'IDs' in issueTemplate ? issueTemplate.IDs[i-1] : '';
+      if (idType && capture) {   // link IDs if present in the capture
+        capture = this._parseError(capture, idType);
+      } else if (htmlRegex.test(capture)) {   // escape any html in non-IDs
+        capture = '\\' +  capture + '\\';
+      } else {
+        const compare = capture.toLowerCase();
+        if (this._krData.localizeStrings[compare]) {   // some replacement strings can be localized
+          capture = this.context.t('QA.keepRight.error_parts.' + this._krData.localizeStrings[compare]);
+        }
+      }
+
+      replacements['var' + i] = capture;
+    }
+
+    return replacements;
+  }
+
+
+  _parseError(capture, idType) {
+    const compare = capture.toLowerCase();
+    if (this._krData.localizeStrings[compare]) {   // some replacement strings can be localized
+      capture = this.context.t('QA.keepRight.error_parts.' + this._krData.localizeStrings[compare]);
+    }
+
+    switch (idType) {
+      // link a string like "this node"
+      case 'this':
+        capture = linkErrorObject(capture);
+        break;
+
+      case 'url':
+        capture = linkURL(capture);
+        break;
+
+      // link an entity ID
+      case 'n':
+      case 'w':
+      case 'r':
+        capture = linkEntity(idType + capture);
+        break;
+
+      // some errors have more complex ID lists/variance
+      case '20':
+        capture = parse20(capture);
+        break;
+      case '211':
+        capture = parse211(capture);
+        break;
+      case '231':
+        capture = parse231(capture);
+        break;
+      case '294':
+        capture = parse294(capture);
+        break;
+      case '370':
+        capture = parse370(capture);
+        break;
+    }
+
+    return capture;
+
+
+    function linkErrorObject(d) {
+      return `<a class="error_object_link">${d}</a>`;
+    }
+
+    function linkEntity(d) {
+      return `<a class="error_entity_link">${d}</a>`;
+    }
+
+    function linkURL(d) {
+      return `<a class="kr_external_link" target="_blank" href="${d}">${d}</a>`;
+    }
+
+    // arbitrary node list of form: #ID, #ID, #ID...
+    function parse211(capture) {
+      let newList = [];
+
+      const items = capture.split(', ');
+      for (const item of items) {
+        const id = linkEntity('n' + item.slice(1));   // ID has # at the front
+        newList.push(id);
+      }
+
+      return newList.join(', ');
+    }
+
+    // arbitrary way list of form: #ID(layer),#ID(layer),#ID(layer)...
+    function parse231(capture) {
+      let newList = [];
+
+      // unfortunately 'layer' can itself contain commas, so we split on '),'
+      const items = capture.split('),');
+      for (const item of items) {
+        const match = item.match(/\#(\d+)\((.+)\)?/);
+        if (match !== null && match.length > 2) {
+          newList.push(linkEntity('w' + match[1]) + ' ' +
+            this.context.t('QA.keepRight.errorTypes.231.layer', { layer: match[2] })
+          );
+        }
+      }
+
+      return newList.join(', ');
+    }
+
+    // arbitrary node/relation list of form: from node #ID,to relation #ID,to node #ID...
+    function parse294(capture) {
+      let newList = [];
+      const items = capture.split(',');
+
+      for (const item of items) {
+        const parts = item.split(' ');        // item of form "from/to node/relation #ID"
+        const role = `"${parts[0]}"`;         // to/from role is more clear in quotes
+        const idType = parts[1].slice(0, 1);  // first letter of node/relation provides the type
+
+        let id = parts[2].slice(1);   // ID has # at the front
+        id = linkEntity(idType + id);
+
+        newList.push(`${role} ${parts[1]} ${id}`);
+      }
+
+      return newList.join(', ');
+    }
+
+    // may or may not include the string "(including the name 'name')"
+    function parse370(capture) {
+      if (!capture) return '';
+
+      const match = capture.match(/\(including the name (\'.+\')\)/);
+      if (match?.length) {
+        return this.context.t('QA.keepRight.errorTypes.370.including_the_name', { name: match[1] });
+      }
+      return '';
+    }
+
+    // arbitrary node list of form: #ID,#ID,#ID...
+    function parse20(capture) {
+      let newList = [];
+      const items = capture.split(',');
+
+      for (const item of items) {
+        const id = linkEntity('n' + item.slice(1));   // ID has # at the front
+        newList.push(id);
+      }
+
+      return newList.join(', ');
+    }
+  }
+
+}
diff --git a/modules/services/MapWithAIService.js b/modules/services/MapWithAIService.js
new file mode 100644
index 0000000000..7a7f262b16
--- /dev/null
+++ b/modules/services/MapWithAIService.js
@@ -0,0 +1,354 @@
+import { xml as d3_xml } from 'd3-fetch';
+import { Tiler } from '@rapid-sdk/math';
+
+import { AbstractService } from './AbstractService';
+import { Graph, Tree } from '../core/lib';
+import { osmEntity, osmNode, osmWay } from '../osm';
+
+
+const APIROOT = 'https://mapwith.ai/maps/ml_roads';
+const TILEZOOM = 16;
+
+
+/**
+ * `MapWithAIService`
+ *
+ * Events available:
+ *   `loadedData`
+ */
+export class MapWithAIService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'mapwithai';
+
+    this._tiler = new Tiler().zoomRange(TILEZOOM);
+    this._datasets = {};
+    this._deferred = new Set();
+    this._off = false;
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this._parseNode = this._parseNode.bind(this);
+    this._parseWay = this._parseWay.bind(this);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+
+    // allocate a special dataset for the rapid intro graph.
+    const datasetID = 'rapid_intro_graph';
+    const graph = new Graph();
+    const tree = new Tree(graph);
+    const cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {}, firstNodeIDs: new Set() };
+    const ds = { id: datasetID, graph: graph, tree: tree, cache: cache };
+    this._datasets[datasetID] = ds;
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    for (const handle of this._deferred) {
+      window.cancelIdleCallback(handle);
+      this._deferred.delete(handle);
+    }
+
+    for (const ds of Object.values(this._datasets)) {
+      if (ds.cache.inflight) {
+        Object.values(ds.cache.inflight).forEach(controller => this._abortRequest(controller));
+      }
+      ds.graph = new Graph();
+      ds.tree = new Tree(ds.graph);
+      ds.cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {}, firstNodeIDs: new Set() };
+    }
+  }
+
+
+  graph(datasetID) {
+    const ds = this._datasets[datasetID];
+    return ds?.graph;
+  }
+
+
+  intersects(datasetID, extent) {
+    const ds = this._datasets[datasetID];
+    if (!ds || !ds.tree || !ds.graph) return [];
+    return ds.tree.intersects(extent, ds.graph);
+  }
+
+
+  merge(datasetID, entities) {
+    const ds = this._datasets[datasetID];
+    if (!ds || !ds.tree || !ds.graph) return;
+    ds.graph.rebase(entities, [ds.graph], false);
+    ds.tree.rebase(entities, false);
+  }
+
+
+  toggle(val) {
+    this._off = !val;
+  }
+
+
+  loadTiles(datasetID, projection) {
+    if (this._off) return;
+
+    let ds = this._datasets[datasetID];
+    let graph, tree, cache;
+    if (ds) {
+      graph = ds.graph;
+      tree = ds.tree;
+      cache = ds.cache;
+    } else {
+      // as tile requests arrive, setup the resources needed to hold the results
+      graph = new Graph();
+      tree = new Tree(graph);
+      cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {}, firstNodeIDs: new Set() };
+      ds = { id: datasetID, graph: graph, tree: tree, cache: cache };
+      this._datasets[datasetID] = ds;
+    }
+
+    const locationSystem = this.context.locationSystem();
+    const tiles = this._tiler.getTiles(projection).tiles;
+
+    // abort inflight requests that are no longer needed
+    for (const k of Object.keys(cache.inflight)) {
+      const wanted = tiles.find(tile => tile.id === k);
+      if (!wanted) {
+        this._abortRequest(cache.inflight[k]);
+        delete cache.inflight[k];
+      }
+    }
+
+    for (const tile of tiles) {
+      if (cache.loaded[tile.id] || cache.inflight[tile.id]) continue;
+
+      // exit if this tile covers a blocked region (all corners are blocked)
+      const corners = tile.wgs84Extent.polygon().slice(0, 4);
+      const tileBlocked = corners.every(loc => locationSystem.blocksAt(loc).length);
+      if (tileBlocked) {
+        cache.loaded[tile.id] = true;  // don't try again
+        continue;
+      }
+
+      const controller = new AbortController();
+      d3_xml(this._tileURL(ds, tile.wgs84Extent), { signal: controller.signal })
+        .then(xml => {
+          delete cache.inflight[tile.id];
+          if (!xml) return;
+          this._parseXML(ds, xml, tile, (err, result) => {
+            if (err) return;
+            graph.rebase(result, [graph], true);
+            tree.rebase(result, true);
+            cache.loaded[tile.id] = true;
+
+            this.context.deferredRedraw();
+            this.emit('loadedData');
+          });
+        })
+        .catch(e => {
+          if (e.name === 'AbortError') return;
+          console.error(e);  // eslint-disable-line
+        });
+
+      cache.inflight[tile.id] = controller;
+    }
+  }
+
+
+  _abortRequest(controller) {
+    controller.abort();
+  }
+
+
+  _tileURL(dataset, extent) {
+    // Conflated datasets have a different ID, so they get stored in their own graph/tree
+    const isConflated = /-conflated$/.test(dataset.id);
+    const datasetID = dataset.id.replace('-conflated', '');
+
+    let qs = {
+      conflate_with_osm: isConflated,
+      theme: 'ml_road_vector',
+      collaborator: 'fbid',
+      token: 'ASZUVdYpCkd3M6ZrzjXdQzHulqRMnxdlkeBJWEKOeTUoY_Gwm9fuEd2YObLrClgDB_xfavizBsh0oDfTWTF7Zb4C',
+      hash: 'ASYM8LPNy8k1XoJiI7A'
+    };
+
+    if (datasetID === 'fbRoads') {
+      qs.result_type = 'road_vector_xml';
+
+    } else if (datasetID === 'msBuildings') {
+      qs.result_type = 'road_building_vector_xml';
+      qs.building_source = 'microsoft';
+
+    } else {
+      qs.result_type = 'osm_xml';
+      qs.sources = `esri_building.${datasetID}`;
+    }
+
+    qs.bbox = extent.toParam();
+
+    const taskExtent = this.context.rapidSystem().taskExtent;
+    if (taskExtent) {
+      qs.crop_bbox = taskExtent.toParam();
+    }
+
+    const url = APIROOT + '?' + mapwithaiQsString(qs, true);  // true = noencode
+    return url;
+
+
+    // This utilQsString does not sort the keys, because the MapWithAI service needs them to be ordered a certain way.
+    function mapwithaiQsString(obj, noencode) {
+      // encode everything except special characters used in certain hash parameters:
+      // "/" in map states, ":", ",", {" and "}" in background
+      function softEncode(s) {
+        return encodeURIComponent(s).replace(/(%2F|%3A|%2C|%7B|%7D)/g, decodeURIComponent);
+      }
+
+      return Object.keys(obj).map(key => {  // NO SORT
+        return encodeURIComponent(key) + '=' + (
+          noencode ? softEncode(obj[key]) : encodeURIComponent(obj[key]));
+      }).join('&');
+    }
+  }
+
+
+  _getLoc(attrs) {
+    const lon = attrs.lon?.value;
+    const lat = attrs.lat?.value;
+    return [ parseFloat(lon), parseFloat(lat) ];
+  }
+
+
+  _getNodes(xml) {
+    const elems = Array.from(xml.getElementsByTagName('nd'));
+    return elems.map(elem => 'n' + elem.attributes.ref.value);
+  }
+
+
+  _getTags(xml) {
+    const elems = Array.from(xml.getElementsByTagName('tag'));
+    let tags = {};
+    for (const elem of elems) {
+      const attrs = elem.attributes;
+      const k = (attrs.k.value ?? '').trim();
+      const v = (attrs.v.value ?? '').trim();
+      if (k && v) {
+        tags[k] = v;
+      }
+    }
+    return tags;
+  }
+
+
+  _getVisible(attrs) {
+    return (!attrs.visible || attrs.visible.value !== 'false');
+  }
+
+
+  _parseNode(obj, uid) {
+    const attrs = obj.attributes;
+    return new osmNode({
+      id: uid,
+      visible: this._getVisible(attrs),
+      loc: this._getLoc(attrs),
+      tags: this._getTags(obj)
+    });
+  }
+
+  _parseWay(obj, uid) {
+    const attrs = obj.attributes;
+    return new osmWay({
+      id: uid,
+      visible: this._getVisible(attrs),
+      tags: this._getTags(obj),
+      nodes: this._getNodes(obj),
+    });
+  }
+
+
+  _parseXML(dataset, xml, tile, callback, options) {
+    options = Object.assign({ skipSeen: true }, options);
+    if (!xml || !xml.childNodes) {
+      return callback({ message: 'No XML', status: -1 });
+    }
+
+    const root = xml.childNodes[0];
+    const children = root.childNodes;
+    const handle = window.requestIdleCallback(() => {
+      this._deferred.delete(handle);
+      let results = [];
+      for (const child of children) {
+        const result = this._parseChild(dataset, tile, child, options);
+        if (result) results.push(result);
+      }
+      callback(null, results);
+    });
+
+    this._deferred.add(handle);
+  }
+
+
+  _parseChild(dataset, tile, child, options) {
+    const graph = dataset.graph;
+    const cache = dataset.cache;
+
+    let parser;
+    if (child.nodeName === 'node') {
+      parser = this._parseNode;
+    } else if (child.nodeName === 'way') {
+      parser = this._parseWay;
+    }
+    if (!parser) return null;
+
+    const uid = osmEntity.id.fromOSM(child.nodeName, child.attributes.id.value);
+    if (options.skipSeen) {
+      if (cache.seen[uid]) return null;  // avoid reparsing a "seen" entity
+      if (cache.origIdTile[uid]) return null;  // avoid double-parsing a split way
+      cache.seen[uid] = true;
+    }
+
+    // Handle non-deterministic way splitting from Roads Service. Splits
+    // are consistent within a single request.
+    let origUid;
+    if (child.attributes.orig_id) {
+      origUid = osmEntity.id.fromOSM(child.nodeName, child.attributes.orig_id.value);
+      // skip if seen already
+      if (graph.hasEntity(origUid) || (cache.origIdTile[origUid] && cache.origIdTile[origUid] !== tile.id)) {
+        return null;
+      }
+      cache.origIdTile[origUid] = tile.id;
+    }
+
+    let entity = parser(child, uid);
+
+    // Ignore duplicate buildings in the MS Buildings dataset.
+    // They will appear with unique entity id, but with the same nodelist.
+    // See https://github.com/facebook/Rapid/issues/873
+    if (/^msBuildings/.test(dataset.id) && entity.type === 'way') {
+      const firstNodeID = entity.nodes[0];
+      if (cache.firstNodeIDs.has(firstNodeID)) return null;
+      cache.firstNodeIDs.add(firstNodeID);
+    }
+
+    const metadata = {
+      __fbid__: child.attributes.id.value,
+      __origid__: origUid,
+      __service__: 'mapwithai',
+      __datasetid__: dataset.id
+    };
+    return Object.assign(entity, metadata);
+  }
+
+}
diff --git a/modules/services/MapillaryService.js b/modules/services/MapillaryService.js
new file mode 100644
index 0000000000..34abd4e78e
--- /dev/null
+++ b/modules/services/MapillaryService.js
@@ -0,0 +1,714 @@
+import { select as d3_select } from 'd3-selection';
+import { Extent, Tiler } from '@rapid-sdk/math';
+import { VectorTile } from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import RBush from 'rbush';
+
+import { AbstractService } from './AbstractService';
+
+const accessToken = 'MLY|3376030635833192|f13ab0bdf6b2f7b99e0d8bd5868e1d88';
+const apiUrl = 'https://graph.mapillary.com/';
+const baseTileUrl = 'https://tiles.mapillary.com/maps/vtp';
+const mapFeatureTileUrl = `${baseTileUrl}/mly_map_feature_point/2/{z}/{x}/{y}?access_token=${accessToken}`;
+const tileUrl = `${baseTileUrl}/mly1_public/2/{z}/{x}/{y}?access_token=${accessToken}`;
+const trafficSignTileUrl = `${baseTileUrl}/mly_map_feature_traffic_sign/2/{z}/{x}/{y}?access_token=${accessToken}`;
+
+const viewercss = 'mapillary-js/mapillary.css';
+const viewerjs = 'mapillary-js/mapillary.js';
+const minZoom = 14;
+
+
+/**
+ * `MapillaryService`
+ * Events available:
+ *   `imageChanged`
+ *   `bearingChanged`
+ *   `loadedImages`
+ *   `loadedSigns`
+ *   `loadedMapFeatures`
+ */
+export class MapillaryService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'mapillary';
+
+    this._loadViewerPromise = null;
+    this._mlyActiveImage = null;
+    this._mlyCache = {};
+
+    this._mlyFallback = false;
+    this._mlyHighlightedDetection = null;
+    this._mlyShowFeatureDetections = false;
+    this._mlyShowSignDetections = false;
+    this._mlyViewer = null;
+    this._mlyViewerFilter = ['all'];
+    this._tiler = new Tiler().skipNullIsland(true);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    if (this._mlyCache.requests) {
+      Object.values(this._mlyCache.requests.inflight).forEach(function(request) { request.abort(); });
+    }
+
+    this._mlyCache = {
+      images: { rtree: new RBush(), forImageID: {} },
+      image_detections: { forImageID: {} },
+      signs: { rtree: new RBush() },
+      points: { rtree: new RBush() },
+      sequences: new Map(),    // Map(sequenceID -> Array of LineStrings)
+      requests: { loaded: {}, inflight: {} }
+    };
+
+    this._mlyActiveImage = null;
+  }
+
+
+  // Get visible images
+  images(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
+    return this._mlyCache.images.rtree.search(box).map(d => d.data);
+  }
+
+  // Get visible traffic signs
+  signs(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
+    return this._mlyCache.signs.rtree.search(box).map(d => d.data);
+  }
+
+  // Get visible map (point) features
+  mapFeatures(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
+    return this._mlyCache.points.rtree.search(box).map(d => d.data);
+  }
+
+  // Get cached image by id
+  cachedImage(imageID) {
+    return this._mlyCache.images.forImageID[imageID];
+  }
+
+  // Get visible sequences
+  sequences(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
+    let result = new Map();  // Map(sequenceID -> Array of LineStrings)
+
+    // Gather sequences for images in viewport
+    for (const box of this._mlyCache.images.rtree.search(bbox)) {
+      const sequenceID = box.data.sequenceID;
+      if (!sequenceID) continue;  // no sequence for this image
+      const sequence = this._mlyCache.sequences.get(sequenceID);
+      if (!sequence) continue;  // sequence not ready
+
+      if (!result.has(sequenceID)) {
+        result.set(sequenceID, sequence);
+      }
+    }
+    return [...result.values()];
+  }
+
+
+  // Load images in the visible area
+  loadImages(projection) {
+    this._loadTiles('images', tileUrl, 14, projection);
+  }
+
+
+  // Load traffic signs in the visible area
+  loadSigns(projection) {
+    this._loadTiles('signs', trafficSignTileUrl, 14, projection);
+  }
+
+
+  // Load map (point) features in the visible area
+  loadMapFeatures(projection) {
+    this._loadTiles('points', mapFeatureTileUrl, 14, projection);
+  }
+
+
+  // Return a promise that resolves when the image viewer (Mapillary JS) library has finished loading
+  loadViewerAsync() {
+    if (this._loadViewerPromise) return this._loadViewerPromise;
+
+    const context = this.context;
+
+    // add mly-wrapper
+    const wrap = context.container().select('.photoviewer')
+      .selectAll('.mly-wrapper')
+      .data([0]);
+
+    wrap.enter()
+      .append('div')
+      .attr('id', 'ideditor-mly')
+      .attr('class', 'photo-wrapper mly-wrapper')
+      .classed('hide', true);
+
+    this._loadViewerPromise = new Promise((resolve, reject) => {
+      let loadedCount = 0;
+
+      function loaded() {
+        loadedCount += 1;
+        // wait until both files are loaded
+        if (loadedCount === 2) resolve();
+      }
+
+      const head = d3_select('head');
+
+      // load mapillary-viewercss
+      head.selectAll('#ideditor-mapillary-viewercss')
+        .data([0])
+        .enter()
+        .append('link')
+        .attr('id', 'ideditor-mapillary-viewercss')
+        .attr('rel', 'stylesheet')
+        .attr('crossorigin', 'anonymous')
+        .attr('href', context.asset(viewercss))
+        .on('load.MapillaryService', loaded)
+        .on('error.MapillaryService', reject);
+
+      // load mapillary-viewerjs
+      head.selectAll('#ideditor-mapillary-viewerjs')
+        .data([0])
+        .enter()
+        .append('script')
+        .attr('id', 'ideditor-mapillary-viewerjs')
+        .attr('crossorigin', 'anonymous')
+        .attr('src', context.asset(viewerjs))
+        .on('load.MapillaryService', loaded)
+        .on('error.MapillaryService', reject);
+    })
+    .then(() => this.initViewer())
+    .catch(err => {
+      if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
+      this._loadViewerPromise = null;
+    });
+
+    return this._loadViewerPromise;
+  }
+
+
+  // Remove previous detections in image viewer
+  resetTags() {
+    if (this._mlyViewer && !this._mlyFallback) {
+      this._mlyViewer.getComponent('tag').removeAll();
+    }
+  }
+
+
+  // Show map feature detections in image viewer
+  showFeatureDetections(value) {
+    this._mlyShowFeatureDetections = value;
+    if (!this._mlyShowFeatureDetections && !this._mlyShowSignDetections) {
+      this.resetTags();
+    }
+  }
+
+
+  // Show traffic sign detections in image viewer
+  showSignDetections(value) {
+    this._mlyShowSignDetections = value;
+    if (!this._mlyShowFeatureDetections && !this._mlyShowSignDetections) {
+      this.resetTags();
+    }
+  }
+
+
+  // Apply filter to image viewer
+  filterViewer() {
+    const photoSystem = this.context.photoSystem();
+    const showsPano = photoSystem.showsPanoramic;
+    const showsFlat = photoSystem.showsFlat;
+    const fromDate = photoSystem.fromDate;
+    const toDate = photoSystem.toDate;
+    const filter = ['all'];
+
+    if (!showsPano) filter.push([ '!=', 'cameraType', 'spherical' ]);
+    if (!showsFlat && showsPano) filter.push(['==', 'pano', true]);
+    if (fromDate) {
+      filter.push(['>=', 'capturedAt', new Date(fromDate).getTime()]);
+    }
+    if (toDate) {
+      filter.push(['>=', 'capturedAt', new Date(toDate).getTime()]);
+    }
+
+    if (this._mlyViewer) {
+      this._mlyViewer.setFilter(filter);
+    }
+    this._mlyViewerFilter = filter;
+
+    return filter;
+  }
+
+
+  // Make the image viewer visible
+  showViewer() {
+    const wrap = this.context.container().select('.photoviewer')
+      .classed('hide', false);
+
+    const isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size();
+
+    if (isHidden && this._mlyViewer) {
+      wrap
+        .selectAll('.photo-wrapper:not(.mly-wrapper)')
+        .classed('hide', true);
+
+      wrap
+        .selectAll('.photo-wrapper.mly-wrapper')
+        .classed('hide', false);
+
+      this._mlyViewer.resize();
+    }
+
+    return this;
+  }
+
+
+  // Hide the image viewer and resets map markers
+  hideViewer() {
+    this._mlyActiveImage = null;
+    const context = this.context;
+    context.photoSystem().selectPhoto(null);
+
+    if (!this._mlyFallback && this._mlyViewer) {
+      this._mlyViewer.getComponent('sequence').stop();
+    }
+
+    const viewer = context.container().select('.photoviewer');
+    if (!viewer.empty()) viewer.datum(null);
+
+    viewer
+      .classed('hide', true)
+      .selectAll('.photo-wrapper')
+      .classed('hide', true);
+
+    this.emit.call('imageChanged');
+
+    return this.setStyles(context, null);
+  }
+
+
+  // Highlight the detection in the viewer that is related to the clicked map feature
+  highlightDetection(detection) {
+    if (detection) {
+      this._mlyHighlightedDetection = detection.id;
+    }
+    return this;
+  }
+
+
+  // Initialize image viewer (Mapillary JS)
+  initViewer() {
+    const mapillary = window.mapillary;
+    if (!mapillary) return;
+
+    const context = this.context;
+
+    const opts = {
+      accessToken: accessToken,
+      component: {
+        cover: false,
+        keyboard: false,
+        tag: true
+      },
+      container: 'ideditor-mly',
+    };
+
+    // Disable components requiring WebGL support
+    if (!mapillary.isSupported() && mapillary.isFallbackSupported()) {
+      this._mlyFallback = true;
+      opts.component = {
+        cover: false,
+        direction: false,
+        imagePlane: false,
+        keyboard: false,
+        mouse: false,
+        sequence: false,
+        tag: false,
+        image: true,        // fallback
+        navigation: true    // fallback
+      };
+    }
+
+    // imageChanged: called after the viewer has changed images and is ready.
+    const imageChanged = (node) => {
+      this.resetTags();
+      const image = node.image;
+      this.setActiveImage(image);
+      this.setStyles(context, null);
+      const loc = [image.originalLngLat.lng, image.originalLngLat.lat];
+      context.mapSystem().centerEase(loc);
+      context.photoSystem().selectPhoto('mapillary', image.id);
+
+      if (this._mlyShowFeatureDetections || this._mlyShowSignDetections) {
+        this.updateDetections(image.id, `${apiUrl}/${image.id}/detections?access_token=${accessToken}&fields=id,image,geometry,value`);
+      }
+      this.emit.call('imageChanged');
+    };
+
+    // bearingChanged: called when the bearing changes in the image viewer.
+    const bearingChanged = (e) => {
+      this.emit.call('bearingChanged', undefined, e);
+    };
+
+    this._mlyViewer = new mapillary.Viewer(opts);
+    this._mlyViewer.on('image', imageChanged);
+    this._mlyViewer.on('bearing', bearingChanged);
+
+    if (this._mlyViewerFilter) {
+      this._mlyViewer.setFilter(this._mlyViewerFilter);
+    }
+
+    // Register viewer resize handler
+    context.ui().photoviewer.on('resize.mapillary', () => {
+      if (this._mlyViewer) this._mlyViewer.resize();
+    });
+  }
+
+
+  // Move to an image
+  // note: call `photoSystem.selectPhoto(layerID, photoID)` instead
+  // That will deal with the URL and call this function
+  selectImage(imageID) {
+    if (this._mlyViewer && imageID) {
+      this._mlyViewer
+        .moveTo(imageID)
+        .catch(err => console.error('mly3', err));   // eslint-disable-line no-console
+    }
+    return this;
+  }
+
+
+  // Return the currently displayed image
+  getActiveImage() {
+    return this._mlyActiveImage;
+  }
+
+
+  // Return a list of detection objects for the given id
+  getDetections(id) {
+    return this._loadDataAsync(`${apiUrl}/${id}/detections?access_token=${accessToken}&fields=id,value,image`);
+  }
+
+
+  // Set the currently visible image
+  setActiveImage(image) {
+    if (image) {
+      this._mlyActiveImage = {
+        ca: image.originalCompassAngle,
+        id: image.id,
+        loc: [image.originalLngLat.lng, image.originalLngLat.lat],
+        isPano: image.cameraType === 'spherical',
+        sequenceID: image.sequenceID
+      };
+    } else {
+      this._mlyActiveImage = null;
+    }
+  }
+
+
+  // Update the currently highlighted sequence and selected bubble.
+  setStyles(context, hovered) {
+    const hoveredImageID = hovered?.id;
+    const hoveredSequenceID = hovered?.sequenceID;
+    const selectedSequenceID = this._mlyActiveImage && this._mlyActiveImage.sequenceID;
+
+    context.container().selectAll('.layer-mapillary .viewfield-group')
+      .classed('highlighted', function(d) { return (d.sequenceID === selectedSequenceID) || (d.id === hoveredImageID); })
+      .classed('hovered', function(d) { return d.id === hoveredImageID; });
+
+    context.container().selectAll('.layer-mapillary .sequence')
+      .classed('highlighted', function(d) { return d.properties.id === hoveredSequenceID; })
+      .classed('currentView', function(d) { return d.properties.id === selectedSequenceID; });
+
+    return this;
+  }
+
+
+  // Get detections for the current image and shows them in the image viewer
+  updateDetections(imageID, url) {
+    if (!this._mlyViewer || this._mlyFallback) return;
+    if (!imageID) return;
+
+    const cache = this._mlyCache.image_detections;
+    let detections = cache.forImageID[imageID];
+
+    if (detections) {
+      this._showDetections(detections);
+    } else {
+      this._loadDataAsync(url)
+        .then(results => {
+          for (const result of results) {
+            if (!cache.forImageID[imageID]) {
+              cache.forImageID[imageID] = [];
+            }
+            cache.forImageID[imageID].push({
+              id: result.id,
+              geometry: result.geometry,
+              image_id: imageID,
+              value: result.value
+            });
+          }
+
+          this._showDetections(cache.forImageID[imageID] || []);
+        });
+    }
+  }
+
+  // Create a tag for each detection and shows it in the image viewer
+  _showDetections(detections) {
+    const tagComponent = this._mlyViewer.getComponent('tag');
+    for (const data of detections) {
+      const tag = this._makeTag(data);
+      if (tag) {
+        tagComponent.add([tag]);
+      }
+    }
+  }
+
+    // Create a Mapillary JS tag object
+  _makeTag(data) {
+    const valueParts = data.value.split('--');
+    if (!valueParts.length) return;
+
+    let tag;
+    let text;
+    let color = 0xffffff;
+
+    if (this._mlyHighlightedDetection === data.id) {
+      color = 0xffff00;
+      text = valueParts[1];
+      if (text === 'flat' || text === 'discrete' || text === 'sign') {
+        text = valueParts[2];
+      }
+      text = text.replace(/-/g, ' ');
+      text = text.charAt(0).toUpperCase() + text.slice(1);
+      this._mlyHighlightedDetection = null;
+    }
+
+    const decodedGeometry = window.atob(data.geometry);
+    let uintArray = new Uint8Array(decodedGeometry.length);
+    for (let i = 0; i < decodedGeometry.length; i++) {
+      uintArray[i] = decodedGeometry.charCodeAt(i);
+    }
+    const tile = new VectorTile(new Protobuf(uintArray.buffer));
+    const layer = tile.layers['mpy-or'];
+    const geometries = layer.feature(0).loadGeometry();
+    const polygon = geometries
+      .map(ring => ring.map(point => [point.x / layer.extent, point.y / layer.extent]));
+
+    const mapillary = window.mapillary;
+    tag = new mapillary.OutlineTag(
+      data.id,
+      new mapillary.PolygonGeometry(polygon[0]), {
+        text: text,
+        textColor: color,
+        lineColor: color,
+        lineWidth: 2,
+        fillColor: color,
+        fillOpacity: 0.3,
+      }
+    );
+
+    return tag;
+  }
+
+
+  // Load all data for the specified type from Mapillary vector tiles
+  _loadTiles(which, url, maxZoom, projection) {
+    // determine the needed tiles to cover the view
+    const tiles = this._tiler.zoomRange(minZoom, maxZoom).getTiles(projection).tiles;
+    for (const tile of tiles) {
+      this._loadTile(which, url, tile);
+    }
+  }
+
+
+  // Load all data for the specified type from one vector tile
+  _loadTile(which, url, tile) {
+    const cache = this._mlyCache.requests;
+    const tileID = `${tile.id}-${which}`;
+    if (cache.loaded[tileID] || cache.inflight[tileID]) return;
+
+    const controller = new AbortController();
+    cache.inflight[tileID] = controller;
+    const requestUrl = url
+      .replace('{x}', tile.xyz[0])
+      .replace('{y}', tile.xyz[1])
+      .replace('{z}', tile.xyz[2]);
+
+    fetch(requestUrl, { signal: controller.signal })
+      .then(response => {
+        if (!response.ok) {
+          throw new Error(response.status + ' ' + response.statusText);
+        }
+        cache.loaded[tileID] = true;
+        return response.arrayBuffer();
+      })
+      .then(data => {
+        if (!data) {
+          throw new Error('No Data');
+        }
+
+        this._loadTileDataToCache(data, tile);
+
+        this.context.deferredRedraw();
+        if (which === 'images') {
+          this.emit.call('loadedImages');
+        } else if (which === 'signs') {
+          this.emit.call('loadedSigns');
+        } else if (which === 'points') {
+          this.emit.call('loadedMapFeatures');
+        }
+      })
+      .catch(err => {
+        if (err.name === 'AbortError') return;          // ok
+        if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
+        cache.loaded[tileID] = true;  // don't retry
+      })
+      .finally(() => {
+        delete cache.inflight[tileID];
+      });
+  }
+
+
+  // Load the data from the vector tile into cache
+  _loadTileDataToCache(data, tile) {
+    const vectorTile = new VectorTile(new Protobuf(data));
+
+    if (vectorTile.layers.hasOwnProperty('image')) {
+      const cache = this._mlyCache.images;
+      const layer = vectorTile.layers.image;
+      let boxes = [];
+
+      for (let i = 0; i < layer.length; i++) {
+        const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
+        if (!feature) continue;
+        if (cache.forImageID[feature.properties.id] !== undefined) continue;  // seen already
+
+        const loc = feature.geometry.coordinates;
+        const d = {
+          id: feature.properties.id,
+          loc: loc,
+          captured_at: feature.properties.captured_at,
+          ca: feature.properties.compass_angle,
+          isPano: feature.properties.is_pano,
+          sequenceID: feature.properties.sequence_id,
+        };
+        cache.forImageID[d.id] = d;
+        boxes.push({ minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d });
+      }
+      cache.rtree.load(boxes);
+    }
+
+    if (vectorTile.layers.hasOwnProperty('sequence')) {
+      const cache = this._mlyCache.sequences;
+      const layer = vectorTile.layers.sequence;
+
+      for (let i = 0; i < layer.length; i++) {
+        const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
+        if (!feature) continue;
+        const sequenceID = feature.properties.id;
+
+        let lineStrings = cache.get(sequenceID);
+        if (!lineStrings) {
+          lineStrings = [];
+          cache.set(sequenceID, lineStrings);
+        }
+        lineStrings.push(feature);
+      }
+    }
+
+    if (vectorTile.layers.hasOwnProperty('point')) {
+      const cache = this._mlyCache.points;
+      const layer = vectorTile.layers.point;
+      let boxes = [];
+
+      for (let i = 0; i < layer.length; i++) {
+        const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
+        if (!feature) continue;
+
+        const loc = feature.geometry.coordinates;
+        const d = {
+          id: feature.properties.id,
+          loc: loc,
+          first_seen_at: feature.properties.first_seen_at,
+          last_seen_at: feature.properties.last_seen_at,
+          value: feature.properties.value
+        };
+
+        boxes.push({ minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d });
+      }
+      cache.rtree.load(boxes);
+    }
+
+    if (vectorTile.layers.hasOwnProperty('traffic_sign')) {
+      const cache = this._mlyCache.signs;
+      const layer = vectorTile.layers.traffic_sign;
+      let boxes = [];
+
+      for (let i = 0; i < layer.length; i++) {
+        const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
+        const loc = feature.geometry.coordinates;
+
+        const d = {
+          id: feature.properties.id,
+          loc: loc,
+          first_seen_at: feature.properties.first_seen_at,
+          last_seen_at: feature.properties.last_seen_at,
+          value: feature.properties.value
+        };
+        boxes.push({ minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d });
+      }
+      cache.rtree.load(boxes);
+    }
+  }
+
+
+  // Get data from the API
+  _loadDataAsync(url) {
+    return fetch(url)
+      .then(response => {
+        if (!response.ok) {
+          throw new Error(response.status + ' ' + response.statusText);
+        }
+        return response.json();
+      })
+      .then(result => {
+        return result?.data || [];
+      })
+      .catch(err => {
+        if (err.name === 'AbortError') return;          // ok
+        if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
+      });
+  }
+
+}
diff --git a/modules/services/NominatimService.js b/modules/services/NominatimService.js
new file mode 100644
index 0000000000..c6518c92de
--- /dev/null
+++ b/modules/services/NominatimService.js
@@ -0,0 +1,150 @@
+import { json as d3_json } from 'd3-fetch';
+import { Extent } from '@rapid-sdk/math';
+import { utilQsString } from '@rapid-sdk/util';
+import RBush from 'rbush';
+
+import { AbstractService } from './AbstractService';
+
+
+/**
+ * `NominatimService`
+ */
+export class NominatimService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'nominatim';
+
+    this.apibase = 'https://nominatim.openstreetmap.org/';
+    this._inflight = {};
+    this._nominatimCache = new RBush();
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this.countryCode = this.countryCode.bind(this);
+    this.reverse = this.reverse.bind(this);
+    this.search = this.search.bind(this);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    Object.values(this._inflight).forEach(controller => controller.abort());
+    this._inflight = {};
+    this._nominatimCache = new RBush();
+  }
+
+
+  /**
+   * countryCode
+   * @param  loc      [lon,lat]
+   * @param  callback
+   */
+  countryCode(loc, callback) {
+    this.reverse(loc, (err, result) => {
+      if (err) {
+        return callback(err);
+      } else if (result.address) {
+        return callback(null, result.address.country_code);
+      } else {
+        return callback('Unable to geocode', null);
+      }
+    });
+  }
+
+
+  /**
+   * reverse
+   * @param  loc      [lon,lat]
+   * @param  callback
+   */
+  reverse(loc, callback) {
+    const cached = this._nominatimCache.search(
+      { minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1] }
+    );
+
+    if (cached.length > 0) {
+      if (callback) callback(null, cached[0].data);
+      return;
+    }
+
+    const params = { zoom: 13, format: 'json', addressdetails: 1, lat: loc[1], lon: loc[0] };
+    const url = this.apibase + 'reverse?' + utilQsString(params);
+    if (this._inflight[url]) return;
+
+    const controller = new AbortController();
+    this._inflight[url] = controller;
+
+    const l10n = this.context.localizationSystem();
+    const opts = {
+      signal: controller.signal,
+      headers: { 'Accept-Language': l10n.localeCodes().join(',') }
+    };
+
+    d3_json(url, opts)
+      .then(result => {
+        delete this._inflight[url];
+        if (result?.error) {
+          throw new Error(result.error);
+        }
+        const extent = new Extent(loc).padByMeters(200);
+        this._nominatimCache.insert(Object.assign(extent.bbox(), { data: result }));
+        if (callback) callback(null, result);
+      })
+      .catch(err => {
+        delete this._inflight[url];
+        if (err.name === 'AbortError') return;
+        if (callback) callback(err.message);
+      });
+  }
+
+
+  /**
+   * search
+   * @param  val
+   * @param  callback
+   */
+  search(val, callback) {
+    const searchVal = encodeURIComponent(val);
+    const url = this.apibase + `search/${searchVal}?limit=10&format=json`;
+    if (this._inflight[url]) return;
+
+    const controller = new AbortController();
+    this._inflight[url] = controller;
+
+    const l10n = this.context.localizationSystem();
+    const opts = {
+      signal: controller.signal,
+      headers: { 'Accept-Language': l10n.localeCodes().join(',') }
+    };
+
+    d3_json(url, opts)
+      .then(result => {
+        delete this._inflight[url];
+        if (result?.error) {
+          throw new Error(result.error);
+        }
+        if (callback) callback(null, result);
+      })
+      .catch(err => {
+        delete this._inflight[url];
+        if (err.name === 'AbortError') return;
+        if (callback) callback(err.message);
+      });
+  }
+
+}
diff --git a/modules/services/NsiService.js b/modules/services/NsiService.js
new file mode 100644
index 0000000000..5ed27d4a85
--- /dev/null
+++ b/modules/services/NsiService.js
@@ -0,0 +1,700 @@
+import { Matcher } from 'name-suggestion-index';
+
+import { AbstractService } from './AbstractService';
+
+
+
+// This service contains all the code related to the **name-suggestion-index** (aka NSI)
+// NSI contains the most correct tagging for many commonly mapped features.
+// See https://github.com/osmlab/name-suggestion-index  and  https://nsi.guide
+
+// Sometimes we can upgrade a feature tagged like `building=yes` to a better tag.
+const buildingPreset = {
+  'building/commercial': true,
+  'building/government': true,
+  'building/hotel': true,
+  'building/retail': true,
+  'building/office': true,
+  'building/supermarket': true,
+  'building/yes': true
+};
+
+// Exceptions to the namelike regexes.
+// Usually a tag suffix contains a language code like `name:en`, `name:ru`
+// but we want to exclude things like `operator:type`, `name:etymology`, etc..
+const notNames = /:(colou?r|type|forward|backward|left|right|etymology|pronunciation|wikipedia)$/i;
+
+// Exceptions to the branchlike regexes
+const notBranches = /(coop|express|wireless|factory|outlet)/i;
+
+
+
+/**
+ * `NsiService`
+ */
+export class NsiService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'nsi';
+    this.status = 'loading';  // 'loading', 'ok', 'failed'
+
+    this._nsi = {};
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    // Add the sources to the dataloader so we can start downloading data.
+    const sources = {
+      'nsi_data': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/nsi.min.json',
+      'nsi_dissolved': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/dissolved.min.json',
+      'nsi_features': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/featureCollection.min.json',
+      'nsi_generics': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/genericWords.min.json',
+      'nsi_presets': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/presets/nsi-id-presets.min.json',
+      'nsi_replacements': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/replacements.min.json',
+      'nsi_trees': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/trees.min.json'
+    };
+
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+    const fileMap = dataLoaderSystem.fileMap;
+    for (const [k, url] of Object.entries(sources)) {
+      if (!fileMap.has(k)) {
+        fileMap.set(k, url);
+      }
+    }
+
+    // Note: `init` is called immediately after the presetsystem has started loading its data.
+    // We expect to chain onto an unfulfilled promise here.
+    const presetSystem = this.context.presetSystem();
+    presetSystem.initAsync()
+      .then(() => this._loadNsiPresetsAsync())
+      .then(() => this._loadNsiDataAsync())
+      .then(() => this.status = 'ok')
+      .catch(e => {
+        console.error(e);  // eslint-disable-line
+        this.status = 'failed';
+      });
+  }
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+  }
+
+
+  // `isGenericName()`
+  // Is the `name` tag generic?
+  //
+  // Arguments
+  //   `tags`: `Object` containing the feature's OSM tags
+  // Returns
+  //   `true` if it is generic, `false` if not
+  //
+  isGenericName(tags) {
+    const n = tags.name;
+    if (!n) return false;
+
+    // tryNames just contains the `name` tag value and nothing else
+    const tryNames = { primary: new Set([n]), alternate: new Set() };
+
+    // Gather key/value tag pairs to try to match
+    const tryKVs = this._gatherKVs(tags);
+    if (!tryKVs.primary.size && !tryKVs.alternate.size)  return false;
+
+    // Order the [key,value,name] tuples - test primary before alternate
+    const tuples = this._gatherTuples(tryKVs, tryNames);
+
+    for (const tuple of tuples) {
+      const hits = this._nsi.matcher.match(tuple.k, tuple.v, tuple.n);   // Attempt to match an item in NSI
+
+      // If we get a `excludeGeneric` hit, this is a generic name.
+      if (hits?.length && hits[0].match === 'excludeGeneric') return true;
+    }
+
+    return false;
+  }
+
+
+  // `upgradeTags()`
+  // Suggest tag upgrades.
+  // This function will not modify the input tags, it makes a copy.
+  //
+  // Arguments
+  //   `tags`: `Object` containing the feature's OSM tags
+  //   `loc`: Location where this feature exists, as a [lon, lat]
+  // Returns
+  //   `Object` containing the result, or `null` if no changes needed:
+  //   {
+  //     'newTags': `Object` - The tags the the feature should have
+  //     'matched': `Object` - The matched item
+  //   }
+  //
+  upgradeTags(tags, loc) {
+    let newTags = Object.assign({}, tags);  // shallow copy
+    let changed = false;
+
+    // Before anything, perform trivial Wikipedia/Wikidata replacements
+    for (const osmkey of Object.keys(newTags)) {
+      const matchTag = osmkey.match(/^(\w+:)?wikidata$/);
+      if (matchTag) {                         // Look at '*:wikidata' tags
+        const prefix = (matchTag[1] || '');
+        const wd = newTags[osmkey];
+        const replace = this._nsi.replacements[wd];    // If it matches a QID in the replacement list...
+
+        if (replace?.wikidata !== undefined) {   // replace or delete `*:wikidata` tag
+          changed = true;
+          if (replace.wikidata) {
+            newTags[osmkey] = replace.wikidata;
+          } else {
+            delete newTags[osmkey];
+          }
+        }
+        if (replace?.wikipedia !== undefined) {  // replace or delete `*:wikipedia` tag
+          changed = true;
+          const wpkey = `${prefix}wikipedia`;
+          if (replace.wikipedia) {
+            newTags[wpkey] = replace.wikipedia;
+          } else {
+            delete newTags[wpkey];
+          }
+        }
+      }
+    }
+
+    // Match a 'route_master' as if it were a 'route' - name-suggestion-index#5184
+    const isRouteMaster = (tags.type === 'route_master');
+
+    // Gather key/value tag pairs to try to match
+    const tryKVs = this._gatherKVs(tags);
+    if (!tryKVs.primary.size && !tryKVs.alternate.size) {
+      return changed ? { newTags: newTags, matched: null } : null;
+    }
+
+    // Gather namelike tag values to try to match
+    const tryNames = this._gatherNames(tags);
+
+    // Do `wikidata=*` or `wikipedia=*` tags identify this entity as a chain? - See iD#6416
+    // If so, these tags can be swapped to e.g. `brand:wikidata`/`brand:wikipedia`.
+    const foundQID = this._nsi.qids.get(tags.wikidata) || this._nsi.qids.get(tags.wikipedia);
+    if (foundQID) tryNames.primary.add(foundQID);  // matcher will recognize the Wikidata QID as name too
+
+    if (!tryNames.primary.size && !tryNames.alternate.size) {
+      return changed ? { newTags: newTags, matched: null } : null;
+    }
+
+    // Order the [key,value,name] tuples - test primary before alternate
+    const tuples = this._gatherTuples(tryKVs, tryNames);
+    for (const tuple of tuples) {
+      const hits = this._nsi.matcher.match(tuple.k, tuple.v, tuple.n, loc);   // Attempt to match an item in NSI
+
+      if (!hits || !hits.length) continue;  // no match, try next tuple
+      if (hits[0].match !== 'primary' && hits[0].match !== 'alternate') break;  // a generic match, stop looking
+
+      // A match may contain multiple results, the first one is likely the best one for this location
+      // e.g. `['pfk-a54c14', 'kfc-1ff19c', 'kfc-658eea']`
+      let itemID, item;
+      for (const hit of hits) {
+        itemID = hit.itemID;
+        if (this._nsi.dissolved[itemID]) continue;       // Don't upgrade to a dissolved item
+
+        item = this._nsi.ids.get(itemID);
+        if (!item) continue;
+        const mainTag = item.mainTag;               // e.g. `brand:wikidata`
+        const itemQID = item.tags[mainTag];         // e.g. `brand:wikidata` qid
+        const notQID = newTags[`not:${mainTag}`];   // e.g. `not:brand:wikidata` qid
+
+        if (                                        // Exceptions, skip this hit
+          (!itemQID || itemQID === notQID) ||       // No `*:wikidata` or matched a `not:*:wikidata`
+          (newTags.office && !item.tags.office)     // feature may be a corporate office for a brand? - iD#6416
+        ) {
+          item = null;
+          continue;  // continue looking
+        } else {
+          break;     // use `item`
+        }
+      }
+
+      // Can't use any of these hits, try next tuple..
+      if (!item) continue;
+
+      // At this point we have matched a canonical item and can suggest tag upgrades..
+      item = JSON.parse(JSON.stringify(item));   // deep copy
+      const tkv = item.tkv;
+      const parts = tkv.split('/', 3);     // tkv = "tree/key/value"
+      const k = parts[1];
+      const v = parts[2];
+      const category = this._nsi.data[tkv];
+      const properties = category.properties || {};
+
+      // Preserve some tags that we specifically don't want NSI to overwrite. ('^name', sometimes)
+      let preserveTags = item.preserveTags || properties.preserveTags || [];
+
+      // These tags can be toplevel tags -or- attributes - so we generally want to preserve existing values - iD#8615
+      // We'll only _replace_ the tag value if this tag is the toplevel/defining tag for the matched item (`k`)
+      ['building', 'emergency', 'internet_access', 'takeaway'].forEach(osmkey => {
+        if (k !== osmkey) preserveTags.push(`^${osmkey}$`);
+      });
+
+      const regexes = preserveTags.map(s => new RegExp(s, 'i'));
+
+      let keepTags = {};
+      for (const osmkey of Object.keys(newTags)) {
+        if (regexes.some(regex => regex.test(osmkey))) {
+          keepTags[osmkey] = newTags[osmkey];
+        }
+      }
+
+      // Remove any primary tags ("amenity", "craft", "shop", "man_made", "route", etc) that have a
+      // value like `amenity=yes` or `shop=yes` (exceptions have already been added to `keepTags` above)
+      this._nsi.kvt.forEach((vmap, k) => {
+        if (newTags[k] === 'yes') delete newTags[k];
+      });
+
+      // Replace mistagged `wikidata`/`wikipedia` with e.g. `brand:wikidata`/`brand:wikipedia`
+      if (foundQID) {
+        delete newTags.wikipedia;
+        delete newTags.wikidata;
+      }
+
+      // Do the tag upgrade
+      Object.assign(newTags, item.tags, keepTags);
+
+      // Swap `route` back to `route_master` - name-suggestion-index#5184
+      if (isRouteMaster) {
+        newTags.route_master = newTags.route;
+        delete newTags.route;
+      }
+
+      // Special `branch` splitting rules - IF..
+      // - NSI is suggesting to replace `name`, AND
+      // - `branch` doesn't already contain something, AND
+      // - original name has not moved to an alternate name (e.g. "Dunkin' Donuts" -> "Dunkin'"), AND
+      // - original name is "some name" + "some stuff", THEN
+      // consider splitting `name` into `name`/`branch`..
+      const origName = tags.name;
+      const newName = newTags.name;
+      if (newName && origName && newName !== origName && !newTags.branch) {
+        const newNames = this._gatherNames(newTags);
+        const newSet = new Set([...newNames.primary, ...newNames.alternate]);
+        const isMoved = newSet.has(origName);   // another tag holds the original name now
+
+        if (!isMoved) {
+          // Test name fragments, longest to shortest, to fit them into a "Name Branch" pattern.
+          // e.g. "TUI ReiseCenter - Neuss Innenstadt" -> ["TUI", "ReiseCenter", "Neuss", "Innenstadt"]
+          const nameParts = origName.split(/[\s\-\/,.]/);
+          for (let split = nameParts.length; split > 0; split--) {
+            const name = nameParts.slice(0, split).join(' ');  // e.g. "TUI ReiseCenter"
+            const branch = nameParts.slice(split).join(' ');   // e.g. "Neuss Innenstadt"
+            const nameHits = this._nsi.matcher.match(k, v, name, loc);
+            if (!nameHits || !nameHits.length) continue;    // no match, try next name fragment
+
+            if (nameHits.some(hit => hit.itemID === itemID)) {   // matched the name fragment to the same itemID above
+              if (branch) {
+                if (notBranches.test(branch)) {   // "branch" was detected but is noise ("factory outlet", etc)
+                  newTags.name = origName;        // Leave `name` alone, this part of the name may be significant..
+                } else {
+                  const branchHits = this._nsi.matcher.match(k, v, branch, loc);
+                  if (branchHits && branchHits.length) {                                             // if "branch" matched something else in NSI..
+                    if (branchHits[0].match === 'primary' || branchHits[0].match === 'alternate') {  // if another brand! (e.g. "KFC - Taco Bell"?)
+                      return null;                                                                   //   bail out - can't suggest tags in this case
+                    }                                                                                // else a generic (e.g. "gas", "cafe") - ignore
+                  } else {                     // "branch" is not noise and not something in NSI
+                    newTags.branch = branch;   // Stick it in the `branch` tag..
+                  }
+                }
+              }
+              break;
+            }
+          }
+        }
+      }
+
+      return { newTags: newTags, matched: item };
+    }
+
+    return changed ? { newTags: newTags, matched: null } : null;
+  }
+
+
+
+
+  // _loadNsiPresetsAsync()
+  //  Returns a Promise fulfilled when the presets have been downloaded and merged into Rapid.
+  _loadNsiPresetsAsync() {
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+
+    return (
+      Promise.all([
+        dataLoaderSystem.get('nsi_presets'),
+        dataLoaderSystem.get('nsi_features')
+      ])
+      .then(vals => {
+        // Add `suggestion=true` to all the nsi presets
+        // The preset json schema doesn't include it, but the Rapid code still uses it
+        Object.values(vals[0].presets).forEach(preset => preset.suggestion = true);
+
+        const presetSystem = this.context.presetSystem();
+        presetSystem.merge({ presets: vals[0].presets, featureCollection: vals[1] });
+      })
+    );
+  }
+
+
+  // this._loadNsiDataAsync()
+  //  Returns a Promise fulfilled when the other data have been downloaded and processed
+  //
+  _loadNsiDataAsync() {
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+
+    return (
+      Promise.all([
+        dataLoaderSystem.get('nsi_data'),
+        dataLoaderSystem.get('nsi_dissolved'),
+        dataLoaderSystem.get('nsi_replacements'),
+        dataLoaderSystem.get('nsi_trees')
+      ])
+      .then(vals => {
+        this._nsi = {
+          data:          vals[0].nsi,            // the raw name-suggestion-index data
+          dissolved:     vals[1].dissolved,      // list of dissolved items
+          replacements:  vals[2].replacements,   // trivial old->new qid replacements
+          trees:         vals[3].trees,          // metadata about trees, main tags
+          kvt:           new Map(),              // Map (k -> Map (v -> t) )
+          qids:          new Map(),              // Map (wd/wp tag values -> qids)
+          ids:           new Map()               // Map (id -> NSI item)
+        };
+
+        const matcher = this._nsi.matcher = new Matcher();
+        matcher.buildMatchIndex(this._nsi.data);
+
+// *** BEGIN HACK ***
+
+// old - built in matcher will set up its own locationindex by resolving all the locationSets one-by-one
+        // matcher.buildLocationIndex(this._nsi.data, locationSystem.loco());
+
+// new - Use Rapid's locationSystem instead of redoing that work
+// It has already processed the presets at this point
+
+// We need to monkeypatch a few of the collections that the NSI matcher depends on.
+// The `itemLocation` structure maps itemIDs to locationSetIDs
+matcher.itemLocation = new Map();
+
+// The `locationSets` structure maps locationSetIDs to GeoJSON
+// We definitely need this, but don't need full geojson, just { properties: { area: xxx }}
+matcher.locationSets = new Map();
+
+const locationSystem = this.context.locationSystem();
+for (const category of Object.values(this._nsi.data)) {
+  for (const item of category.items ?? []) {
+    if (matcher.itemLocation.has(item.id)) continue;   // we've seen item id already - shouldn't be possible?
+
+    const locationSetID = locationSystem.locationSetID(item.locationSet);
+    matcher.itemLocation.set(item.id, locationSetID);
+
+    if (matcher.locationSets.has(locationSetID)) continue;   // we've seen this locationSet before..
+
+    const fakeFeature = { id: locationSetID, properties: { id: locationSetID, area: 1 } };
+    matcher.locationSets.set(locationSetID, fakeFeature);
+  }
+}
+
+// The `locationIndex` is an instance of which-polygon spatial index for the locationSets.
+// We only really need this to _look like_ which-polygon query `_wp.locationIndex(bbox, true);`
+// i.e. it needs to return the properties of the locationsets
+matcher.locationIndex = (bbox) => {
+  const validHere = locationSystem.locationSetsAt([bbox[0], bbox[1]]);
+  const results = [];
+
+  for (const [locationSetID, area] of Object.entries(validHere)) {
+    const fakeFeature = matcher.locationSets.get(locationSetID);
+    if (fakeFeature) {
+      fakeFeature.properties.area = area;
+      results.push(fakeFeature);
+    }
+  }
+  return results;
+};
+
+// *** END HACK ***
+
+        Object.keys(this._nsi.data).forEach(tkv => {
+          const category = this._nsi.data[tkv];
+          const [t, k, v] = tkv.split('/', 3);     // tkv = "tree/key/value"
+
+          // Build a reverse index of keys -> values -> trees present in the name-suggestion-index
+          // Collect primary keys  (e.g. "amenity", "craft", "shop", "man_made", "route", etc)
+          // "amenity": {
+          //   "restaurant": "brands"
+          // }
+          let vmap = this._nsi.kvt.get(k);
+          if (!vmap) {
+            vmap = new Map();
+            this._nsi.kvt.set(k, vmap);
+          }
+          vmap.set(v, t);
+
+          const tree = this._nsi.trees[t];  // e.g. "brands", "operators"
+          const mainTag = tree.mainTag;     // e.g. "brand:wikidata", "operator:wikidata", etc
+
+          const items = category.items || [];
+          items.forEach(item => {
+            // Remember some useful things for later, cache NSI id -> item
+            item.tkv = tkv;
+            item.mainTag = mainTag;
+            this._nsi.ids.set(item.id, item);
+
+            // Cache Wikidata/Wikipedia values -> qid, for iD#6416
+            const wd = item.tags[mainTag];
+            const wp = item.tags[mainTag.replace('wikidata', 'wikipedia')];
+            if (wd)         this._nsi.qids.set(wd, wd);
+            if (wp && wd)   this._nsi.qids.set(wp, wd);
+          });
+        });
+      })
+    );
+  }
+
+
+  // _gatherKVs()
+  // Gather all the k/v pairs that we will run through the NSI matcher.
+  // An OSM tags object can contain anything, but only a few tags will be interesting to NSI.
+  //
+  // This function will return the interesting tag pairs like:
+  //   "amenity/restaurant", "man_made/flagpole"
+  // and fallbacks like
+  //   "amenity/yes"
+  // excluding things like
+  //   "tiger:reviewed", "surface", "ref", etc.
+  //
+  // Arguments
+  //   `tags`: `Object` containing the feature's OSM tags
+  // Returns
+  //   `Object` containing kv pairs to test:
+  //   {
+  //     'primary': Set(),
+  //     'alternate': Set()
+  //   }
+  //
+  _gatherKVs(tags) {
+    let primary = new Set();
+    let alternate = new Set();
+
+    for (let [osmkey, osmvalue] of Object.entries(tags)) {
+      if (!osmkey || !osmvalue) continue;
+
+      // Match a 'route_master' as if it were a 'route' - name-suggestion-index#5184
+      if (osmkey === 'route_master') osmkey = 'route';
+
+      const vmap = this._nsi.kvt.get(osmkey);
+      if (!vmap) continue;  // not an interesting key
+
+      if (vmap.get(osmvalue)) {     // Matched a category in NSI
+        primary.add(`${osmkey}/${osmvalue}`);     // interesting key/value
+      } else if (osmvalue === 'yes') {
+        alternate.add(`${osmkey}/${osmvalue}`);   // fallback key/yes
+      }
+    }
+
+    // Can we try a generic building fallback match? - See #6122, #7197
+    // Only try this if we do a preset match and find nothing else remarkable about that building.
+    // For example, a way with `building=yes` + `name=Westfield` may be a Westfield department store.
+    // But a way with `building=yes` + `name=Westfield` + `public_transport=station` is a train station for a town named "Westfield"
+    const presetSystem = this.context.presetSystem();
+    const preset = presetSystem.matchTags(tags, 'area');
+    if (buildingPreset[preset.id]) {
+      alternate.add('building/yes');
+    }
+
+    return { primary: primary, alternate: alternate };
+  }
+
+
+  // _identifyTree()
+  // NSI has a concept of trees: "brands", "operators", "flags", "transit".
+  // The tree determines things like which tags are namelike, and which tags hold important wikidata.
+  // This takes an Object of tags and tries to identify what tree to use.
+  //
+  // Arguments
+  //   `tags`: `Object` containing the feature's OSM tags
+  // Returns
+  //   `string` the name of the tree if known
+  //   or 'unknown' if it could match several trees (e.g. amenity/yes)
+  //   or null if no match
+  //
+  _identifyTree(tags) {
+    let unknown;
+    let t;
+
+    // Check all tags
+    for (let [osmkey, osmvalue] of Object.entries(tags)) {
+      if (!osmkey || !osmvalue) continue;
+
+      // Match a 'route_master' as if it were a 'route' - name-suggestion-index#5184
+      if (osmkey === 'route_master') osmkey = 'route';
+
+      const vmap = this._nsi.kvt.get(osmkey);
+      if (!vmap) continue;  // this key is not in nsi
+
+      if (osmvalue === 'yes') {
+        unknown = 'unknown';
+      } else {
+        t = vmap.get(osmvalue);
+        break;  // found it
+      }
+    }
+
+    return t || unknown || null;
+  }
+
+
+  // _gatherNames()
+  // Gather all the namelike values that we will run through the NSI matcher.
+  // It will gather values primarily from tags `name`, `name:ru`, `flag:name`
+  //  and fallback to alternate tags like `brand`, `brand:ru`, `alt_name`
+  //
+  // Arguments
+  //   `tags`: `Object` containing the feature's OSM tags
+  // Returns
+  //   `Object` containing namelike values to test:
+  //   {
+  //     'primary': Set(),
+  //     'fallbacks': Set()
+  //   }
+  //
+  _gatherNames(tags) {
+    const empty = { primary: new Set(), alternate: new Set() };
+    let primary = new Set();
+    let alternate = new Set();
+    let foundSemi = false;
+    let testNameFragments = false;
+    let patterns;
+
+    // Patterns for matching OSM keys that might contain namelike values.
+    // These roughly correspond to the "trees" concept in name-suggestion-index,
+    let t = this._identifyTree(tags);
+    if (!t) return empty;
+
+    if (t === 'transit') {
+      patterns = {
+        primary: /^network$/i,
+        alternate: /^(operator|operator:\w+|network:\w+|\w+_name|\w+_name:\w+)$/i
+      };
+    } else if (t === 'flags') {
+      patterns = {
+        primary: /^(flag:name|flag:name:\w+)$/i,
+        alternate: /^(flag|flag:\w+|subject|subject:\w+)$/i   // note: no `country`, we special-case it below
+      };
+    } else if (t === 'brands') {
+      testNameFragments = true;
+      patterns = {
+        primary: /^(name|name:\w+)$/i,
+        alternate: /^(brand|brand:\w+|operator|operator:\w+|\w+_name|\w+_name:\w+)/i,
+      };
+    } else if (t === 'operators') {
+      testNameFragments = true;
+      patterns = {
+        primary: /^(name|name:\w+|operator|operator:\w+)$/i,
+        alternate: /^(brand|brand:\w+|\w+_name|\w+_name:\w+)/i,
+      };
+    } else {  // unknown/multiple
+      testNameFragments = true;
+      patterns = {
+        primary: /^(name|name:\w+)$/i,
+        alternate: /^(brand|brand:\w+|network|network:\w+|operator|operator:\w+|\w+_name|\w+_name:\w+)/i,
+      };
+    }
+
+    // Test `name` fragments, longest to shortest, to fit them into a "Name Branch" pattern.
+    // e.g. "TUI ReiseCenter - Neuss Innenstadt" -> ["TUI", "ReiseCenter", "Neuss", "Innenstadt"]
+    if (tags.name && testNameFragments) {
+      const nameParts = tags.name.split(/[\s\-\/,.]/);
+      for (let split = nameParts.length; split > 0; split--) {
+        const name = nameParts.slice(0, split).join(' ');  // e.g. "TUI ReiseCenter"
+        primary.add(name);
+      }
+    }
+
+    // Check all tags
+    for (const [osmkey, osmvalue] of Object.entries(tags)) {
+      if (!osmkey || !osmvalue) continue;
+
+      if (isNamelike(osmkey, 'primary')) {
+        if (/;/.test(osmvalue)) {
+          foundSemi = true;
+        } else {
+          primary.add(osmvalue);
+          alternate.delete(osmvalue);
+        }
+      } else if (!primary.has(osmvalue) && isNamelike(osmkey, 'alternate')) {
+        if (/;/.test(osmvalue)) {
+          foundSemi = true;
+        } else {
+          alternate.add(osmvalue);
+        }
+      }
+    }
+
+    // For flags only, fallback to `country` tag only if no other namelike values were found.
+    // See https://github.com/openstreetmap/iD/pull/8305#issuecomment-769174070
+    if (tags.man_made === 'flagpole' && !primary.size && !alternate.size && !!tags.country) {
+      const osmvalue = tags.country;
+      if (/;/.test(osmvalue)) {
+        foundSemi = true;
+      } else {
+        alternate.add(osmvalue);
+      }
+    }
+
+    // If any namelike value contained a semicolon, return empty set and don't try matching anything.
+    if (foundSemi) {
+      return empty;
+    } else {
+      return { primary: primary, alternate: alternate };
+    }
+
+    function isNamelike(osmkey, which) {
+      if (osmkey === 'old_name') return false;
+      return patterns[which].test(osmkey) && !notNames.test(osmkey);
+    }
+  }
+
+
+  // _gatherTuples()`
+  // Generate all combinations of [key,value,name] that we want to test.
+  // This prioritizes them so that the primary name and k/v pairs go first
+  //
+  // Arguments
+  //   `tryKVs`: `Object` containing primary and alternate k/v pairs to test
+  //   `tryNames`: `Object` containing primary and alternate names to test
+  // Returns
+  //   `Array`: tuple objects ordered by priority
+  //
+  _gatherTuples(tryKVs, tryNames) {
+    let tuples = [];
+
+    for (const nameGroup of ['primary', 'alternate']) {
+      // test names longest to shortest
+      const names = Array.from(tryNames[nameGroup]).sort((a, b) => b.length - a.length);
+      for (const n of names) {
+        for (const kvGroup of ['primary', 'alternate']) {
+          for (const kv of tryKVs[kvGroup]) {
+            const [k, v] = kv.split('/', 2);
+            tuples.push({ k: k, v: v, n: n });
+          }
+        }
+      }
+    }
+    return tuples;
+  }
+
+}
diff --git a/modules/services/OsmService.js b/modules/services/OsmService.js
new file mode 100644
index 0000000000..f5cf53ecfe
--- /dev/null
+++ b/modules/services/OsmService.js
@@ -0,0 +1,1554 @@
+import { json as d3_json, xml as d3_xml } from 'd3-fetch';
+import { Extent, Projection, Tiler, geoZoomToScale, vecAdd } from '@rapid-sdk/math';
+import { utilArrayChunk, utilArrayGroupBy, utilArrayUniq, utilObjectOmit, utilQsString, utilStringQs } from '@rapid-sdk/util';
+import _throttle from 'lodash-es/throttle';
+import { osmAuth } from 'osm-auth';
+import RBush from 'rbush';
+
+import { AbstractService } from './AbstractService';
+import { JXON } from '../util/jxon';
+import { osmEntity, osmNode, osmNote, osmRelation, osmWay } from '../osm';
+
+
+/**
+ * `OsmService`
+ *
+ * Events available:
+ *   'apiStatusChange'
+ *   'authLoading'
+ *   'authDone'
+ *   'authchange'
+ *   'loading'
+ *   'loaded'
+ *   'loadedNotes'
+ */
+export class OsmService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'osm';
+
+    // Some defaults that we will replace with whatever we fetch from the OSM API capabilities result.
+    this._maxWayNodes = 2000;
+    this._imageryBlocklists = [/.*\.google(apis)?\..*\/(vt|kh)[\?\/].*([xyz]=.*){3}.*/];
+    this._urlroot = 'https://www.openstreetmap.org';
+
+    this._tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: new RBush() };
+    this._noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: new RBush() };
+    this._userCache = { toLoad: {}, user: {} };
+    this._changeset = {};
+
+    this._deferred = new Set();
+    this._connectionID = 0;
+    this._tileZoom = 16;
+    this._noteZoom = 12;
+    this._rateLimitError = undefined;
+    this._userChangesets = undefined;
+    this._userDetails = undefined;
+    this._cachedApiStatus = undefined;
+    this._off = false;
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this._authLoading = this._authLoading.bind(this);
+    this._authDone = this._authDone.bind(this);
+    this._parseNodeJSON = this._parseNodeJSON.bind(this);
+    this._parseWayJSON = this._parseWayJSON.bind(this);
+    this._parseRelationJSON = this._parseRelationJSON.bind(this);
+    this._parseNodeXML = this._parseNodeXML.bind(this);
+    this._parseWayXML = this._parseWayXML.bind(this);
+    this._parseRelationXML = this._parseRelationXML.bind(this);
+    this._parseNoteXML = this._parseNoteXML.bind(this);
+    this._parseUserXML = this._parseUserXML.bind(this);
+
+    // Auth
+    const q = utilStringQs(window.location.hash);
+    this._credentialsMode = 'omit';
+    if (q.hasOwnProperty('osm_api_url')) {
+      this._urlroot = q.osm_api_url;
+      this._credentialsMode = 'include';
+    }
+
+    const origin = window.location.origin;
+    let pathname = window.location.pathname;
+    // We often deploy different builds to other pathnames (e.g. /rapid-test/), but we can always
+    // redirect to the common /rapid/land.html redirect_uri to complete OAuth2 on that domain.
+    if (origin === 'https://mapwith.ai' || origin === 'https://rapideditor.org') {
+      pathname = '/rapid/';
+    }
+
+    this._oauth = osmAuth({
+      url: this._urlroot,
+      client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
+      client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE',
+      scope: 'read_prefs write_prefs write_api read_gpx write_notes',
+      redirect_uri: `${origin}${pathname}land.html`,
+      loading: this._authLoading,
+      done: this._authDone
+    });
+
+
+    this._tiler = new Tiler();
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    for (const handle of this._deferred) {
+      window.cancelIdleCallback(handle);
+      this._deferred.delete(handle);
+    }
+
+    this._connectionID++;
+    this._userChangesets = undefined;
+    this._userDetails = undefined;
+    this._rateLimitError = undefined;
+    this._cachedApiStatus = undefined;
+
+    Object.values(this._tileCache.inflight).forEach(this._abortRequest);
+    Object.values(this._noteCache.inflight).forEach(this._abortRequest);
+    Object.values(this._noteCache.inflightPost).forEach(this._abortRequest);
+    if (this._changeset.inflight) this._abortRequest(this._changeset.inflight);
+
+    this._tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: new RBush() };
+    this._noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: new RBush() };
+    this._userCache = { toLoad: {}, user: {} };
+    this._changeset = {};
+  }
+
+
+  get connectionID() {
+    return this._connectionID;
+  }
+
+  get urlroot() {
+    return this._urlroot;
+  }
+
+  get imageryBlocklists() {
+    return this._imageryBlocklists;
+  }
+
+  // Returns the maximum number of nodes a single way can have
+  get maxWayNodes() {
+    return this._maxWayNodes;
+  }
+
+
+  changesetURL(changesetID) {
+    return `${this._urlroot}/changeset/${changesetID}`;
+  }
+
+
+  changesetsURL(center, zoom) {
+    const precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+    return this._urlroot + '/history#map=' +
+      Math.floor(zoom) + '/' +
+      center[1].toFixed(precision) + '/' +
+      center[0].toFixed(precision);
+  }
+
+
+  entityURL(entity) {
+    const entityID = entity.osmId();
+    return `${this._urlroot}/${entity.type}/${entityID}`;
+  }
+
+
+  historyURL(entity) {
+    const entityID = entity.osmId();
+    return `${this._urlroot}/${entity.type}/${entityID}/history`;
+  }
+
+
+  userURL(username) {
+    return `${this._urlroot}/user/${username}`;
+  }
+
+
+  noteURL(note) {
+    return `${this._urlroot}/note/${note.id}`;
+  }
+
+
+  noteReportURL(note) {
+    return `${this._urlroot}/reports/new?reportable_type=Note&reportable_id=${note.id}`;
+  }
+
+
+  // Generic method to load data from the OSM API
+  // Can handle either auth or unauth calls.
+  loadFromAPI(path, callback, options) {
+    options = Object.assign({ skipSeen: true }, options);
+    const cid = this._connectionID;
+
+    const done = (err, results) => {
+      if (this.connectionID !== cid) {
+        if (callback) callback({ message: 'Connection Switched', status: -1 });
+        return;
+      }
+
+      // 400 Bad Request, 401 Unauthorized, 403 Forbidden
+      // Logout and retry the request..
+      const isAuthenticated = this.authenticated();
+      if (isAuthenticated && (err?.status === 400 || err?.status === 401 || err?.status === 403)) {
+        this.logout();
+        this.loadFromAPI(path, callback, options);
+
+      // else, no retry..
+      } else {
+        // 509 Bandwidth Limit Exceeded, 429 Too Many Requests
+        // Set the rateLimitError flag and trigger a warning..
+        if (!isAuthenticated && !this._rateLimitError && (err?.status === 509 || err?.status === 429)) {
+          this._rateLimitError = err;
+          this.emit('authchange');
+          this.reloadApiStatus();
+
+        } else if ((err && this._cachedApiStatus === 'online') || (!err && this._cachedApiStatus !== 'online')) {
+          // If the response's error state doesn't match the status,
+          // it's likely we lost or gained the connection so reload the status
+          this.reloadApiStatus();
+        }
+
+        if (callback) {
+          if (err) {
+            return callback(err);
+          } else {
+            if (path.indexOf('.json') !== -1) {
+              return this._parseJSON(results, callback, options);
+            } else {
+              return this._parseXML(results, callback, options);
+            }
+          }
+        }
+      }
+    };
+
+    if (this.authenticated()) {
+      return this._oauth.xhr({ method: 'GET', path: path }, done);
+    } else {
+      const url = this._urlroot + path;
+      const controller = new AbortController();
+      let fn;
+      if (path.indexOf('.json') !== -1) {
+        fn = d3_json;
+      } else {
+        fn = d3_xml;
+      }
+
+      fn(url, { signal: controller.signal })
+        .then(result => done(null, result))
+        .catch(err => {
+          if (err.name === 'AbortError') return;  // ok
+          // d3-fetch includes status in the error message,
+          // but we can't access the response itself
+          // https://github.com/d3/d3-fetch/issues/27
+          const match = err.message.match(/^\d{3}/);
+          if (match) {
+            done({ status: +match[0], statusText: err.message });
+          } else {
+            done(err.message);
+          }
+        });
+      return controller;
+    }
+  }
+
+
+  // Load a single entity by id (ways and relations use the `/full` call to include
+  // nodes and members). Parent relations are not included, see `loadEntityRelations`.
+  // GET /api/0.6/node/#id
+  // GET /api/0.6/[way|relation]/#id/full
+  loadEntity(id, callback) {
+    const type = osmEntity.id.type(id);    // 'node', 'way', 'relation'
+    const osmID = osmEntity.id.toOSM(id);
+    const options = { skipSeen: false };
+    const full = (type !== 'node' ? '/full' : '');
+
+    this.loadFromAPI(
+      `/api/0.6/${type}/${osmID}${full}.json`,
+      callback,
+      options
+    );
+  }
+
+
+  // Load a single entity with a specific version
+  // GET /api/0.6/[node|way|relation]/#id/#version
+  loadEntityVersion(id, version, callback) {
+    const type = osmEntity.id.type(id);    // 'node', 'way', 'relation'
+    const osmID = osmEntity.id.toOSM(id);
+    const options = { skipSeen: false };
+
+    this.loadFromAPI(
+      `/api/0.6/${type}/${osmID}/${version}.json`,
+      callback,
+      options
+    );
+  }
+
+
+  // Load the relations of a single entity with the given.
+  // GET /api/0.6/[node|way|relation]/#id/relations
+  loadEntityRelations(id, callback) {
+    const type = osmEntity.id.type(id);
+    const osmID = osmEntity.id.toOSM(id);
+    const options = { skipSeen: false };
+
+    this.loadFromAPI(
+      `/api/0.6/${type}/${osmID}/relations.json`,
+      callback,
+      options
+    );
+  }
+
+
+  // Load multiple entities in chunks
+  // (note: callback may be called multiple times)
+  // Unlike `loadEntity`, child nodes and members are not fetched
+  // GET /api/0.6/[nodes|ways|relations]?#parameters
+  loadMultiple(ids, callback) {
+    const groups = utilArrayGroupBy(utilArrayUniq(ids), osmEntity.id.type);
+
+    for (const [k, vals] of Object.entries(groups)) {
+      const type = k + 's';   // nodes, ways, relations
+      const osmIDs = vals.map(id => osmEntity.id.toOSM(id));
+      const options = { skipSeen: false };
+
+      for (const arr of utilArrayChunk(osmIDs, 150)) {
+        this.loadFromAPI(
+          `/api/0.6/${type}.json?${type}=` + arr.join(),
+          callback,
+          options
+        );
+      }
+    }
+  }
+
+
+  // Create, upload, and close a changeset
+  // PUT /api/0.6/changeset/create
+  // POST /api/0.6/changeset/#id/upload
+  // PUT /api/0.6/changeset/#id/close
+  putChangeset(changeset, changes, callback) {
+    const cid = this._connectionID;
+
+    if (this._changeset.inflight) {
+      return callback({ message: 'Changeset already inflight', status: -2 }, changeset);
+
+    } else if (this._changeset.open) {   // reuse existing open changeset..
+      return createdChangeset.call(this, null, this._changeset.open);
+
+    } else {   // Open a new changeset..
+      const options = {
+        method: 'PUT',
+        path: '/api/0.6/changeset/create',
+        headers: { 'Content-Type': 'text/xml' },
+        content: JXON.stringify(changeset.asJXON())
+      };
+      this._changeset.inflight = this._oauth.xhr(
+        options,
+        this._wrapcb(createdChangeset, cid)
+      );
+    }
+
+
+    function createdChangeset(err, changesetID) {
+      this._changeset.inflight = null;
+      if (err) { return callback(err, changeset); }
+
+      this._changeset.open = changesetID;
+      changeset = changeset.update({ id: changesetID });
+
+      // Upload the changeset..
+      const options = {
+        method: 'POST',
+        path: `/api/0.6/changeset/${changesetID}/upload`,
+        headers: { 'Content-Type': 'text/xml' },
+        content: JXON.stringify(changeset.osmChangeJXON(changes))
+      };
+      this._changeset.inflight = this._oauth.xhr(
+        options,
+        this._wrapcb(uploadedChangeset, cid)
+      );
+    }
+
+
+    function uploadedChangeset(err) {
+      this._changeset.inflight = null;
+      if (err) return callback(err, changeset);
+
+      // Upload was successful, safe to call the callback.
+      // Add delay to allow for postgres replication iD#1646 iD#2678
+      window.setTimeout(function() { callback(null, changeset); }, 2500);
+      this._changeset.open = null;
+
+      // At this point, we don't really care if the connection was switched..
+      // Only try to close the changeset if we're still talking to the same server.
+      if (this.connectionID === cid) {
+        // Still attempt to close changeset, but ignore response because iD#2667
+        this._oauth.xhr({
+          method: 'PUT',
+          path: '/api/0.6/changeset/' + changeset.id + '/close',
+          headers: { 'Content-Type': 'text/xml' }
+        }, function() { return true; });
+      }
+    }
+  }
+
+
+  // Load multiple users in chunks
+  // (note: callback may be called multiple times)
+  // GET /api/0.6/users?users=#id1,#id2,...,#idn
+  loadUsers(uids, callback) {
+    let toLoad = [];
+    let cached = [];
+
+    for (const uid of utilArrayUniq(uids)) {
+      if (this._userCache.user[uid]) {  // loaded already
+        delete this._userCache.toLoad[uid];
+        cached.push(this._userCache.user[uid]);
+      } else {
+        toLoad.push(uid);
+      }
+    }
+
+
+    if (cached.length || !this.authenticated()) {
+      callback(undefined, cached);
+      if (!this.authenticated()) return;  // require auth
+    }
+
+    for (const arr of utilArrayChunk(toLoad, 150)) {
+      this._oauth.xhr(
+        { method: 'GET', path: '/api/0.6/users.json?users=' + arr.join() },
+        this._wrapcb(done, this._connectionID)
+      );
+    }
+
+    function done(err, payload) {
+      if (err) return callback(err);
+
+      const options = { skipSeen: true };
+      return this._parseUserJSON(payload, (err, results) => {
+        if (err) return callback(err);
+        return callback(undefined, results.data);
+      }, options);
+    }
+  }
+
+
+  // Load a given user by id
+  // GET /api/0.6/user/#id
+  loadUser(uid, callback) {
+    if (this._userCache.user[uid] || !this.authenticated()) {   // require auth
+      delete this._userCache.toLoad[uid];
+      return callback(undefined, this._userCache.user[uid]);
+    }
+
+    this._oauth.xhr(
+      { method: 'GET', path: `/api/0.6/user/${uid}.json` },
+      this._wrapcb(done, this._connectionID)
+    );
+
+    function done(err, payload) {
+      if (err) return callback(err);
+
+      const options = { skipSeen: true };
+      return this._parseUserJSON(payload, (err, results) => {
+        if (err) return callback(err);
+        return callback(undefined, results.data[0]);
+      }, options);
+    }
+  }
+
+
+  // Load the details of the logged-in user
+  // GET /api/0.6/user/details
+  userDetails(callback) {
+    if (this._userDetails) {    // retrieve cached
+      return callback(undefined, this._userDetails);
+    }
+
+    this._oauth.xhr(
+      { method: 'GET', path: '/api/0.6/user/details.json' },
+      this._wrapcb(done, this._connectionID)
+    );
+
+    function done(err, payload) {
+      if (err) return callback(err);
+
+      var options = { skipSeen: false };
+      return this._parseUserJSON(payload, (err, results) => {
+        if (err) return callback(err);
+        this._userDetails = results.data[0];
+        return callback(undefined, this._userDetails);
+      }, options);
+    }
+  }
+
+
+  // Load previous changesets for the logged in user
+  // GET /api/0.6/changesets?user=#id
+  userChangesets(callback) {
+    if (this._userChangesets) {    // retrieve cached
+      return callback(undefined, this._userChangesets);
+    }
+
+    this.userDetails(
+      this._wrapcb(gotDetails, this._connectionID)
+    );
+
+
+    function gotDetails(err, user) {
+      if (err) return callback(err);
+
+      this._oauth.xhr(
+        { method: 'GET', path: `/api/0.6/changesets?user=${user.id}` },
+        this._wrapcb(done, this._connectionID)
+      );
+    }
+
+    function done(err, xml) {
+      if (err) return callback(err);
+
+      this._userChangesets = [];
+      for (const changeset of xml.getElementsByTagName('changeset')) {
+        const obj = { tags: this._getTags(changeset) };
+        if (obj.tags.comment) {   // only include changesets with comment
+          this._userChangesets.push(obj);
+        }
+      }
+
+      return callback(undefined, this._userChangesets);
+    }
+  }
+
+
+  // Fetch the status of the OSM API
+  // GET /api/capabilities
+  status(callback) {
+    const url = this._urlroot + '/api/capabilities';
+    const errback = this._wrapcb(done, this._connectionID);
+    d3_xml(url, { credentials: this._credentialsMode })
+      .then(xml => errback(null, xml) )
+      .catch(err => errback(err.message) );
+
+    function done(err, xml) {
+      if (err) {
+        return callback(err, null);   // the status is null if no response could be retrieved
+      }
+
+      if (this._rateLimitError) {
+        return callback(this._rateLimitError, 'rateLimited');
+
+      } else {
+        // Update blocklists
+        let regexes = [];
+        for (const element of xml.getElementsByTagName('blacklist')) {
+          const regexString = element.getAttribute('regex');  // needs unencode?
+          if (regexString) {
+            try {
+              regexes.push(new RegExp(regexString));
+            } catch (e) {
+              /* noop */
+            }
+          }
+        }
+        if (regexes.length) {
+          this._imageryBlocklists = regexes;
+        }
+
+        // Update max nodes per way
+        const waynodes = xml.getElementsByTagName('waynodes');
+        const maxWayNodes = waynodes.length && parseInt(waynodes[0].getAttribute('maximum'), 10);
+        if (maxWayNodes && isFinite(maxWayNodes)) {
+          this._maxWayNodes = maxWayNodes;
+        }
+
+        // Update status
+        const apiStatus = xml.getElementsByTagName('status');
+        const val = apiStatus[0].getAttribute('api');
+        return callback(undefined, val);
+      }
+    }
+  }
+
+
+  // Calls `status` and emits an `apiStatusChange` event if the returned
+  // status differs from the cached status.
+  reloadApiStatus() {
+    // throttle to avoid unnecessary API calls
+    if (!this.throttledReloadApiStatus) {
+      const that = this;
+      this.throttledReloadApiStatus = _throttle(() => {
+        that.status((err, status) => {
+          if (status !== that._cachedApiStatus) {
+            that._cachedApiStatus = status;
+            that.emit('apiStatusChange', err, status);
+          }
+        });
+      }, 500);
+    }
+    this.throttledReloadApiStatus();
+  }
+
+
+  // Load data (entities) from the API in tiles
+  // GET /api/0.6/map?bbox=
+  loadTiles(projection, callback) {
+    if (this._off) return;
+
+    // determine the needed tiles to cover the view
+    const tiles = this._tiler
+      .zoomRange(this._tileZoom)
+      .margin(1)       // prefetch offscreen tiles as well
+      .getTiles(projection)
+      .tiles;
+
+    // Abort inflight requests that are no longer needed
+    const cache = this._tileCache;
+    const hadRequests = this._hasInflightRequests(cache);
+    this._abortUnwantedRequests(cache, tiles);
+    if (hadRequests && !this._hasInflightRequests(cache)) {
+      this.emit('loaded');    // stop the spinner
+    }
+
+    // issue new requests..
+    for (const tile of tiles) {
+      this.loadTile(tile, callback);
+    }
+  }
+
+
+  // Load a single data tile
+  // GET /api/0.6/map?bbox=
+  loadTile(tile, callback) {
+    if (this._off) return;
+
+    const cache = this._tileCache;
+    if (cache.loaded[tile.id] || cache.inflight[tile.id]) return;
+
+    // exit if this tile covers a blocked region (all corners are blocked)
+    const locationSystem = this.context.locationSystem();
+    const corners = tile.wgs84Extent.polygon().slice(0, 4);
+    const tileBlocked = corners.every(loc => locationSystem.blocksAt(loc).length);
+    if (tileBlocked) {
+      cache.loaded[tile.id] = true;   // don't try again
+      return;
+    }
+
+    if (!this._hasInflightRequests(cache)) {
+      this.emit('loading');   // start the spinner
+    }
+
+    const tileLoaded = (err, result) => {
+      delete cache.inflight[tile.id];
+      if (!err) {
+        delete cache.toLoad[tile.id];
+        cache.loaded[tile.id] = true;
+        var bbox = tile.wgs84Extent.bbox();
+        bbox.id = tile.id;
+        cache.rtree.insert(bbox);
+      }
+      if (callback) {
+        callback(err, Object.assign({}, result, { tile: tile }));
+      }
+      if (!this._hasInflightRequests(cache)) {
+        this.emit('loaded');     // stop the spinner
+      }
+    };
+
+    const path = '/api/0.6/map.json?bbox=';
+    const options = { skipSeen: true };
+
+    cache.inflight[tile.id] = this.loadFromAPI(
+      path + tile.wgs84Extent.toParam(),
+      tileLoaded,
+      options
+    );
+  }
+
+
+  isDataLoaded(loc) {
+    const bbox = { minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1] };
+    return this._tileCache.rtree.collides(bbox);
+  }
+
+
+  // load the tile that covers the given `loc`
+  loadTileAtLoc(loc, callback) {
+    const cache = this._tileCache;
+
+    // Back off if the toLoad queue is filling up.. re iD#6417
+    // (Currently `loadTileAtLoc` requests are considered low priority - used by operations to
+    // let users safely edit geometries which extend to unloaded tiles.  We can drop some.)
+    if (Object.keys(cache.toLoad).length > 50) return;
+
+    const k = geoZoomToScale(this._tileZoom + 1);
+    const offset = new Projection().scale(k).project(loc);
+    const proj = new Projection().transform({ k: k, x: -offset[0], y: -offset[1] });
+    const tiles = this._tiler.zoomRange(this._tileZoom).getTiles(proj).tiles;
+
+    for (const tile of tiles) {
+      if (cache.toLoad[tile.id] || cache.loaded[tile.id] || cache.inflight[tile.id]) continue;
+
+      cache.toLoad[tile.id] = true;
+      this.loadTile(tile, callback);
+    }
+  }
+
+
+  // Load notes from the API in tiles
+  // GET /api/0.6/notes?bbox=
+  loadNotes(projection, noteOptions) {
+    noteOptions = Object.assign({ limit: 10000, closed: 7 }, noteOptions);
+    if (this._off) return;
+
+    const cache = this._noteCache;
+    const that = this;
+    const path = '/api/0.6/notes?limit=' + noteOptions.limit + '&closed=' + noteOptions.closed + '&bbox=';
+    const deferLoadUsers = _throttle(() => {
+      var uids = Object.keys(that._userCache.toLoad);
+      if (!uids.length) return;
+      that.loadUsers(uids, function() {});  // eagerly load user details
+    }, 750);
+
+    // determine the needed tiles to cover the view
+    const tiles = this._tiler
+      .zoomRange(this._noteZoom)
+      .margin(1)       // prefetch offscreen tiles as well
+      .getTiles(projection)
+      .tiles;
+
+    // abort inflight requests that are no longer needed
+    this._abortUnwantedRequests(cache, tiles);
+
+    // issue new requests..
+    for (const tile of tiles) {
+      if (cache.loaded[tile.id] || cache.inflight[tile.id]) continue;
+
+      // Skip if this tile covers a blocked region (all corners are blocked)
+      const locationSystem = this.context.locationSystem();
+      const corners = tile.wgs84Extent.polygon().slice(0, 4);
+      const tileBlocked = corners.every(loc => locationSystem.blocksAt(loc).length);
+      if (tileBlocked) {
+        cache.loaded[tile.id] = true;   // don't try again
+        continue;
+      }
+
+      const options = { skipSeen: false };
+      cache.inflight[tile.id] = that.loadFromAPI(
+        path + tile.wgs84Extent.toParam(),
+        function(err) {
+          delete that._noteCache.inflight[tile.id];
+          if (!err) {
+            that._noteCache.loaded[tile.id] = true;
+          }
+          deferLoadUsers();
+          that.emit('loadedNotes');
+        },
+        options
+      );
+    }
+  }
+
+
+  // Create a note
+  // POST /api/0.6/notes?params
+  postNoteCreate(note, callback) {
+    if (!this.authenticated()) {
+      return callback({ message: 'Not Authenticated', status: -3 }, note);
+    }
+    if (this._noteCache.inflightPost[note.id]) {
+      return callback({ message: 'Note update already inflight', status: -2 }, note);
+    }
+
+    if (!note.loc[0] || !note.loc[1] || !note.newComment) return;  // location & description required
+
+    const path = '/api/0.6/notes?' + utilQsString({
+      lon: note.loc[0],
+      lat: note.loc[1],
+      text: note.newComment
+    });
+
+    this._noteCache.inflightPost[note.id] = this._oauth.xhr(
+      { method: 'POST', path: path },
+      this._wrapcb(done, this._connectionID)
+    );
+
+
+    function done(err, xml) {
+      delete this._noteCache.inflightPost[note.id];
+      if (err) { return callback(err); }
+
+      // we get the updated note back, remove from caches and reparse..
+      this.removeNote(note);
+
+      var options = { skipSeen: false };
+      return this._parseXML(xml, (err, results) => {
+        if (err) {
+          return callback(err);
+        } else {
+          return callback(undefined, results.data[0]);
+        }
+      }, options);
+    }
+  }
+
+
+  // Update a note
+  // POST /api/0.6/notes/#id/comment?text=comment
+  // POST /api/0.6/notes/#id/close?text=comment
+  // POST /api/0.6/notes/#id/reopen?text=comment
+  postNoteUpdate(note, newStatus, callback) {
+    if (!this.authenticated()) {
+      return callback({ message: 'Not Authenticated', status: -3 }, note);
+    }
+    if (this._noteCache.inflightPost[note.id]) {
+      return callback({ message: 'Note update already inflight', status: -2 }, note);
+    }
+
+    let action;
+    if (note.status !== 'closed' && newStatus === 'closed') {
+      action = 'close';
+    } else if (note.status !== 'open' && newStatus === 'open') {
+      action = 'reopen';
+    } else {
+      action = 'comment';
+      if (!note.newComment) return; // when commenting, comment required
+    }
+
+    let path = `/api/0.6/notes/${note.id}/${action}`;
+    if (note.newComment) {
+      path += '?' + utilQsString({ text: note.newComment });
+    }
+
+    this._noteCache.inflightPost[note.id] = this._oauth.xhr(
+      { method: 'POST', path: path },
+      this._wrapcb(done, this._connectionID)
+    );
+
+
+    function done(err, xml) {
+      delete this._noteCache.inflightPost[note.id];
+      if (err) { return callback(err); }
+
+      // we get the updated note back, remove from caches and reparse..
+      this.removeNote(note);
+
+      // update closed note cache - used to populate `closed:note` changeset tag
+      if (action === 'close') {
+        this._noteCache.closed[note.id] = true;
+      } else if (action === 'reopen') {
+        delete this._noteCache.closed[note.id];
+      }
+
+      const options = { skipSeen: false };
+      return this._parseXML(xml, (err, results) => {
+        if (err) {
+          return callback(err);
+        } else {
+          return callback(undefined, results.data[0]);
+        }
+      }, options);
+    }
+  }
+
+
+  switch(newOptions) {
+    this._urlroot = newOptions.url;
+
+    // Copy the existing options, but omit 'access_token'.
+    // (if we did preauth, access_token won't work on a different server)
+    let oldOptions = utilObjectOmit(this._oauth.options(), 'access_token');
+    this._oauth.options(Object.assign(oldOptions, newOptions));
+
+    this.reset();
+    this.userChangesets(function() {});  // eagerly load user details/changesets
+    this.emit('authchange');
+    return this;
+  }
+
+
+  toggle(val) {
+    this._off = !val;
+    return this;
+  }
+
+
+  isChangesetInflight() {
+    return !!this._changeset.inflight;
+  }
+
+
+  // get/set cached data
+  // This is used to save/restore the state when entering/exiting the walkthrough
+  // Also used for testing purposes.
+  caches(obj) {
+    function cloneCache(source) {
+      let target = {};
+      for (const [k, v] of Object.entries(source)) {
+        if (k === 'rtree') {
+          target.rtree = new RBush().fromJSON(v.toJSON());  // clone rbush
+        } else if (k === 'note') {
+          target.note = {};
+          for (const id of Object.keys(v)) {
+            target.note[id] = osmNote(source.note[id]);   // copy notes
+          }
+        } else {
+          target[k] = JSON.parse(JSON.stringify(v));   // clone deep
+        }
+      }
+      return target;
+    }
+
+    if (obj === undefined) {
+      return {
+        tile: cloneCache(this._tileCache),
+        note: cloneCache(this._noteCache),
+        user: cloneCache(this._userCache)
+      };
+    }
+
+    // access caches directly for testing (e.g., loading notes rtree)
+    if (obj === 'get') {
+      return {
+        tile: this._tileCache,
+        note: this._noteCache,
+        user: this._userCache
+      };
+    }
+
+    if (obj.tile) {
+      this._tileCache = obj.tile;
+      this._tileCache.inflight = {};
+    }
+    if (obj.note) {
+      this._noteCache = obj.note;
+      this._noteCache.inflight = {};
+      this._noteCache.inflightPost = {};
+    }
+    if (obj.user) {
+      this._userCache = obj.user;
+    }
+
+    return this;
+  }
+
+
+  logout() {
+    this._userChangesets = undefined;
+    this._userDetails = undefined;
+    this._oauth.logout();
+    this.emit('authchange');
+    return this;
+  }
+
+
+  authenticated() {
+    return this._oauth.authenticated();
+  }
+
+
+  authenticate(callback) {
+    const cid = this._connectionID;
+    this._userChangesets = undefined;
+    this._userDetails = undefined;
+
+    const done = (err, res) => {
+      if (err) {
+        if (callback) callback(err);
+        return;
+      }
+      if (this.connectionID !== cid) {
+        if (callback) callback({ message: 'Connection Switched', status: -1 });
+        return;
+      }
+      this._rateLimitError = undefined;
+      this.emit('authchange');
+      if (callback) callback(err, res);
+      this.userChangesets(function() {});  // eagerly load user details/changesets
+    };
+
+    this._oauth.authenticate(done);
+  }
+
+
+  // get all cached notes covering the viewport
+  notes(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
+
+    return this._noteCache.rtree.search(bbox).map(d => d.data);
+  }
+
+
+  // get a single note from the cache
+  getNote(id) {
+    return this._noteCache.note[id];
+  }
+
+
+  // remove a single note from the cache
+  removeNote(note) {
+    if (!(note instanceof osmNote) || !note.id) return;
+
+    delete this._noteCache.note[note.id];
+    this._updateRtree(this._encodeNoteRtree(note), false);  // false = remove
+  }
+
+
+  // replace a single note in the cache
+  replaceNote(note) {
+    if (!(note instanceof osmNote) || !note.id) return;
+
+    this._noteCache.note[note.id] = note;
+    this._updateRtree(this._encodeNoteRtree(note), true);  // true = replace
+    return note;
+  }
+
+  // Get an array of note IDs closed during this session.
+  // Used to populate `closed:note` changeset tag
+  getClosedIDs() {
+    return Object.keys(this._noteCache.closed).sort();
+  }
+
+
+  _authLoading() {
+    this.emit('authLoading');
+  }
+
+
+  _authDone() {
+    this.emit('authDone');
+  }
+
+
+  _abortRequest(controllerOrXHR) {
+    if (controllerOrXHR) {
+      controllerOrXHR.abort();
+    }
+  }
+
+
+  _hasInflightRequests(cache) {
+    return Object.keys(cache.inflight).length;
+  }
+
+
+  _abortUnwantedRequests(cache, visibleTiles) {
+    for (const k of Object.keys(cache.inflight)) {
+      if (cache.toLoad[k]) continue;
+      if (visibleTiles.find(tile => tile.id === k)) continue;
+
+      this._abortRequest(cache.inflight[k]);
+      delete cache.inflight[k];
+    }
+  }
+
+
+  _getLoc(attrs) {
+    const lon = attrs.lon?.value;
+    const lat = attrs.lat?.value;
+    return [ parseFloat(lon), parseFloat(lat) ];
+  }
+
+
+  _getNodes(xml) {
+    const elems = Array.from(xml.getElementsByTagName('nd'));
+    return elems.map(elem => 'n' + elem.attributes.ref.value);
+  }
+
+
+  _getNodesJSON(obj) {
+    return (obj.nodes ?? []).map(nodeID => 'n' + nodeID);
+  }
+
+
+  _getTags(xml) {
+    const elems = Array.from(xml.getElementsByTagName('tag'));
+    let tags = {};
+    for (const elem of elems) {
+      const attrs = elem.attributes;
+      const k = (attrs.k.value ?? '').trim();
+      const v = (attrs.v.value ?? '').trim();
+      if (k) {
+        tags[k] = v;
+      }
+    }
+    return tags;
+  }
+
+
+  _getMembers(xml) {
+    const elems = Array.from(xml.getElementsByTagName('member'));
+    return elems.map(elem => {
+      const attrs = elem.attributes;
+      return {
+        id: attrs.type.value[0] + attrs.ref.value,
+        type: attrs.type.value,
+        role: attrs.role.value
+      };
+    });
+  }
+
+
+  _getMembersJSON(obj) {
+    return (obj.members ?? []).map(member => {
+      return {
+        id: member.type[0] + member.ref,
+        type: member.type,
+        role: member.role
+      };
+    });
+  }
+
+
+  _parseComments(comments) {
+    let parsedComments = [];
+
+    for (const comment of comments) {
+      if (comment.nodeName === 'comment') {
+        let parsedComment = {};
+
+        for (const node of comment.childNodes) {
+          const nodeName = node.nodeName;
+          if (nodeName === '#text') continue;
+          parsedComment[nodeName] = node.textContent;
+
+          if (nodeName === 'uid') {
+            const uid = node.textContent;
+            if (uid && !this._userCache.user[uid]) {
+              this._userCache.toLoad[uid] = true;
+            }
+          }
+        }
+
+        if (Object.keys(parsedComment).length) {
+          parsedComments.push(parsedComment);
+        }
+      }
+    }
+    return parsedComments;
+  }
+
+
+  _encodeNoteRtree(note) {
+    return {
+      minX: note.loc[0],
+      minY: note.loc[1],
+      maxX: note.loc[0],
+      maxY: note.loc[1],
+      data: note
+    };
+  }
+
+
+  /**
+   * _parseJSON
+   * @param payload
+   * @param callback
+   * @param options
+   */
+  _parseJSON(payload, callback, options) {
+    options = Object.assign({ skipSeen: true }, options);
+
+    if (!payload)  {
+      return callback({ message: 'No JSON', status: -1 });
+    }
+
+    let json = payload;
+    if (typeof json !== 'object') {
+      json = JSON.parse(payload);
+    }
+    if (!json.elements) {
+      return callback({ message: 'No JSON', status: -1 });
+    }
+    if (json.elements.some(el => el.type === 'error')) {
+      return callback({ message: 'Partial JSON', status: -1 });
+    }
+
+    const handle = window.requestIdleCallback(() => {
+      this._deferred.delete(handle);
+
+      let results = { data: [], seenIDs: new Set() };
+
+      for (const child of json.elements) {
+        let parser;
+        if (child.type === 'node') {
+          parser = this._parseNodeJSON;
+        } else if (child.type === 'way') {
+          parser = this._parseWayJSON;
+        } else if (child.type === 'relation') {
+          parser = this._parseRelationJSON;
+        }
+        if (!parser) continue;
+
+        const uid = osmEntity.id.fromOSM(child.type, child.id);
+        results.seenIDs.add(uid);
+
+        if (options.skipSeen) {
+          if (this._tileCache.seen[uid]) continue;  // avoid reparsing a "seen" entity
+          this._tileCache.seen[uid] = true;
+        }
+
+        const parsed = parser(child, uid);
+        if (parsed) {
+          results.data.push(parsed);
+        }
+      }
+
+      callback(null, results);
+    });
+
+    this._deferred.add(handle);
+  }
+
+
+  /**
+   * _parseUserJSON
+   * @param payload
+   * @param callback
+   * @param options
+   */
+  _parseUserJSON(payload, callback, options) {
+    options = Object.assign({ skipSeen: true }, options);
+
+    if (!payload)  {
+      return callback({ message: 'No JSON', status: -1 });
+    }
+
+    let json = payload;
+    if (typeof json !== 'object') {
+      json = JSON.parse(payload);
+    }
+
+    if (!json.users && !json.user) {
+      return callback({ message: 'No JSON', status: -1 });
+    }
+
+    const objects = json.users || [json];
+
+    const handle = window.requestIdleCallback(() => {
+      this._deferred.delete(handle);
+
+      let results = { data: [], seenIDs: new Set() };
+
+      for (const obj of objects) {
+        const u = obj.user;
+        const uid = u.id?.toString();
+        if (!uid) continue;
+
+        results.seenIDs.add(uid);
+
+        if (options.skipSeen && this._userCache.user[uid]) {  // avoid reparsing a "seen" entity
+          delete this._userCache.toLoad[uid];
+          continue;
+        }
+
+        const user = {
+          id: uid,
+          display_name: u.display_name,
+          account_created: u.account_created,
+          image_url: u.img?.href,
+          changesets_count: u.changesets?.count?.toString() ?? '0',
+          active_blocks: u.blocks?.received?.active?.toString() ?? '0'
+        };
+
+        delete this._userCache.toLoad[uid];
+        this._userCache.user[uid] = user;
+        results.data.push(user);
+      }
+
+      callback(null, results);
+    });
+
+    this._deferred.add(handle);
+  }
+
+
+  /**
+   * _parseXML
+   * @param xml
+   * @param callback
+   * @param options
+   */
+  _parseXML(xml, callback, options) {
+    options = Object.assign({ skipSeen: true }, options);
+
+    if (!xml || !xml.childNodes) {
+      return callback({ message: 'No XML', status: -1 });
+    }
+
+    const root = xml.childNodes[0];
+    const children = Array.from(root.childNodes);
+    if (children.some(child => child.nodename === 'error')) {
+      return callback({ message: 'Partial XML', status: -1 });
+    }
+
+    const handle = window.requestIdleCallback(() => {
+      this._deferred.delete(handle);
+
+      let results = { data: [], seenIDs: new Set() };
+
+      for (const child of children) {
+        let parser;
+        if (child.nodeName === 'node') {
+          parser = this._parseNodeXML;
+        } else if (child.nodeName === 'way') {
+          parser = this._parseWayXML;
+        } else if (child.nodeName === 'relation') {
+          parser = this._parseRelationXML;
+        } else if (child.nodeName === 'note') {
+          parser = this._parseNoteXML;
+        } else if (child.nodeName === 'user') {
+          parser = this._parseUserXML;
+        }
+        if (!parser) continue;
+
+        let uid;
+        if (child.nodeName === 'user') {
+          uid = child.attributes.id.value;
+          results.seenIDs.add(uid);
+
+          if (options.skipSeen && this._userCache.user[uid]) {  // avoid reparsing a "seen" entity
+            delete this._userCache.toLoad[uid];
+            continue;
+          }
+
+        } else if (child.nodeName === 'note') {
+          uid = child.getElementsByTagName('id')[0].textContent;
+          results.seenIDs.add(uid);
+
+        } else {
+          uid = osmEntity.id.fromOSM(child.nodeName, child.attributes.id.value);
+          results.seenIDs.add(uid);
+
+          if (options.skipSeen) {
+            if (this._tileCache.seen[uid]) continue;  // avoid reparsing a "seen" entity
+            this._tileCache.seen[uid] = true;
+          }
+        }
+
+        const parsed = parser(child, uid);
+        if (parsed) {
+          results.data.push(parsed);
+        }
+      }
+
+      callback(null, results);
+    });
+
+    this._deferred.add(handle);
+  }
+
+
+  _parseNodeJSON(obj, uid) {
+    return new osmNode({
+      id:  uid,
+      visible: typeof obj.visible === 'boolean' ? obj.visible : true,
+      version: obj.version?.toString(),
+      changeset: obj.changeset?.toString(),
+      timestamp: obj.timestamp,
+      user: obj.user,
+      uid: obj.uid?.toString(),
+      loc: [ parseFloat(obj.lon), parseFloat(obj.lat) ],
+      tags: obj.tags
+    });
+  }
+
+  _parseWayJSON(obj, uid) {
+    return new osmWay({
+      id:  uid,
+      visible: typeof obj.visible === 'boolean' ? obj.visible : true,
+      version: obj.version?.toString(),
+      changeset: obj.changeset?.toString(),
+      timestamp: obj.timestamp,
+      user: obj.user,
+      uid: obj.uid?.toString(),
+      tags: obj.tags,
+      nodes: this._getNodesJSON(obj)
+    });
+  }
+
+  _parseRelationJSON(obj, uid) {
+    return new osmRelation({
+      id:  uid,
+      visible: typeof obj.visible === 'boolean' ? obj.visible : true,
+      version: obj.version?.toString(),
+      changeset: obj.changeset?.toString(),
+      timestamp: obj.timestamp,
+      user: obj.user,
+      uid: obj.uid?.toString(),
+      tags: obj.tags,
+      members: this._getMembersJSON(obj)
+    });
+  }
+
+  _parseNodeXML(xml, uid) {
+    const attrs = xml.attributes;
+    return new osmNode({
+      id: uid,
+      visible: (!attrs.visible || attrs.visible.value !== 'false'),
+      version: attrs.version.value,
+      changeset: attrs.changeset?.value,
+      timestamp: attrs.timestamp?.value,
+      user: attrs.user?.value,
+      uid: attrs.uid?.value,
+      loc: this._getLoc(attrs),
+      tags: this._getTags(xml)
+    });
+  }
+
+  _parseWayXML(xml, uid) {
+    const attrs = xml.attributes;
+    return new osmWay({
+      id: uid,
+      visible: (!attrs.visible || attrs.visible.value !== 'false'),
+      version: attrs.version.value,
+      changeset: attrs.changeset?.value,
+      timestamp: attrs.timestamp?.value,
+      user: attrs.user?.value,
+      uid: attrs.uid?.value,
+      tags: this._getTags(xml),
+      nodes: this._getNodes(xml),
+    });
+  }
+
+  _parseRelationXML(xml, uid) {
+    const attrs = xml.attributes;
+    return new osmRelation({
+      id: uid,
+      visible: (!attrs.visible || attrs.visible.value !== 'false'),
+      version: attrs.version.value,
+      changeset: attrs.changeset?.value,
+      timestamp: attrs.timestamp?.value,
+      user: attrs.user?.value,
+      uid: attrs.uid?.value,
+      tags: this._getTags(xml),
+      members: this._getMembers(xml)
+    });
+  }
+
+  _parseNoteXML(xml, uid) {
+    const attrs = xml.attributes;
+    const childNodes = xml.childNodes;
+    var props = {};
+
+    props.id = uid;
+    props.loc = this._getLoc(attrs);
+
+    // if notes are coincident, move them apart slightly
+    let coincident = false;
+    const epsilon = 0.00001;
+    do {
+      if (coincident) {
+        props.loc = vecAdd(props.loc, [epsilon, epsilon]);
+      }
+      const bbox = new Extent(props.loc).bbox();
+      coincident = this._noteCache.rtree.search(bbox).length;
+    } while (coincident);
+
+    // parse note contents
+    for (const node of childNodes) {
+      const nodeName = node.nodeName;
+      if (nodeName === '#text') continue;
+
+      // if the element is comments, parse the comments
+      if (nodeName === 'comments') {
+        props[nodeName] = this._parseComments(node.childNodes);
+      } else {
+        props[nodeName] = node.textContent;
+      }
+    }
+
+    const note = new osmNote(props);
+    const item = this._encodeNoteRtree(note);
+    this._noteCache.note[note.id] = note;
+    this._noteCache.rtree.insert(item);
+
+    return note;
+  }
+
+
+  _parseUserXML(xml, uid) {
+    const attrs = xml.attributes;
+    let user = {
+      id: uid,
+      display_name: attrs.display_name?.value,
+      account_created: attrs.account_created?.value,
+      changesets_count: '0',
+      active_blocks: '0'
+    };
+
+    const img = xml.getElementsByTagName('img');
+    if (img && img[0] && img[0].getAttribute('href')) {
+      user.image_url = img[0].getAttribute('href');
+    }
+
+    const changesets = xml.getElementsByTagName('changesets');
+    if (changesets && changesets[0] && changesets[0].getAttribute('count')) {
+      user.changesets_count = changesets[0].getAttribute('count');
+    }
+
+    const blocks = xml.getElementsByTagName('blocks');
+    if (blocks && blocks[0]) {
+      const received = blocks[0].getElementsByTagName('received');
+      if (received && received[0] && received[0].getAttribute('active')) {
+        user.active_blocks = received[0].getAttribute('active');
+      }
+    }
+
+    this._userCache.user[uid] = user;
+    delete this._userCache.toLoad[uid];
+    return user;
+  }
+
+
+  // replace or remove note from rtree
+  _updateRtree(item, replace) {
+    this._noteCache.rtree.remove(item, (a, b) => a.data.id === b.data.id);
+
+    if (replace) {
+      this._noteCache.rtree.insert(item);
+    }
+  }
+
+
+  _wrapcb(callback, cid) {
+    return (err, result) => {
+      if (err) {
+        // 400 Bad Request, 401 Unauthorized, 403 Forbidden..
+        if (err.status === 400 || err.status === 401 || err.status === 403) {
+          this.logout();
+        }
+        return callback.call(this, err);
+
+      } else if (this.connectionID !== cid) {
+        return callback.call(this, { message: 'Connection Switched', status: -1 });
+
+      } else {
+        return callback.call(this, err, result);
+      }
+    };
+  }
+
+}
diff --git a/modules/services/OsmWikibaseService.js b/modules/services/OsmWikibaseService.js
new file mode 100644
index 0000000000..3e29ec1937
--- /dev/null
+++ b/modules/services/OsmWikibaseService.js
@@ -0,0 +1,373 @@
+import { json as d3_json } from 'd3-fetch';
+import { utilQsString } from '@rapid-sdk/util';
+import debounce from 'lodash-es/debounce';
+
+import { AbstractService } from './AbstractService';
+
+
+/**
+ * `OsmWikibaseService`
+ */
+export class OsmWikibaseService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'osmwikibase';
+    this.apibase = 'https://wiki.openstreetmap.org/w/api.php';
+
+    this._inflight = {};
+    this._cache = {};
+    this._localeIDs = { en: false };   // cache false to prevent repeated failed requests
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this.claimToValue = this.claimToValue.bind(this);
+    this.monolingualClaimToValueObj = this.monolingualClaimToValueObj.bind(this);
+    this.toSitelink = this.toSitelink.bind(this);
+    this.getEntity = this.getEntity.bind(this);
+    this.getDocs = this.getDocs.bind(this);
+    this._request = this._request.bind(this);
+    this._debouncedRequest = debounce(this._request, 500, { leading: false });
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    this._debouncedRequest.cancel();
+    Object.values(this._inflight).forEach(controller => controller.abort());
+    this._inflight = {};
+  }
+
+
+  /**
+   * Get the best value for the property, or undefined if not found
+   * @param entity object from wikibase
+   * @param   property  string e.g. 'P4' for image
+   * @param   langCode  string e.g. 'fr' for French
+   * @return  the requested value, or undefined
+   */
+  claimToValue(entity, property, langCode) {
+    if (!entity.claims[property]) return undefined;
+    const locale = this._localeIDs[langCode];
+    let preferredPick, localePick;
+
+    for (const stmt of entity.claims[property]) {
+      // If exists, use value limited to the needed language (has a qualifier P26 = locale)
+      // Or if not found, use the first value with the "preferred" rank
+      if (!preferredPick && stmt.rank === 'preferred') {
+        preferredPick = stmt;
+      }
+      const p26Locale = stmt.qualifiers?.P26 && stmt.qualifiers.P26[0].datavalue.value.id;
+      if (locale && p26Locale === locale) {
+        localePick = stmt;
+      }
+    }
+
+    const result = localePick ?? preferredPick;
+    if (result) {
+      const datavalue = result.mainsnak.datavalue;
+      return datavalue.type === 'wikibase-entityid' ? datavalue.value.id : datavalue.value;
+    } else {
+      return undefined;
+    }
+  }
+
+
+  /**
+   * Convert monolingual property into a key-value object (language -> value)
+   * @param   entity    object from wikibase
+   * @param   property  string e.g. 'P31' for monolingual wiki page title
+   * @return  the requested object, or undefined
+   */
+  monolingualClaimToValueObj(entity, property) {
+    if (!entity?.claims[property]) return undefined;
+
+    return entity.claims[property].reduce(function(acc, obj) {
+      var value = obj.mainsnak.datavalue.value;
+      acc[value.language] = value.text;
+      return acc;
+    }, {});
+  }
+
+
+  /**
+   * toSitelink
+   * Generate a sitelink for the given key/value pair
+   * @param   key
+   * @param   value
+   * @return  sitelink
+   */
+  toSitelink(key, value) {
+    let result = value ? `Tag:${key}=${value}` : `Key:${key}`;
+    return result.replace(/_/g, ' ').trim();
+  }
+
+
+  /**
+   * getEntity
+   * Pass params object of the form:
+   * {
+   *   key: 'string',
+   *   value: 'string',
+   *   langCodes: ['string']
+   * }
+   * @param   params
+   * @param   callback
+   */
+  getEntity(params, callback) {
+    const doRequest = params.debounce ? this._debouncedRequest : this._request;
+    const rtypeSitelink = (params.key === 'type' && params.value) ? (`Relation:${params.value}`).replace(/_/g, ' ').trim() : false;
+    const keySitelink = params.key ? this.toSitelink(params.key) : false;
+    const tagSitelink = (params.key && params.value) ? this.toSitelink(params.key, params.value) : false;
+    let titles = [];
+    let result = {};
+    let localeSitelink;
+
+    if (params.langCodes) {
+      for (const langCode of params.langCodes) {
+        if (this._localeIDs[langCode] === undefined) {
+          // If this is the first time we are asking about this locale,
+          // fetch corresponding entity (if it exists), and cache it.
+          // If there is no such entry, cache `false` value to avoid re-requesting it.
+          localeSitelink = (`Locale:${langCode}`).replace(/_/g, ' ').trim();
+          titles.push(localeSitelink);
+        }
+      }
+    }
+
+    if (rtypeSitelink) {
+      if (this._cache[rtypeSitelink]) {
+        result.rtype = this._cache[rtypeSitelink];
+      } else {
+        titles.push(rtypeSitelink);
+      }
+    }
+
+    if (keySitelink) {
+      if (this._cache[keySitelink]) {
+        result.key = this._cache[keySitelink];
+      } else {
+        titles.push(keySitelink);
+      }
+    }
+
+    if (tagSitelink) {
+      if (this._cache[tagSitelink]) {
+        result.tag = this._cache[tagSitelink];
+      } else {
+        titles.push(tagSitelink);
+      }
+    }
+
+    if (!titles.length) {
+      // Nothing to do, we already had everything in the cache
+      return callback(null, result);
+    }
+
+    // Requesting just the user language code
+    // If backend recognizes the code, it will perform proper fallbacks,
+    // and the result will contain the requested code. If not, all values are returned:
+    // {"zh-tw":{"value":"...","language":"zh-tw","source-language":"zh-hant"}
+    // {"pt-br":{"value":"...","language":"pt","for-language":"pt-br"}}
+    const obj = {
+      action: 'wbgetentities',
+      sites: 'wiki',
+      titles: titles.join('|'),
+      languages: params.langCodes.join('|'),
+      languagefallback: 1,
+      origin: '*',
+      format: 'json',
+      // There is an MW Wikibase API bug https://phabricator.wikimedia.org/T212069
+      // We shouldn't use v1 until it gets fixed, but should switch to it afterwards
+      // formatversion: 2,
+    };
+
+    const url = this.apibase + '?' + utilQsString(obj);
+    doRequest(url, (err, d) => {
+      if (err) {
+        callback(err);
+      } else if (!d.success || d.error) {
+        callback(d.error.messages.map(msg => msg.html['*']).join('<br>'));
+      } else {
+        let localeID = false;
+        for (const res of Object.values(d.entities)) {
+          if (res.missing !== '') {
+            const title = res.sitelinks.wiki.title;
+            if (title === rtypeSitelink) {
+              this._cache[rtypeSitelink] = res;
+              result.rtype = res;
+            } else if (title === keySitelink) {
+              this._cache[keySitelink] = res;
+              result.key = res;
+            } else if (title === tagSitelink) {
+              this._cache[tagSitelink] = res;
+              result.tag = res;
+            } else if (title === localeSitelink) {
+              localeID = res.id;
+            } else {
+              console.log(`Unexpected title ${title}`);  // eslint-disable-line no-console
+            }
+          }
+        }
+
+        if (localeSitelink) {
+          // If locale ID is not found, store false to prevent repeated queries
+          this.addLocale(params.langCodes[0], localeID);
+        }
+
+        callback(null, result);
+      }
+    });
+  }
+
+
+  /**
+   * getDocs
+   * Pass params object of the form:
+   * {
+   *   key: 'string',     // required
+   *   value: 'string'    // optional
+   * }
+   *
+   * Get an result object used to display tag documentation
+   * {
+   *   title:        'string',
+   *   description:  'string',
+   *   editURL:      'string',
+   *   imageURL:     'string',
+   *   wiki:         { title: 'string', text: 'string', url: 'string' }
+   * }
+   * @param   params
+   * @param   callback
+   */
+  getDocs(params, callback) {
+    const langCodes = this.context.localizationSystem().localeCodes().map(code => code.toLowerCase());
+    params.langCodes = langCodes;
+
+    this.getEntity(params, (err, data) => {
+      if (err) {
+        callback(err);
+        return;
+      }
+
+      const entity = data.rtype || data.tag || data.key;
+      if (!entity) {
+        callback('No entity');
+        return;
+      }
+
+      let description;
+      for (const code of langCodes) {
+        if (entity.descriptions[code]?.language === code) {
+          description = entity.descriptions[code];
+          break;
+        }
+      }
+      if (!description && Object.values(entity.descriptions).length) {
+        description = Object.values(entity.descriptions)[0];
+      }
+
+      // prepare result
+      let result = {
+        title: entity.title,
+        description: description?.value ?? '',
+        descriptionLocaleCode: description?.language ?? '',
+        editURL: `https://wiki.openstreetmap.org/wiki/${entity.title}`
+      };
+
+      // add image
+      if (entity.claims) {
+        let imageroot;
+        let image = this.claimToValue(entity, 'P4', langCodes[0]);
+        if (image) {
+          imageroot = 'https://commons.wikimedia.org/w/index.php';
+        } else {
+          image = this.claimToValue(entity, 'P28', langCodes[0]);
+          if (image) {
+            imageroot = 'https://wiki.openstreetmap.org/w/index.php';
+          }
+        }
+        if (imageroot && image) {
+          result.imageURL = imageroot + '?' + utilQsString({
+            title: `Special:Redirect/file/${image}`,
+            width: 400
+          });
+        }
+      }
+
+      // Try to get a wiki page from tag data item first, followed by the corresponding key data item.
+      // If neither tag nor key data item contain a wiki page in the needed language nor English,
+      // get the first found wiki page from either the tag or the key item.
+      const rtypeWiki = this.monolingualClaimToValueObj(data.rtype, 'P31');
+      const tagWiki = this.monolingualClaimToValueObj(data.tag, 'P31');
+      const keyWiki = this.monolingualClaimToValueObj(data.key, 'P31');
+
+      for (const wiki of [rtypeWiki, tagWiki, keyWiki]) {
+        for (const code of langCodes) {
+          const offerEnglish = langCodes[0].split('-')[0] !== 'en' && code.split('-')[0] === 'en';
+          const stringID = offerEnglish ? 'inspector.wiki_en_reference' : 'inspector.wiki_reference';
+          const info = getWikiInfo(wiki, code, stringID);
+          if (info) {
+            result.wiki = info;
+            break;
+          }
+        }
+        if (result.wiki) break;
+      }
+
+      callback(null, result);
+
+
+      // Helper method to get wiki info if a given language exists
+      function getWikiInfo(wiki, langCode, tKey) {
+        if (wiki && wiki[langCode]) {
+          return {
+            title: wiki[langCode],
+            text: tKey,
+            url: `https://wiki.openstreetmap.org/wiki/${wiki[langCode]}`
+          };
+        }
+      }
+    });
+  }
+
+
+  // Makes it easier to unit test
+  addLocale(langCode, qid) {
+    this._localeIDs[langCode] = qid;
+  }
+
+
+  _request(url, callback) {
+    if (this._inflight[url]) return;
+
+    const controller = new AbortController();
+    this._inflight[url] = controller;
+
+    d3_json(url, { signal: controller.signal })
+      .then(result => {
+        delete this._inflight[url];
+        if (callback) callback(null, result);
+      })
+      .catch(err => {
+        delete this._inflight[url];
+        if (err.name === 'AbortError') return;
+        if (callback) callback(err.message);
+      });
+  }
+
+}
diff --git a/modules/services/OsmoseService.js b/modules/services/OsmoseService.js
new file mode 100644
index 0000000000..d9fb183bbd
--- /dev/null
+++ b/modules/services/OsmoseService.js
@@ -0,0 +1,421 @@
+import { Color } from 'pixi.js';
+import { json as d3_json } from 'd3-fetch';
+import { Extent, Tiler, vecAdd } from '@rapid-sdk/math';
+import { utilQsString } from '@rapid-sdk/util';
+import { marked } from 'marked';
+import RBush from 'rbush';
+
+import { AbstractService } from './AbstractService';
+import { QAItem } from '../osm';
+
+
+const TILEZOOM = 14;
+const OSMOSE_API = 'https://osmose.openstreetmap.fr/api/0.3';
+
+
+/**
+ * `OsmoseService`
+
+ * Events available:
+ *   'loadedData'
+ */
+export class OsmoseService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'osmose';
+
+    // persistent data - loaded at init
+    this._osmoseColors = new Map();    // Map (itemType -> hex color)
+    this._osmoseStrings = new Map();   // Map (locale -> Object containing strings)
+    this._osmoseData = { icons: {}, types: [] };
+
+    this._cache = null;   // cache gets replaced on init/reset
+    this._tiler = new Tiler().zoomRange(TILEZOOM).skipNullIsland(true);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+
+    const dataLoaderSystem = this.context.dataLoaderSystem();
+    dataLoaderSystem.get('qa_data')
+      .then(d => {
+        this._osmoseData.icons = d.osmose.icons;
+        this._osmoseData.types = Object.keys(d.osmose.icons)
+          .map(s => s.split('-')[0])
+          .reduce((unique, item) => unique.indexOf(item) !== -1 ? unique : [...unique, item], []);
+      })
+      .then(() => this.loadStringsAsync());
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    if (this._cache) {
+      Object.values(this._cache.inflightTile).forEach(controller => this._abortRequest(controller));
+    }
+    this._cache = {
+      issues: new Map(),    // Map (itemID -> QAItem)
+      loadedTile: {},
+      inflightTile: {},
+      inflightPost: {},
+      closed: {},
+      rtree: new RBush()
+    };
+  }
+
+
+  /**
+   * loadIssues
+   * @param  projection
+   */
+  loadIssues(projection) {
+    // determine the needed tiles to cover the view
+    const tiles = this._tiler.getTiles(projection).tiles;
+
+    // abort inflight requests that are no longer needed
+    this._abortUnwantedRequests(this._cache, tiles);
+
+    // issue new requests..
+    for (const tile of tiles) {
+      if (this._cache.loadedTile[tile.id] || this._cache.inflightTile[tile.id]) continue;
+
+      const [x, y, z] = tile.xyz;
+      const params = { item: this._osmoseData.types };   // Only request the types that we support
+      const url = `${OSMOSE_API}/issues/${z}/${x}/${y}.json?` + utilQsString(params);
+
+      const controller = new AbortController();
+      this._cache.inflightTile[tile.id] = controller;
+
+      d3_json(url, { signal: controller.signal })
+        .then(data => {
+          delete this._cache.inflightTile[tile.id];
+          this._cache.loadedTile[tile.id] = true;
+
+          for (const issue of (data.features ?? [])) {
+            // Osmose issues are uniquely identified by a unique
+            // `item` and `class` combination (both integer values)
+            const { item, class: cl, uuid: id } = issue.properties;
+            const itemType = `${item}-${cl}`;
+
+            // Filter out unsupported issue types (some are too specific or advanced)
+            if (itemType in this._osmoseData.icons) {
+              let loc = issue.geometry.coordinates; // lon, lat
+              loc = this._preventCoincident(loc);
+
+              let d = new QAItem(loc, this, itemType, id, { item });
+
+              // Assigning `elems` here prevents UI detail requests
+              if (item === 8300 || item === 8360) {
+                d.elems = [];
+              }
+
+              this._cache.issues.set(d.id, d);
+              this._cache.rtree.insert(this._encodeIssueRtree(d));
+            }
+          }
+
+          this.context.deferredRedraw();
+          this.emit('loadedData');
+        })
+        .catch(() => {
+          delete this._cache.inflightTile[tile.id];
+          this._cache.loadedTile[tile.id] = true;
+        });
+    }
+  }
+
+
+  /**
+   * loadIssueDetailAsync
+   * @param   issue
+   * @return  Promise
+   */
+  loadIssueDetailAsync(issue) {
+    // Issue details only need to be fetched once
+    if (issue.elems !== undefined) return Promise.resolve(issue);
+
+    const localeCode = this.context.localizationSystem().localeCode();
+    const url = `${OSMOSE_API}/issue/${issue.id}?langs=${localeCode}`;
+    const handleResponse = (data) => {
+      // Associated elements used for highlighting
+      // Assign directly for immediate use in the callback
+      issue.elems = data.elems.map(e => e.type.substring(0,1) + e.id);
+      // Some issues have instance specific detail in a subtitle
+      issue.detail = data.subtitle ? marked.parse(data.subtitle.auto) : '';
+      this.replaceItem(issue);
+    };
+
+    return d3_json(url)
+      .then(handleResponse)
+      .then(() => issue);
+  }
+
+
+  /**
+   * loadStringsAsync
+   * Load the strings for the types of issues that we support
+   * @return  Promise
+   */
+  loadStringsAsync() {
+    // Only need to cache strings for supported issue types
+    const itemTypes = Object.keys(this._osmoseData.icons);
+
+    // For now, we only do this one time at init.
+    // Todo: support switching locales
+    let stringData = {};
+    const localeCode = this.context.localizationSystem().localeCode();
+    this._osmoseStrings.set(localeCode, stringData);
+
+    // Using multiple individual item + class requests to reduce fetched data size
+    const allRequests = itemTypes.map(itemType => {
+
+      const handleResponse = (data) => {
+        // Bunch of nested single value arrays of objects
+        const [ cat = { items:[] } ] = data.categories;
+        const [ item = { class:[] } ] = cat.items;
+        const [ cl = null ] = item.class;
+
+        // If null default value is reached, data wasn't as expected (or was empty)
+        if (!cl) {
+          /* eslint-disable no-console */
+          console.log(`Osmose strings request (${itemType}) had unexpected data`);
+          /* eslint-enable no-console */
+          return;
+        }
+
+        // Save item colors to automatically style issue markers later
+        const itemInt = item.item;
+        this._osmoseColors.set(itemInt, new Color(item.color).toNumber());
+
+        // Value of root key will be null if no string exists
+        // If string exists, value is an object with key 'auto' for string
+        const { title, detail, fix, trap } = cl;
+
+        let issueStrings = {};
+        // Force title to begin with an uppercase letter
+        if (title)  issueStrings.title = title.auto.charAt(0).toUpperCase() + title.auto.slice(1);
+        if (detail) issueStrings.detail = marked.parse(detail.auto);
+        if (trap)   issueStrings.trap = marked.parse(trap.auto);
+        if (fix)    issueStrings.fix = marked.parse(fix.auto);
+
+        stringData[itemType] = issueStrings;
+      };
+
+      // Osmose API falls back to English strings where untranslated or if locale doesn't exist
+      const [item, cl] = itemType.split('-');
+      const url = `${OSMOSE_API}/items/${item}/class/${cl}?langs=${localeCode}`;
+
+      return d3_json(url).then(handleResponse);
+    }).filter(Boolean);
+
+    return Promise.all(allRequests);
+  }
+
+
+  /**
+   * getStrings
+   * @param   itemType
+   * @param   locale
+   * @return  stringdata
+   */
+  getStrings(itemType, locale) {
+    locale = locale || this.context.localizationSystem().localeCode();
+
+    const stringData = this._osmoseStrings.get(locale) ?? {};
+    return stringData[itemType] ?? {};
+  }
+
+
+  /**
+   * getColor
+   * Get the color associated with this issue type
+   * @param   itemInt
+   * @return  hex color
+   */
+  getColor(itemInt) {
+    return this._osmoseColors.get(itemInt) ?? 0xffffff;
+  }
+
+
+  /**
+   * getIcon
+   * Get the icon to use for the given itemType
+   * @param   itemType
+   * @return  icon name
+   */
+  getIcon(itemType) {
+    return this._osmoseData.icons[itemType];
+  }
+
+
+  /**
+   * postUpdate
+   * @param   issue
+   * @param   callback
+   */
+  postUpdate(issue, callback) {
+    if (this._cache.inflightPost[issue.id]) {
+      return callback({ message: 'Issue update already inflight', status: -2 }, issue);
+    }
+
+    // UI sets the status to either 'done' or 'false'
+    const url = `${OSMOSE_API}/issue/${issue.id}/${issue.newStatus}`;
+    const controller = new AbortController();
+    const after = () => {
+      delete this._cache.inflightPost[issue.id];
+
+      this.removeItem(issue);
+      if (issue.newStatus === 'done') {
+        // Keep track of the number of issues closed per `item` to tag the changeset
+        if (!(issue.item in this._cache.closed)) {
+          this._cache.closed[issue.item] = 0;
+        }
+        this._cache.closed[issue.item] += 1;
+      }
+      if (callback) callback(null, issue);
+    };
+
+    this._cache.inflightPost[issue.id] = controller;
+
+    fetch(url, { signal: controller.signal })
+      .then(after)
+      .catch(err => {
+        delete this._cache.inflightPost[issue.id];
+        if (callback) callback(err.message);
+      });
+  }
+
+
+  /**
+   * getItems
+   * Get all cached QAItems covering the viewport
+   * @param   projection
+   * @return  Array of data
+   */
+  getItems(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
+
+    return this._cache.rtree.search(bbox).map(d => d.data);
+  }
+
+
+  /**
+   * getError
+   * Get a QAItem from cache
+   * @param   issueID
+   * @return  QAItem
+   */
+  getError(issueID) {
+    return this._cache.issues.get(issueID);
+  }
+
+
+  /**
+   * replaceItem
+   * Replace a single QAItem in the cache
+   * @param   item
+   * @return  the item, or `null` if it couldn't be replaced
+   */
+  replaceItem(item) {
+    if (!(item instanceof QAItem) || !item.id) return;
+
+    this._cache.issues.set(item.id, item);
+    this._updateRtree(this._encodeIssueRtree(item), true); // true = replace
+    return item;
+  }
+
+
+  /**
+   * removeItem
+   * Remove a single QAItem from the cache
+   * @param   item to remove
+   */
+  removeItem(item) {
+    if (!(item instanceof QAItem) || !item.id) return;
+
+    this._cache.isseus.delete(item.id);
+    this._updateRtree(this._encodeIssueRtree(item), false); // false = remove
+  }
+
+
+  /**
+   * getClosedCounts
+   * Used to populate `closed:osmose:*` changeset tags
+   * @return   the closed cache
+   */
+  getClosedCounts() {
+    return this._cache.closed;
+  }
+
+
+  /**
+   * itemURL
+   * Returns the url to link to details about an item
+   * @param   item
+   * @return  the url
+   */
+  itemURL(item) {
+    return `https://osmose.openstreetmap.fr/en/error/${item.id}`;
+  }
+
+
+  _abortRequest(controller) {
+    if (controller) {
+      controller.abort();
+    }
+  }
+
+  _abortUnwantedRequests(cache, tiles) {
+    Object.keys(cache.inflightTile).forEach(k => {
+      const wanted = tiles.find(tile => k === tile.id);
+      if (!wanted) {
+        this._abortRequest(cache.inflightTile[k]);
+        delete cache.inflightTile[k];
+      }
+    });
+  }
+
+  _encodeIssueRtree(d) {
+    return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d };
+  }
+
+  // Replace or remove QAItem from rtree
+  _updateRtree(item, replace) {
+    this._cache.rtree.remove(item, (a, b) => a.data.id === b.data.id);
+    if (replace) {
+      this._cache.rtree.insert(item);
+    }
+  }
+
+  // Issues shouldn't obscure each other
+  _preventCoincident(loc) {
+    let coincident = false;
+    do {
+      // first time, move marker up. after that, move marker right.
+      let delta = coincident ? [0.00001, 0] : [0, 0.00001];
+      loc = vecAdd(loc, delta);
+      const bbox = new Extent(loc).bbox();
+      coincident = this._cache.rtree.search(bbox).length;
+    } while (coincident);
+
+    return loc;
+  }
+
+
+}
diff --git a/modules/services/StreetsideService.js b/modules/services/StreetsideService.js
new file mode 100644
index 0000000000..a6ab31acf3
--- /dev/null
+++ b/modules/services/StreetsideService.js
@@ -0,0 +1,963 @@
+import { json as d3_json } from 'd3-fetch';
+import { select as d3_select } from 'd3-selection';
+import { timer as d3_timer } from 'd3-timer';
+import { Extent, Tiler, geoMetersToLat, geoMetersToLon, geomRotatePoints, geomPointInPolygon, vecLength } from '@rapid-sdk/math';
+import { utilArrayUnion, utilQsString, utilUniqueString } from '@rapid-sdk/util';
+import RBush from 'rbush';
+
+import { AbstractService } from './AbstractService';
+import { jsonpRequest } from '../util/jsonp_request';
+
+const pannellumViewerCSS = 'pannellum-streetside/pannellum.css';
+const pannellumViewerJS = 'pannellum-streetside/pannellum.js';
+const TILEZOOM = 16.5;
+
+
+/**
+ * `StreetsideService`
+ *
+ * Events available:
+ *   'loadedData'
+ *   'viewerChanged'
+ */
+export class StreetsideService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'streetside';
+
+    this._hires = false;
+    this._resolution = 512;    // higher numbers are slower - 512, 1024, 2048, 4096
+    this._currScene = 0;
+    this._cache = {};
+    this._pannellumViewer = null;
+    this._pannellumViewerPromise = null;
+
+    this._sceneOptions = {
+      showFullscreenCtrl: false,
+      autoLoad: true,
+      compass: true,
+      yaw: 0,
+      hfov: 45,      // default field of view degrees
+      minHfov: 10,   // zoom in degrees:  20, 10, 5
+      maxHfov: 90,   // zoom out degrees
+      type: 'cubemap',
+      cubeMap: []
+    };
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    // (This is also necessary when using `d3-selection.call`)
+    this._setupCanvas = this._setupCanvas.bind(this);
+
+    this._tiler = new Tiler().zoomRange(TILEZOOM).skipNullIsland(true);
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    this.reset();
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    if (this._cache.inflight) {
+      for (const inflight of this._cache.inflight.values()) {
+        inflight.controller.abort();
+      }
+    }
+
+    this._cache = {
+      inflight:  new Map(),   // Map(tileID -> { Promise, AbortController})
+      loaded:    new Set(),   // Set(tileID)
+      bubbles:   new Map(),   // Map(bubbleID -> bubble data)
+      sequences: new Map(),   // Map(sequenceID -> sequence data)
+      rtree:     new RBush(),
+      leaders:   [],
+      metadataPromsie:  null
+    };
+  }
+
+
+  /**
+   * bubbles
+   */
+  bubbles(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
+    return this._cache.rtree.search(box).map(d => d.data);
+  }
+
+
+  cachedImage(bubbleID) {
+    return this._cache.bubbles.get(bubbleID);
+  }
+
+
+  sequences(projection) {
+    const viewport = projection.dimensions();
+    const min = [viewport[0][0], viewport[1][1]];
+    const max = [viewport[1][0], viewport[0][1]];
+    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
+    let result = new Map();  // Map(sequenceID -> sequence geojson)
+
+    // Gather sequences for bubbles in viewport
+    for (const box of this._cache.rtree.search(bbox)) {
+      const sequenceID = box.data.sequenceID;
+      if (!sequenceID) continue;  // no sequence for this bubble
+      if (!result.has(sequenceID)) {
+        result.set(sequenceID, this._cache.sequences.get(sequenceID).geojson);
+      }
+    }
+    return [...result.values()];
+  }
+
+
+  /**
+   * loadBubbles
+   * by default: request 2 nearby tiles so we can connect sequences.
+   */
+  loadBubbles(projection, margin = 2) {
+    this._loadTiles(projection, margin);
+  }
+
+
+  viewer() {
+    return this._pannellumViewer;
+  }
+
+
+  initViewer() {
+    if (!window.pannellum) return;
+    if (this._pannellumViewer) return;
+
+    this._currScene++;
+    const sceneID = this._currScene.toString();
+    const options = {
+      'default': { firstScene: sceneID },
+      scenes: {}
+    };
+    options.scenes[sceneID] = this._sceneOptions;
+
+    this._pannellumViewer = window.pannellum.viewer('ideditor-viewer-streetside', options);
+  }
+
+
+  loadViewerAsync() {
+    if (this._pannellumViewerPromise) return this._pannellumViewerPromise;
+
+    // create ms-wrapper, a photo wrapper class
+    const context = this.context;
+    let wrap = context.container().select('.photoviewer').selectAll('.ms-wrapper')
+      .data([0]);
+
+    // inject ms-wrapper into the photoviewer div
+    // (used by all to house each custom photo viewer)
+    let wrapEnter = wrap.enter()
+      .append('div')
+      .attr('class', 'photo-wrapper ms-wrapper')
+      .classed('hide', true);
+
+    // inject div to support streetside viewer (pannellum) and attribution line
+    wrapEnter
+      .append('div')
+      .attr('id', 'ideditor-viewer-streetside')
+      .on('pointerdown.streetside', () => {
+        d3_select(window)
+          .on('pointermove.streetside', () => {
+            this.emit('viewerChanged');
+          }, true);
+      })
+      .on('pointerup.streetside pointercancel.streetside', () => {
+        d3_select(window)
+          .on('pointermove.streetside', null);
+
+        // continue emitting events for a few seconds, in case viewer has inertia.
+        const t = d3_timer(elapsed => {
+          this.emit('viewerChanged');
+          if (elapsed > 2000) {
+            t.stop();
+          }
+        });
+      })
+      .append('div')
+      .attr('class', 'photo-attribution fillD');
+
+    let controlsEnter = wrapEnter
+      .append('div')
+      .attr('class', 'photo-controls-wrap')
+      .append('div')
+      .attr('class', 'photo-controls');
+
+    controlsEnter
+      .append('button')
+      .on('click.back', () => this._step(-1))
+      .html('◄');
+
+    controlsEnter
+      .append('button')
+      .on('click.forward', () => this._step(1))
+      .html('►');
+
+
+    // create working canvas for stitching together images
+    wrap = wrap
+      .merge(wrapEnter)
+      .call(this._setupCanvas);
+
+    // Register viewer resize handler
+    context.ui().photoviewer.on('resize.streetside', () => {
+      if (this._pannellumViewer) this._pannellumViewer.resize();
+    });
+
+    this._pannellumViewerPromise = new Promise((resolve, reject) => {
+      let loadedCount = 0;
+      function loaded() {
+        loadedCount += 1;
+        // wait until both files are loaded
+        if (loadedCount === 2) resolve();
+      }
+
+      const head = d3_select('head');
+
+      // load streetside pannellum viewer css
+      head.selectAll('#ideditor-streetside-viewercss')
+        .data([0])
+        .enter()
+        .append('link')
+        .attr('id', 'ideditor-streetside-viewercss')
+        .attr('rel', 'stylesheet')
+        .attr('crossorigin', 'anonymous')
+        .attr('href', context.asset(pannellumViewerCSS))
+        .on('load.StreetsideService', loaded)
+        .on('error.StreetsideService', reject);
+
+      // load streetside pannellum viewer js
+      head.selectAll('#ideditor-streetside-viewerjs')
+        .data([0])
+        .enter()
+        .append('script')
+        .attr('id', 'ideditor-streetside-viewerjs')
+        .attr('crossorigin', 'anonymous')
+        .attr('src', context.asset(pannellumViewerJS))
+        .on('load.StreetsideService', loaded)
+        .on('error.StreetsideService', reject);
+    })
+    .catch(err => {
+      if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
+      this._pannellumViewerPromise = null;
+    });
+
+    return this._pannellumViewerPromise;
+  }
+
+
+  /**
+   * _step
+   * Step to the next bubble in the sequence
+   * @param  stepBy  1 to step forward, -1 to step backward
+   */
+  _step(stepBy) {
+    const context = this.context;
+    const viewer = context.container().select('.photoviewer');
+    const selected = viewer.empty() ? undefined : viewer.datum();
+    if (!selected) return;
+
+    let nextID = (stepBy === 1 ? selected.ne : selected.pr);
+    const yaw = this._pannellumViewer.getYaw();
+    this._sceneOptions.yaw = yaw;
+
+    const ca = selected.ca + yaw;
+    const origin = selected.loc;
+
+    // construct a search trapezoid pointing out from current bubble
+    const meters = 35;
+    const p1 = [
+      origin[0] + geoMetersToLon(meters / 5, origin[1]),
+      origin[1]
+    ];
+    const p2 = [
+      origin[0] + geoMetersToLon(meters / 2, origin[1]),
+      origin[1] + geoMetersToLat(meters)
+    ];
+    const p3 = [
+      origin[0] - geoMetersToLon(meters / 2, origin[1]),
+      origin[1] + geoMetersToLat(meters)
+    ];
+    const p4 = [
+      origin[0] - geoMetersToLon(meters / 5, origin[1]),
+      origin[1]
+    ];
+
+    let poly = [p1, p2, p3, p4, p1];
+
+    // rotate it to face forward/backward
+    const angle = (stepBy === 1 ? ca : ca + 180) * (Math.PI / 180);
+    poly = geomRotatePoints(poly, -angle, origin);
+
+    let extent = poly.reduce((extent, point) => {
+      // update extent in place
+      extent.min = [ Math.min(extent.min[0], point[0]), Math.min(extent.min[1], point[1]) ];
+      extent.max = [ Math.max(extent.max[0], point[0]), Math.max(extent.max[1], point[1]) ];
+      return extent;
+    }, new Extent());
+
+    // find nearest other bubble in the search polygon
+    let minDist = Infinity;
+    this._cache.rtree.search(extent.bbox())
+      .forEach(d => {
+        if (d.data.id === selected.id) return;
+        if (!geomPointInPolygon(d.data.loc, poly)) return;
+
+        let dist = vecLength(d.data.loc, selected.loc);
+        const theta = selected.ca - d.data.ca;
+        const minTheta = Math.min(Math.abs(theta), 360 - Math.abs(theta));
+        if (minTheta > 20) {
+          dist += 5;  // penalize distance if camera angles don't match
+        }
+
+        if (dist < minDist) {
+          nextID = d.data.id;
+          minDist = dist;
+        }
+      });
+
+    const nextBubble = nextID && this.cachedImage(nextID);
+    if (!nextBubble) return;
+
+    context.mapSystem().centerEase(nextBubble.loc);
+    context.photoSystem().selectPhoto('streetside', nextBubble.id);
+  }
+
+
+  /**
+   * showViewer
+   */
+  showViewer() {
+    let wrap = this.context.container().select('.photoviewer').classed('hide', false);
+    const isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size();
+
+    if (isHidden) {
+      wrap
+        .selectAll('.photo-wrapper:not(.ms-wrapper)')
+        .classed('hide', true);
+
+      wrap
+        .selectAll('.photo-wrapper.ms-wrapper')
+        .classed('hide', false);
+    }
+
+    return this;
+  }
+
+
+  /**
+   * hideViewer
+   */
+  hideViewer() {
+    const context = this.context;
+    context.photoSystem().selectPhoto(null);
+
+    let viewer = context.container().select('.photoviewer');
+    if (!viewer.empty()) viewer.datum(null);
+
+    viewer
+      .classed('hide', true)
+      .selectAll('.photo-wrapper')
+      .classed('hide', true);
+
+    context.container().selectAll('.viewfield-group, .sequence, .icon-sign')
+      .classed('currentView', false);
+
+    return this.setStyles(context, null, true);
+  }
+
+
+  /**
+   * selectImage
+   * note: call `photoSystem.selectPhoto(layerID, photoID)` instead
+   * That will deal with the URL and call this function
+   */
+  selectImage(bubbleID) {
+    let d = this.cachedImage(bubbleID);
+
+    const context = this.context;
+    let viewer = context.container().select('.photoviewer');
+    if (!viewer.empty()) {
+      viewer.datum(d);
+    }
+
+    this.setStyles(context, null, true);
+
+    let wrap = context.container().select('.photoviewer .ms-wrapper');
+    let attribution = wrap.selectAll('.photo-attribution').html('');
+
+    wrap.selectAll('.pnlm-load-box')   // display "loading.."
+      .style('display', 'block')
+      .style('transform', 'translate(-50%, -50%)');
+
+    if (!d) return this;
+
+    this._sceneOptions.northOffset = d.ca;
+
+    let line1 = attribution
+      .append('div')
+      .attr('class', 'attribution-row');
+
+    const hiresDomID = utilUniqueString('streetside-hires');
+
+    // Add hires checkbox
+    let label = line1
+      .append('label')
+      .attr('for', hiresDomID)
+      .attr('class', 'streetside-hires');
+
+    label
+      .append('input')
+      .attr('type', 'checkbox')
+      .attr('id', hiresDomID)
+      .property('checked', this._hires)
+      .on('click', d3_event => {
+        d3_event.stopPropagation();
+
+        this._hires = !this._hires;
+        this._resolution = this._hires ? 1024 : 512;
+        wrap.call(this._setupCanvas);
+
+        const viewstate = {
+          yaw: this._pannellumViewer.getYaw(),
+          pitch: this._pannellumViewer.getPitch(),
+          hfov: this._pannellumViewer.getHfov()
+        };
+
+        this._sceneOptions = Object.assign(this._sceneOptions, viewstate);
+        context.photoSystem().selectPhoto('streetside', d.id);
+      });
+
+    label
+      .append('span')
+      .text(this.context.t('streetside.hires'));
+
+
+    let captureInfo = line1
+      .append('div')
+      .attr('class', 'attribution-capture-info');
+
+    // Add capture date
+    if (d.captured_by) {
+      const yyyy = (new Date()).getFullYear();
+
+      captureInfo
+        .append('a')
+        .attr('class', 'captured_by')
+        .attr('target', '_blank')
+        .attr('href', 'https://www.microsoft.com/en-us/maps/streetside')
+        .text(`© ${yyyy} Microsoft`);
+
+      captureInfo
+        .append('span')
+        .text('|');
+    }
+
+    if (d.captured_at) {
+      captureInfo
+        .append('span')
+        .attr('class', 'captured_at')
+        .text(this._localeTimestamp(d.captured_at));
+    }
+
+    // Add image links
+    let line2 = attribution
+      .append('div')
+      .attr('class', 'attribution-row');
+
+    line2
+      .append('a')
+      .attr('class', 'image-view-link')
+      .attr('target', '_blank')
+      .attr('href', 'https://www.bing.com/maps?cp=' + d.loc[1] + '~' + d.loc[0] +
+        '&lvl=17&dir=' + d.ca + '&style=x&v=2&sV=1')
+      .text(this.context.t('streetside.view_on_bing'));
+
+    line2
+      .append('a')
+      .attr('class', 'image-report-link')
+      .attr('target', '_blank')
+      .attr('href', 'https://www.bing.com/maps/privacyreport/streetsideprivacyreport?bubbleid=' +
+        encodeURIComponent(d.id) + '&focus=photo&lat=' + d.loc[1] + '&lng=' + d.loc[0] + '&z=17')
+      .text(this.context.t('streetside.report'));
+
+
+// const streetsideImagesApi = 'https://t.ssl.ak.tiles.virtualearth.net/tiles/';
+const streetsideImagesApi = 'http://ecn.t0.tiles.virtualearth.net/tiles/';
+
+    let bubbleIdQuadKey = d.id.toString(4);
+    const paddingNeeded = 16 - bubbleIdQuadKey.length;
+    for (let i = 0; i < paddingNeeded; i++) {
+      bubbleIdQuadKey = '0' + bubbleIdQuadKey;
+    }
+    const imgUrlPrefix = streetsideImagesApi + 'hs' + bubbleIdQuadKey;
+    // const imgUrlSuffix = '.jpg?g=6338&n=z';
+    const imgUrlSuffix = '?g=13305&n=z';
+
+    // Cubemap face code order matters here: front=01, right=02, back=03, left=10, up=11, down=12
+    const faceKeys = ['01','02','03','10','11','12'];
+
+    // Map images to cube faces
+    const quadKeys = this._getQuadKeys();
+    const faces = faceKeys.map(faceKey => {
+      return quadKeys.map(quadKey => {
+        const xy = this._qkToXY(quadKey);
+        return {
+          face: faceKey,
+          url: imgUrlPrefix + faceKey + quadKey + imgUrlSuffix,
+          x: xy[0],
+          y: xy[1]
+        };
+      });
+    });
+
+    this._loadFacesAsync(faces)
+      .then(() => {
+        if (!this._pannellumViewer) {
+          this.initViewer();
+        } else {
+          // make a new scene
+          this._currScene++;
+          let sceneID = this._currScene.toString();
+          this._pannellumViewer
+            .addScene(sceneID, this._sceneOptions)
+            .loadScene(sceneID);
+
+          // remove previous scene
+          if (this._currScene > 2) {
+            sceneID = (this._currScene - 1).toString();
+            this._pannellumViewer
+              .removeScene(sceneID);
+          }
+        }
+      });
+
+    return this;
+  }
+
+
+  // Updates the currently highlighted sequence and selected bubble.
+  // Reset is only necessary when interacting with the viewport because
+  // this implicitly changes the currently selected bubble/sequence
+  setStyles(context, hovered, reset) {
+    if (reset) {  // reset all layers
+      context.container().selectAll('.viewfield-group')
+        .classed('highlighted', false)
+        .classed('hovered', false)
+        .classed('currentView', false);
+
+      context.container().selectAll('.sequence')
+        .classed('highlighted', false)
+        .classed('currentView', false);
+    }
+
+    let hoveredBubbleID = hovered?.id;
+    let hoveredSequenceID = hovered?.sequenceID;
+    let hoveredSequence = hoveredSequenceID && this._cache.sequences.get(hoveredSequenceID);
+    let hoveredBubbleIDs =  (hoveredSequence && hoveredSequence.bubbles.map(d => d.id)) || [];
+
+    let viewer = context.container().select('.photoviewer');
+    let selected = viewer.empty() ? undefined : viewer.datum();
+    let selectedBubbleID = selected?.id;
+    let selectedSequenceID = selected?.sequenceID;
+    let selectedSequence = selectedSequenceID && this._cache.sequences.get(selectedSequenceID);
+    let selectedBubbleIDs = (selectedSequence && selectedSequence.bubbles.map(d => d.id)) || [];
+
+    // highlight sibling viewfields on either the selected or the hovered sequences
+    let highlightedBubbleIDs = utilArrayUnion(hoveredBubbleIDs, selectedBubbleIDs);
+
+    context.container().selectAll('.layer-streetside-images .viewfield-group')
+      .classed('highlighted', d => highlightedBubbleIDs.indexOf(d.id) !== -1)
+      .classed('hovered',     d => d.id === hoveredBubbleID)
+      .classed('currentView', d => d.id === selectedBubbleID);
+
+    context.container().selectAll('.layer-streetside-images .sequence')
+      .classed('highlighted', d => d.properties.id === hoveredSequenceID)
+      .classed('currentView', d => d.properties.id === selectedSequenceID);
+
+    // update viewfields if needed
+    context.container().selectAll('.layer-streetside-images .viewfield-group .viewfield')
+      .attr('d', viewfieldPath);
+
+    function viewfieldPath() {
+      let d = this.parentNode.__data__;
+      if (d.isPano && d.id !== selectedBubbleID) {
+        return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
+      } else {
+        return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
+      }
+    }
+
+    return this;
+  }
+
+
+
+  /**
+   * _localeTimestamp
+   */
+  _localeTimestamp(s) {
+    if (!s) return null;
+    const options = { day: 'numeric', month: 'short', year: 'numeric' };
+    const d = new Date(s);
+    if (isNaN(d.getTime())) return null;
+
+    const localeCode = this.context.localizationSystem().localeCode();
+    return d.toLocaleString(localeCode, options);
+  }
+
+
+  /**
+   * _loadTiles
+   * wraps the process of generating tiles and then fetching image points for each tile.
+   */
+  _loadTiles(projection, margin) {
+    // Determine the needed tiles to cover the view
+    const needTiles = this._tiler.zoomRange(TILEZOOM).margin(margin).getTiles(projection).tiles;
+
+    // Abort inflight requests that are no longer needed
+    for (const [tileID, inflight] of this._cache.inflight) {
+      const needed = needTiles.find(tile => tile.id === tileID);
+      if (!needed) {
+        inflight.controller.abort();
+      }
+    }
+
+    // Fetch files that are needed
+    for (const tile of needTiles) {
+      const tileID = tile.id;
+      if (this._cache.loaded.has(tileID) || this._cache.inflight.has(tileID)) continue;
+
+      // Promise.all([this._fetchMetadataAsync(tile), this._fetchBubblesAsync(tile)])
+      this._fetchBubblesAsync(tile)
+        .then(results => this._processResults(results))
+        .catch(err => {
+          if (err.name === 'AbortError') return;          // ok
+          if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
+        });
+    }
+  }
+
+
+  _processResults(results) {
+    // const metadata = results[0];
+    // this._cache.loaded.add(results[1].tile.id);
+    // const bubbles = results[1].data;
+    this._cache.loaded.add(results.tile.id);
+    const bubbles = results.data;
+    if (!bubbles) return;
+    if (bubbles.error) throw new Error(bubbles.error);
+
+    // [].shift() removes the first element, some statistics info, not a bubble point
+    bubbles.shift();
+
+    const boxes = bubbles.map(bubble => {
+      if (this._cache.bubbles.has(bubble.id)) return null;  // skip duplicates
+
+      const loc = [bubble.lo, bubble.la];
+      const bubbleData = {
+        loc: loc,
+        id: bubble.id,
+        ca: bubble.he,
+        captured_at: bubble.cd,
+        captured_by: 'microsoft',
+        pr: bubble.pr,  // previous
+        ne: bubble.ne,  // next
+        isPano: true,
+        sequenceID: null
+      };
+
+      this._cache.bubbles.set(bubble.id,  bubbleData);
+
+      // a sequence starts here
+      if (bubble.pr === undefined) {
+        this._cache.leaders.push(bubble.id);
+      }
+
+      return {
+        minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: bubbleData
+      };
+
+    }).filter(Boolean);
+
+    this._cache.rtree.load(boxes);
+    this._connectSequences();
+    this.context.deferredRedraw();
+    this.emit('loadedData');
+  }
+
+
+  // call this sometimes to connect the bubbles into sequences
+  _connectSequences() {
+    let keepLeaders = [];
+
+    for (let i = 0; i < this._cache.leaders.length; i++) {
+      let bubble = this._cache.bubbles.get(this._cache.leaders[i]);
+      let seen = {};
+
+      // Try to make a sequence.. use the id of the leader bubble.
+      let sequence = { id: bubble.id, bubbles: [] };
+      let complete = false;
+
+      do {
+        sequence.bubbles.push(bubble);
+        seen[bubble.id] = true;
+
+        if (bubble.ne === undefined) {  // no next
+          complete = true;
+        } else {
+          bubble = this._cache.bubbles.get(bubble.ne);  // advance to next
+        }
+      } while (bubble && !seen[bubble.id] && !complete);
+
+      if (complete) {
+        // assign bubbles to the sequence
+        for (let j = 0; j < sequence.bubbles.length; j++) {
+          sequence.bubbles[j].sequenceID = sequence.id;
+        }
+
+        // create a GeoJSON LineString
+        sequence.geojson = {
+          type: 'LineString',
+          properties: {
+            id: sequence.id,
+            captured_at: sequence.bubbles[0] ? sequence.bubbles[0].captured_at : null,
+            captured_by: sequence.bubbles[0] ? sequence.bubbles[0].captured_by : null
+          },
+          coordinates: sequence.bubbles.map(d => d.loc)
+        };
+
+        this._cache.sequences.set(sequence.id, sequence);
+
+      } else {
+        keepLeaders.push(this._cache.leaders[i]);
+      }
+    }
+
+    // couldn't complete these, save for later
+    this._cache.leaders = keepLeaders;
+  }
+
+
+  /**
+   * _fetchMetadataAsync
+   * https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata
+   */
+  _fetchMetadataAsync(tile) {  // eslint-disable-line  no-unused-vars
+    // only fetch it once
+    if (this._cache.metadataPromise) return this._cache.metadataPromise;
+
+    const [lon, lat] = tile.wgs84Extent.center();
+    const metadataURLBase = 'https://dev.virtualearth.net/REST/v1/Imagery/MetaData/Streetside';
+    const metadataKey = 'AoG8TaQvkPo6o8SlpRVmBs7WJwO_NDQklVRcAfpn7P8oiEMYWNY59XHSJU81sP1Y';
+    const metadataURL = `${metadataURLBase}/${lat},${lon}?key=${metadataKey}`;
+
+    this._cache.metadataPromise = d3_json(metadataURL)
+      .then(data => {
+        if (!data) throw new Error('no data');
+        return data;
+      });
+  }
+
+
+  /**
+   * _fetchBubblesAsync
+   * bubbles:   undocumented / unsupported API?
+   */
+  _fetchBubblesAsync(tile) {
+    const [w, s, e, n] = tile.wgs84Extent.rectangle();
+    const MAXRESULTS = 2000;
+
+    const bubbleURLBase = 'https://dev.virtualearth.net/mapcontrol/HumanScaleServices/GetBubbles.ashx?';
+    const bubbleKey = 'AuftgJsO0Xs8Ts4M1xZUQJQXJNsvmh3IV8DkNieCiy3tCwCUMq76-WpkrBtNAuEm';
+    const bubbleURL = bubbleURLBase + utilQsString({ n: n, s: s, e: e, w: w, c: MAXRESULTS, appkey: bubbleKey, jsCallback: '{callback}' });
+
+    const inflight = this._cache.inflight.get(tile.id);
+    if (inflight) return inflight.promise;
+
+    // Wrap JSONP request in an abortable Promise
+    const controller = new AbortController();
+    const promise = new Promise((resolve, reject) => {
+      let onAbort;
+      const request = jsonpRequest(bubbleURL, data => {
+        if (onAbort) controller.signal.removeEventListener('abort', onAbort);
+        resolve({ data: data, tile: tile });
+      });
+
+      onAbort = () => {
+        controller.signal.removeEventListener('abort', onAbort);
+        request.abort();
+        reject(new DOMException('Aborted', 'AbortError'));
+      };
+      controller.signal.addEventListener('abort', onAbort);
+    })
+    .finally(() => {
+      this._cache.inflight.delete(tile.id);
+    });
+
+    this._cache.inflight.set(tile.id, { promise: promise, controller: controller });
+
+    return promise;
+  }
+
+
+  /**
+   * _loadImageAsync
+   */
+  _loadImageAsync(imgInfo) {
+    return new Promise(resolve => {
+      const face = imgInfo.face;
+      const canvas = document.getElementById(`ideditor-canvas${face}`);
+      const ctx = canvas.getContext('2d');
+
+      const img = new Image();
+      img.onload = () => {
+        ctx.drawImage(img, imgInfo.x, imgInfo.y);
+        resolve({ imgInfo: imgInfo, status: 'ok' });
+      };
+      img.onerror = () => {
+        ctx.clearRect(0, 0, canvas.width, canvas.height);
+        resolve({ imgInfo: imgInfo, status: 'error' });
+      };
+      img.setAttribute('crossorigin', '');
+      img.src = imgInfo.url;
+    });
+  }
+
+
+  /**
+   * _loadFaceAsync
+   */
+  _loadFaceAsync(imageGroup) {
+    return Promise.all(imageGroup.map(d => this._loadImageAsync(d)))
+      .then(data => {
+        const face = data[0].imgInfo.face;
+        const canvas = document.getElementById(`ideditor-canvas${face}`);
+        const which = { '01': 0, '02': 1, '03': 2, '10': 3, '11': 4, '12': 5 };
+        this._sceneOptions.cubeMap[which[face]] = canvas.toDataURL('image/jpeg', 1.0);
+        return { status: `face ${face} ok` };
+      });
+  }
+
+
+  /**
+   * _loadFacesAsync
+   */
+  _loadFacesAsync(faceGroup) {
+    return Promise.all(faceGroup.map(d => this._loadFaceAsync(d)))
+      .then(() => { return { status: 'this._loadFacesAsync done' }; });
+  }
+
+
+  _setupCanvas(selection) {
+    selection.selectAll('#ideditor-stitcher-canvases')
+      .remove();
+
+    // Add the Streetside working canvases. These are used for 'stitching', or combining,
+    // multiple images for each of the six faces, before passing to the Pannellum control as DataUrls
+    selection.selectAll('#ideditor-stitcher-canvases')
+      .data([0])
+      .enter()
+      .append('div')
+      .attr('id', 'ideditor-stitcher-canvases')
+      .attr('display', 'none')
+      .selectAll('canvas')
+      .data(['canvas01', 'canvas02', 'canvas03', 'canvas10', 'canvas11', 'canvas12'])
+      .enter()
+      .append('canvas')
+      .attr('id', d => `ideditor-${d}`)
+      .attr('width', this._resolution)
+      .attr('height', this._resolution);
+  }
+
+
+  _qkToXY(qk) {
+    let x = 0;
+    let y = 0;
+    let scale = 256;
+    for (let i = qk.length; i > 0; i--) {
+      const key = qk[i-1];
+      x += (+(key === '1' || key === '3')) * scale;
+      y += (+(key === '2' || key === '3')) * scale;
+      scale *= 2;
+    }
+    return [x, y];
+  }
+
+
+  _getQuadKeys() {
+    const dim = this._resolution / 256;
+    let quadKeys;
+
+    if (dim === 16) {
+      quadKeys = [
+        '0000','0001','0010','0011','0100','0101','0110','0111',  '1000','1001','1010','1011','1100','1101','1110','1111',
+        '0002','0003','0012','0013','0102','0103','0112','0113',  '1002','1003','1012','1013','1102','1103','1112','1113',
+        '0020','0021','0030','0031','0120','0121','0130','0131',  '1020','1021','1030','1031','1120','1121','1130','1131',
+        '0022','0023','0032','0033','0122','0123','0132','0133',  '1022','1023','1032','1033','1122','1123','1132','1133',
+        '0200','0201','0210','0211','0300','0301','0310','0311',  '1200','1201','1210','1211','1300','1301','1310','1311',
+        '0202','0203','0212','0213','0302','0303','0312','0313',  '1202','1203','1212','1213','1302','1303','1312','1313',
+        '0220','0221','0230','0231','0320','0321','0330','0331',  '1220','1221','1230','1231','1320','1321','1330','1331',
+        '0222','0223','0232','0233','0322','0323','0332','0333',  '1222','1223','1232','1233','1322','1323','1332','1333',
+
+        '2000','2001','2010','2011','2100','2101','2110','2111',  '3000','3001','3010','3011','3100','3101','3110','3111',
+        '2002','2003','2012','2013','2102','2103','2112','2113',  '3002','3003','3012','3013','3102','3103','3112','3113',
+        '2020','2021','2030','2031','2120','2121','2130','2131',  '3020','3021','3030','3031','3120','3121','3130','3131',
+        '2022','2023','2032','2033','2122','2123','2132','2133',  '3022','3023','3032','3033','3122','3123','3132','3133',
+        '2200','2201','2210','2211','2300','2301','2310','2311',  '3200','3201','3210','3211','3300','3301','3310','3311',
+        '2202','2203','2212','2213','2302','2303','2312','2313',  '3202','3203','3212','3213','3302','3303','3312','3313',
+        '2220','2221','2230','2231','2320','2321','2330','2331',  '3220','3221','3230','3231','3320','3321','3330','3331',
+        '2222','2223','2232','2233','2322','2323','2332','2333',  '3222','3223','3232','3233','3322','3323','3332','3333'
+      ];
+
+    } else if (dim === 8) {
+      quadKeys = [
+        '000','001','010','011',  '100','101','110','111',
+        '002','003','012','013',  '102','103','112','113',
+        '020','021','030','031',  '120','121','130','131',
+        '022','023','032','033',  '122','123','132','133',
+
+        '200','201','210','211',  '300','301','310','311',
+        '202','203','212','213',  '302','303','312','313',
+        '220','221','230','231',  '320','321','330','331',
+        '222','223','232','233',  '322','323','332','333'
+      ];
+
+    } else if (dim === 4) {
+      quadKeys = [
+        '00','01',  '10','11',
+        '02','03',  '12','13',
+
+        '20','21',  '30','31',
+        '22','23',  '32','33'
+      ];
+
+    } else {  // dim === 2
+      quadKeys = [
+        '0', '1',
+        '2', '3'
+      ];
+    }
+
+    return quadKeys;
+  }
+
+}
diff --git a/modules/services/TaginfoService.js b/modules/services/TaginfoService.js
new file mode 100644
index 0000000000..1d35f65ad0
--- /dev/null
+++ b/modules/services/TaginfoService.js
@@ -0,0 +1,418 @@
+import { json as d3_json } from 'd3-fetch';
+import { utilObjectOmit, utilQsString } from '@rapid-sdk/util';
+import debounce from 'lodash-es/debounce';
+
+import { AbstractService } from './AbstractService';
+
+
+const TAGINFO_API = 'https://taginfo.openstreetmap.org/api/4/';
+
+const tag_sorts = {
+  point: 'count_nodes',
+  vertex: 'count_nodes',
+  area: 'count_ways',
+  line: 'count_ways'
+};
+const tag_sort_members = {
+  point: 'count_node_members',
+  vertex: 'count_node_members',
+  area: 'count_way_members',
+  line: 'count_way_members',
+  relation: 'count_relation_members'
+};
+const tag_filters = {
+  point: 'nodes',
+  vertex: 'nodes',
+  area: 'ways',
+  line: 'ways'
+};
+const tag_members_fractions = {
+  point: 'count_node_members_fraction',
+  vertex: 'count_node_members_fraction',
+  area: 'count_way_members_fraction',
+  line: 'count_way_members_fraction',
+  relation: 'count_relation_members_fraction'
+};
+
+
+
+/**
+ * `TaginfoService`
+ */
+export class TaginfoService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'taginfo';
+
+    this._inflight = {};
+    this._cache = {};
+    this._popularKeys = {
+      // manually exclude some keys – iD#5377, iD#7485
+      postal_code: true,
+      full_name: true,
+      loc_name: true,
+      reg_name: true,
+      short_name: true,
+      sorting_name: true,
+      artist_name: true,
+      nat_name: true,
+      long_name: true,
+      'bridge:name': true
+    };
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    this.keys = this.keys.bind(this);
+    this.multikeys = this.multikeys.bind(this);
+    this.values = this.values.bind(this);
+    this.roles = this.roles.bind(this);
+    this.docs = this.docs.bind(this);
+    this._request = this._request.bind(this);
+    this._debouncedRequest = debounce(this._request, 300, { leading: false });
+  }
+
+
+  /**
+   * init
+   * Called one time after all core objects have been instantiated.
+   */
+  init() {
+    const langCode = this.context.localizationSystem().languageCode();
+
+    // Fetch popular keys.  We'll exclude these from `values`
+    // lookups because they stress taginfo, and they aren't likely
+    // to yield meaningful autocomplete results.. see iD#3955
+    const params = {
+      rp: 100,
+      sortname: 'values_all',
+      sortorder: 'desc',
+      page: 1,
+      debounce: false,
+      lang: langCode
+    };
+    this.keys(params, (err, vals) => {
+      if (err) return;
+      vals.forEach(d => {
+        if (d.value === 'opening_hours') return;  // exception
+        this._popularKeys[d.value] = true;
+      });
+    });
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    this._debouncedRequest.cancel();
+    Object.values(this._inflight).forEach(controller => controller.abort());
+    this._inflight = {};
+  }
+
+
+  /**
+   * keys
+   * @param  params
+   * @param  callback
+   */
+  keys(params, callback) {
+    const langCode = this.context.localizationSystem().languageCode();
+    const doRequest = params.debounce ? this._debouncedRequest : this._request;
+    params = this._clean(this._setSort(params));
+    params = Object.assign({
+      rp: 10,
+      sortname: 'count_all',
+      sortorder: 'desc',
+      page: 1,
+      lang: langCode
+    }, params);
+
+    const url = TAGINFO_API + 'keys/all?' + utilQsString(params);
+    doRequest(url, params, false, callback, (err, result) => {
+      if (err) {
+        callback(err);
+      } else {
+        const f = this._filterKeys(params.filter);
+        const vals = result.data.filter(f).sort(this._sortKeys).map(this._valKey);
+        this._cache[url] = vals;
+        callback(null, vals);
+      }
+    });
+  }
+
+
+  /**
+   * multikeys
+   * @param  params
+   * @param  callback
+   */
+  multikeys(params, callback) {
+    const langCode = this.context.localizationSystem().languageCode();
+    const doRequest = params.debounce ? this._debouncedRequest : this._request;
+    params = this._clean(this._setSort(params));
+    params = Object.assign({
+      rp: 25,
+      sortname: 'count_all',
+      sortorder: 'desc',
+      page: 1,
+      lang: langCode
+    }, params);
+
+    const prefix = params.query;
+    const url = TAGINFO_API + 'keys/all?' + utilQsString(params);
+    doRequest(url, params, true, callback, (err, result) => {
+      if (err) {
+        callback(err);
+      } else {
+        const f = this._filterMultikeys(prefix);
+        const vals = result.data.filter(f).map(this._valKey);
+        this._cache[url] = vals;
+        callback(null, vals);
+      }
+    });
+  }
+
+
+  /**
+   * values
+   * @param  params
+   * @param  callback
+   */
+  values(params, callback) {
+    // Exclude popular keys from values lookups.. see iD#3955
+    const key = params.key;
+    if (key && this._popularKeys[key]) {
+      callback(null, []);
+      return;
+    }
+
+    const langCode = this.context.localizationSystem().languageCode();
+    const doRequest = params.debounce ? this._debouncedRequest : this._request;
+    params = this._clean(this._setSort(this._setFilter(params)));
+    params = Object.assign({
+      rp: 25,
+      sortname: 'count_all',
+      sortorder: 'desc',
+      page: 1,
+      lang: langCode
+    }, params);
+
+    const url = TAGINFO_API + 'key/values?' + utilQsString(params);
+    doRequest(url, params, false, callback, (err, result) => {
+      if (err) {
+        callback(err);
+      } else {
+        // In most cases we prefer taginfo value results with lowercase letters.
+        // A few OSM keys expect values to contain uppercase values (see iD#3377).
+        // This is not an exhaustive list (e.g. `name` also has uppercase values)
+        // but these are the fields where taginfo value lookup is most useful.
+        const re = /network|taxon|genus|species|brand|grape_constiety|royal_cypher|listed_status|booth|rating|stars|:output|_hours|_times|_ref|manufacturer|country|target|brewery/;
+        const allowUpperCase = re.test(params.key);
+        const f = this._filterValues(allowUpperCase);
+
+        const vals = result.data.filter(f).map(this._valKeyDescription);
+        this._cache[url] = vals;
+        callback(null, vals);
+      }
+    });
+  }
+
+
+  /**
+   * roles
+   * @param  params
+   * @param  callback
+   */
+  roles(params, callback) {
+    const langCode = this.context.localizationSystem().languageCode();
+    const doRequest = params.debounce ? this._debouncedRequest : this._request;
+    const geometry = params.geometry;
+    params = this._clean(this._setSortMembers(params));
+    params = Object.assign({
+      rp: 25,
+      sortname: 'count_all_members',
+      sortorder: 'desc',
+      page: 1,
+      lang: langCode
+    }, params);
+
+    const url = TAGINFO_API + 'relation/roles?' + utilQsString(params);
+    doRequest(url, params, true, callback, (err, result) => {
+      if (err) {
+        callback(err);
+      } else {
+        const f = this._filterRoles(geometry);
+        const vals = result.data.filter(f).map(this._roleKey);
+        this._cache[url] = vals;
+        callback(null, vals);
+      }
+    });
+  }
+
+
+  docs(params, callback) {
+    const doRequest = params.debounce ? this._debouncedRequest : this._request;
+    params = this._clean(this._setSort(params));
+
+    let path = 'key/wiki_pages?';
+    if (params.value) {
+      path = 'tag/wiki_pages?';
+    } else if (params.rtype) {
+      path = 'relation/wiki_pages?';
+    }
+
+    const url = TAGINFO_API + path + utilQsString(params);
+    doRequest(url, params, true, callback, (err, result) => {
+      if (err) {
+        callback(err);
+      } else {
+        this._cache[url] = result.data;
+        callback(null, result.data);
+      }
+    });
+  }
+
+
+  _sets(params, n, o) {
+    if (params.geometry && o[params.geometry]) {
+      params[n] = o[params.geometry];
+    }
+    return params;
+  }
+
+  _setFilter(params) {
+    return this._sets(params, 'filter', tag_filters);
+  }
+
+  _setSort(params) {
+    return this._sets(params, 'sortname', tag_sorts);
+  }
+
+  _setSortMembers(params) {
+    return this._sets(params, 'sortname', tag_sort_members);
+  }
+
+  _clean(params) {
+    return utilObjectOmit(params, ['geometry', 'debounce']);
+  }
+
+
+  _filterKeys(type) {
+    const count_type = type ? 'count_' + type : 'count_all';
+    return d => parseFloat(d[count_type]) > 2500 || d.in_wiki;
+  }
+
+  _filterMultikeys(prefix) {
+    return d => {
+      // d.key begins with prefix, and d.key contains no additional ':'s
+      const re = new RegExp('^' + prefix + '(.*)$');
+      const matches = d.key.match(re) || [];
+      return (matches.length === 2 && matches[1].indexOf(':') === -1);
+    };
+  }
+
+  _filterValues(allowUpperCase) {
+    return d => {
+      if (d.value.match(/[;,]/) !== null) return false;  // exclude some punctuation
+      if (!allowUpperCase && d.value.match(/[A-Z*]/) !== null) return false;  // exclude uppercase letters
+      return parseFloat(d.fraction) > 0.0;
+    };
+  }
+
+  _filterRoles(geometry) {
+    return d => {
+      if (d.role === '') return false; // exclude empty role
+      if (d.role.match(/[A-Z*;,]/) !== null) return false;  // exclude uppercase letters and some punctuation
+      return parseFloat(d[tag_members_fractions[geometry]]) > 0.0;
+    };
+  }
+
+  _valKey(d) {
+    return {
+      value: d.key,
+      title: d.key
+    };
+  }
+
+
+  _valKeyDescription(d) {
+    const obj = {
+      value: d.value,
+      title: d.description || d.value
+    };
+    if (d.count) {
+      obj.count = d.count;
+    }
+    return obj;
+  }
+
+
+  _roleKey(d) {
+    return {
+      value: d.role,
+      title: d.role
+    };
+  }
+
+
+  // sort keys with ':' lower than keys without ':'
+  _sortKeys(a, b) {
+    return (a.key.indexOf(':') === -1 && b.key.indexOf(':') !== -1) ? -1
+      : (a.key.indexOf(':') !== -1 && b.key.indexOf(':') === -1) ? 1
+      : 0;
+  }
+
+
+
+  _request(url, params, exactMatch, callback, loaded) {
+    if (this._inflight[url]) return;
+    if (this._checkCache(url, params, exactMatch, callback)) return;
+
+    const controller = new AbortController();
+    this._inflight[url] = controller;
+
+    d3_json(url, { signal: controller.signal })
+      .then(result => {
+        delete this._inflight[url];
+        if (loaded) loaded(null, result);
+      })
+      .catch(err => {
+        delete this._inflight[url];
+        if (err.name === 'AbortError') return;
+        if (loaded) loaded(err.message);
+      });
+  }
+
+
+  _checkCache(url, params, exactMatch, callback) {
+    const rp = params.rp ?? 25;
+    let testQuery = params.query ?? '';
+    let testUrl = url;
+
+    do {
+      const hit = this._cache[testUrl];
+
+      // exact match, or shorter match yielding fewer than max results (rp)
+      if (hit && (url === testUrl || hit.length < rp)) {
+        callback(null, hit);
+        return true;
+      }
+
+      // don't try to shorten the query
+      if (exactMatch || !testQuery.length) return false;
+
+      // do shorten the query to see if we already have a cached result
+      // that has returned fewer than max results (rp)
+      testQuery = testQuery.slice(0, -1);
+      testUrl = url.replace(/&query=(.*?)&/, `&query=${testQuery}&`);
+    } while (testQuery.length >= 0);
+
+    return false;
+  }
+
+}
diff --git a/modules/services/VectorTileService.js b/modules/services/VectorTileService.js
new file mode 100644
index 0000000000..42f1d3d67e
--- /dev/null
+++ b/modules/services/VectorTileService.js
@@ -0,0 +1,259 @@
+import { Tiler } from '@rapid-sdk/math';
+import { utilHashcode } from '@rapid-sdk/util';
+import deepEqual from 'fast-deep-equal';
+import turf_bboxClip from '@turf/bbox-clip';
+import stringify from 'fast-json-stable-stringify';
+import polygonClipping from 'polygon-clipping';
+import Protobuf from 'pbf';
+import vt from '@mapbox/vector-tile';
+
+import { AbstractService } from './AbstractService';
+
+
+/**
+ * `VectorTileService`
+ *
+ * Events available:
+ *   'loadedData'
+ */
+export class VectorTileService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'vectortile';
+
+    this._cache = new Map();   // Map(sourceID -> source)
+    this._tiler = new Tiler().tileSize(512).margin(1);
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    for (const source of this._cache.values()) {
+      for (const controller of Object.values(source.inflight)) {
+        this._abortRequest(controller);
+      }
+    }
+
+    this._cache.clear();
+  }
+
+
+  /**
+   * addSource
+   * Create a new cache to hold data for a given source
+   * @param   sourceID
+   * @param   template
+   * @return  Object containing the cache
+   */
+  addSource(sourceID, template) {
+    const source = { template: template, inflight: {}, loaded: {}, canMerge: {} };
+    this._cache.set(sourceID, source);
+    return source;
+  }
+
+
+  /**
+   * data (maybe should be "getData"?)
+   * @param  sourceID
+   * @param  projection
+   */
+  data(sourceID, projection) {
+    const source = this._cache.get(sourceID);
+    if (!source) return [];
+
+    const tiles = this._tiler.getTiles(projection).tiles;
+    const seen = new Set();
+    let results = [];
+
+    for (const tile of tiles) {
+      const features = source.loaded[tile.id] ?? [];
+      for (const feature of features) {
+        const hash = feature.__featurehash__;
+        if (seen.has(hash)) continue;
+        seen.add(hash);
+
+        // return a shallow copy, because the hash may change
+        // later if this feature gets merged with another
+        results.push(Object.assign({}, feature));  // shallow copy
+      }
+    }
+
+    return results;
+  }
+
+
+  /**
+   * loadTiles
+   * @param  sourceID
+   * @param  template
+   * @param  projection
+   */
+  loadTiles(sourceID, template, projection) {
+    let source = this._cache.get(sourceID);
+    if (!source) {
+      source = this.addSource(sourceID, template);
+    }
+
+    const tiles = this._tiler.getTiles(projection).tiles;
+
+    // abort inflight requests that are no longer needed
+    for (const k of Object.keys(source.inflight)) {
+      const wanted = tiles.find(tile => tile.id === k);
+      if (!wanted) {
+        this._abortRequest(source.inflight[k]);
+        delete source.inflight[k];
+      }
+    }
+
+    for (const tile of tiles) {
+      this._loadTile(source, tile);
+    }
+  }
+
+
+  /**
+   * _abortRequest
+   * Call this to abort any unfinished tile fetch request
+   * @param  controller  {AbortController}
+   */
+  _abortRequest(controller) {
+    controller.abort();
+  }
+
+
+  /**
+   * _loadTile
+   * @param  source
+   * @param  tile
+   */
+  _loadTile(source, tile) {
+    if (source.loaded[tile.id] || source.inflight[tile.id]) return;
+
+    const url = source.template
+      .replace('{x}', tile.xyz[0])
+      .replace('{y}', tile.xyz[1])
+      // TMS-flipped y coordinate
+      .replace(/\{[t-]y\}/, Math.pow(2, tile.xyz[2]) - tile.xyz[1] - 1)
+      .replace(/\{z(oom)?\}/, tile.xyz[2])
+      .replace(/\{switch:([^}]+)\}/, function(s, r) {
+        const subdomains = r.split(',');
+        return subdomains[(tile.xyz[0] + tile.xyz[1]) % subdomains.length];
+      });
+
+
+    const controller = new AbortController();
+    source.inflight[tile.id] = controller;
+
+    fetch(url, { signal: controller.signal })
+      .then(response => {
+        if (!response.ok) {
+          throw new Error(response.status + ' ' + response.statusText);
+        }
+        source.loaded[tile.id] = [];
+        delete source.inflight[tile.id];
+        return response.arrayBuffer();
+      })
+      .then(data => {
+        if (!data) {
+          throw new Error('No Data');
+        }
+
+        const z = tile.xyz[2];
+        if (!source.canMerge[z]) {
+          source.canMerge[z] = {};  // initialize mergeCache
+        }
+
+        source.loaded[tile.id] = this._vtToGeoJSON(data, tile, source.canMerge[z]);
+        this.context.deferredRedraw();
+        this.emit('loadedData');
+      })
+      .catch(() => {
+        source.loaded[tile.id] = [];
+        delete source.inflight[tile.id];
+      });
+  }
+
+
+  /**
+   * _vtToGeoJSON
+   * @param  data
+   * @param  tile
+   * @param  mergeCache
+   */
+  _vtToGeoJSON(data, tile, mergeCache) {
+    const vectorTile = new vt.VectorTile(new Protobuf(data));
+    let layerIDs = Object.keys(vectorTile.layers);
+    if (!Array.isArray(layerIDs)) layerIDs = [layerIDs];
+
+    let features = [];
+    for (const layerID of layerIDs) {
+      const layer = vectorTile.layers[layerID];
+      if (!layer) continue;
+
+      for (let i = 0; i < layer.length; i++) {
+        const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
+        const geometry = feature.geometry;
+
+        // Treat all Polygons as MultiPolygons
+        if (geometry.type === 'Polygon') {
+          geometry.type = 'MultiPolygon';
+          geometry.coordinates = [geometry.coordinates];
+        }
+
+
+        // Does this feature clip to tile bounds?
+        // (there is probably a much more efficient way to determine this)
+        let isClipped = false;
+        if (geometry.type === 'MultiPolygon') {
+          const featureClip = turf_bboxClip(feature, tile.wgs84Extent.rectangle());
+          if (!deepEqual(feature.geometry, featureClip.geometry)) {
+            // feature = featureClip;
+            isClipped = true;
+          }
+          if (!feature.geometry.coordinates.length) continue;   // not actually on this tile
+          if (!feature.geometry.coordinates[0].length) continue;   // not actually on this tile
+        }
+
+        // Generate some unique IDs and add some metadata
+        const featurehash = utilHashcode(stringify(feature));
+        const propertyhash = utilHashcode(stringify(feature.properties || {}));
+        feature.__layerID__ = layerID.replace(/[^_a-zA-Z0-9\-]/g, '_');
+        feature.__featurehash__ = featurehash;
+        feature.__propertyhash__ = propertyhash;
+        feature.v = 0;
+        features.push(feature);
+
+        // Clipped Polygons at same zoom with identical properties can get merged (polygon union)
+        if (isClipped && geometry.type === 'MultiPolygon') {
+          let merged = mergeCache[propertyhash];
+          if (merged?.length) {
+            const other = merged[0];
+            const v = other.v + 1;     // bump version
+            const coords = polygonClipping.union(feature.geometry.coordinates, other.geometry.coordinates);
+            if (!coords || !coords.length) continue;  // something failed in polygon union
+
+            merged.push(feature);
+            for (const feat of merged) {    // all these merged features share...
+              feat.v = v;                           // save version, so they get redrawn
+              feat.geometry.coordinates = coords;   // same coords, so they get redrawn _properly_
+              feat.__featurehash__ = featurehash;   // same hash, so deduplication works
+            }
+          } else {
+            mergeCache[propertyhash] = [feature];
+          }
+        }
+      }
+    }
+
+    return features;
+  }
+
+}
diff --git a/modules/services/WikidataService.js b/modules/services/WikidataService.js
new file mode 100644
index 0000000000..d51b047ee2
--- /dev/null
+++ b/modules/services/WikidataService.js
@@ -0,0 +1,261 @@
+import { json as d3_json } from 'd3-fetch';
+import { utilQsString } from '@rapid-sdk/util';
+
+import { AbstractService } from './AbstractService';
+
+const WIKIDATA_API = 'https://www.wikidata.org/w/api.php?';
+
+
+/**
+ * `WikidataService`
+ */
+export class WikidataService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'wikidata';
+
+    this._cache = new Map();  // Map(qid -> entitydata)
+  }
+
+
+  /**
+   * reset
+   * Called after completing an edit session to reset any internal state
+   */
+  reset() {
+    this._cache.clear();
+  }
+
+
+  /**
+   * itemsForSearchQuery
+   * Search for Wikidata items matching the query
+   * @param  query
+   * @param  callback
+   */
+  itemsForSearchQuery(query, callback) {
+    if (!query) {
+      if (callback) callback('No query', {});
+      return;
+    }
+
+    const lang = this.languagesToQuery()[0];
+    const url = WIKIDATA_API + utilQsString({
+      action: 'wbsearchentities',
+      format: 'json',
+      formatversion: 2,
+      search: query,
+      type: 'item',
+      language: lang,   // the language to search
+      uselang: lang,    // the language for the label and description in the result
+      limit: 10,
+      origin: '*'
+    });
+
+    d3_json(url)
+      .then(result => {
+        if (result && result.error) {
+          throw new Error(result.error);
+        }
+        if (callback) callback(null, result.search || {});
+      })
+      .catch(err => {
+        if (callback) callback(err.message, {});
+      });
+  }
+
+
+  /**
+   * itemsByTitle
+   * Given a Wikipedia language and article title,
+   * retrieve an array of corresponding Wikidata entities.
+   * @param  lang
+   * @param  title
+   * @param  callback
+   */
+  itemsByTitle(lang, title, callback) {
+    if (!title) {
+      if (callback) callback('No title', {});
+      return;
+    }
+
+    lang = lang || 'en';
+    const url = WIKIDATA_API + utilQsString({
+      action: 'wbgetentities',
+      format: 'json',
+      formatversion: 2,
+      sites: lang.replace(/-/g, '_') + 'wiki',
+      titles: title,
+      languages: 'en', // shrink response by filtering to one language
+      origin: '*'
+    });
+
+    d3_json(url)
+      .then(result => {
+        if (result && result.error) {
+          throw new Error(result.error);
+        }
+        if (callback) callback(null, result.entities || {});
+      })
+      .catch(err => {
+        if (callback) callback(err.message, {});
+      });
+  }
+
+
+  /**
+   * languagesToQuery
+   */
+  languagesToQuery() {
+    const localeCodes = this.context.localizationSystem().localeCodes();
+    return localeCodes
+      .map(code => code.toLowerCase())
+      .filter(code => code !== 'en-us');
+
+    // HACK: `en-us` isn't a Wikidata language. We should really be filtering by
+    // the languages known to be supported by wikidata.
+  }
+
+
+  /**
+   * entityByQID
+   * @param  qid
+   * @param  callback
+   */
+  entityByQID(qid, callback) {
+    if (!qid) {
+      callback('No qid', {});
+      return;
+    }
+    if (this._cache.has(qid)) {
+      if (callback) callback(null, this._cache.get(qid));
+      return;
+    }
+
+    const langs = this.languagesToQuery();
+    const url = WIKIDATA_API + utilQsString({
+      action: 'wbgetentities',
+      format: 'json',
+      formatversion: 2,
+      ids: qid,
+      props: 'labels|descriptions|claims|sitelinks',
+      sitefilter: langs.map(code => `${code}wiki`).join('|'),
+      languages: langs.join('|'),
+      languagefallback: 1,
+      origin: '*'
+    });
+
+    d3_json(url)
+      .then(result => {
+        if (result && result.error) {
+          throw new Error(result.error);
+        }
+        this._cache.set(qid, result.entities[qid]);
+        if (callback) callback(null, result.entities[qid] || {});
+      })
+      .catch(err => {
+        if (callback) callback(err.message, {});
+      });
+  }
+
+
+  /**
+   * getDocs
+   * Pass `params` object of the form:
+   * {
+   *   qid: 'string'      // brand wikidata  (e.g. 'Q37158')
+   * }
+   *
+   * Get an result object used to display tag documentation
+   * {
+   *   title:        'string',
+   *   description:  'string',
+   *   editURL:      'string',
+   *   imageURL:     'string',
+   *   wiki:         { title: 'string', text: 'string', url: 'string' }
+   * }
+   *
+   * @param  params
+   * @param  callback
+   */
+  getDocs(params, callback) {
+    const langs = this.languagesToQuery();
+
+    this.entityByQID(params.qid, function(err, entity) {
+      if (err || !entity) {
+        callback(err || 'No entity');
+        return;
+      }
+
+      let description;
+      for (const code of langs) {
+        if (entity.descriptions[code] && entity.descriptions[code].language === code) {
+          description = entity.descriptions[code];
+          break;
+        }
+      }
+      if (!description && Object.values(entity.descriptions).length) {
+        description = Object.values(entity.descriptions)[0];
+      }
+
+      // prepare result
+      const result = {
+        title: entity.id,
+        description: description?.value ?? '',
+        descriptionLocaleCode: description?.language ?? '',
+        editURL: `https://www.wikidata.org/wiki/${entity.id}`
+      };
+
+      // add image
+      if (entity.claims) {
+        const imageroot = 'https://commons.wikimedia.org/w/index.php?';
+        for (const prop of ['P154', 'P18']) {  // logo image, image
+          const val = entity.claims[prop];
+          if (val && Object.keys(val).length) {
+            const image = val[Object.keys(val)[0]].mainsnak.datavalue.value;
+            if (image) {
+              result.imageURL = imageroot + utilQsString({
+                title: `Special:Redirect/file/${image}`,
+                width: 400
+              });
+              break;
+            }
+          }
+        }
+      }
+
+      // add wiki sitelink
+      if (entity.sitelinks) {
+        const languageCode = this.context.localizationSystem().languageCode();
+        const isEn = languageCode.toLowerCase() === 'en';
+
+        // must be one of these that we requested..
+        for (const code of langs) {    // check each, in order of preference
+          const w = `${code}wiki`;
+          if (entity.sitelinks[w]) {
+            const title = entity.sitelinks[w].title;
+            let tKey = 'inspector.wiki_reference';
+            if (!isEn && code === 'en') {             // user's locale isn't English but
+              tKey = 'inspector.wiki_en_reference';   // we are sending them to enwiki anyway..
+            }
+
+            result.wiki = {
+              title: title,
+              text: tKey,
+              url: `https://${code}.wikipedia.org/wiki/` + title.replace(/ /g, '_')
+            };
+            break;
+          }
+        }
+      }
+
+      callback(null, result);
+    });
+  }
+
+}
diff --git a/modules/services/WikipediaService.js b/modules/services/WikipediaService.js
new file mode 100644
index 0000000000..b645ce6fec
--- /dev/null
+++ b/modules/services/WikipediaService.js
@@ -0,0 +1,148 @@
+import { json as d3_json } from 'd3-fetch';
+import { utilQsString } from '@rapid-sdk/util';
+
+import { AbstractService } from './AbstractService';
+
+const WIKIPEDIA_API = 'https://en.wikipedia.org/w/api.php?';
+
+
+/**
+ * `WikipediaService`
+ */
+export class WikipediaService extends AbstractService {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context) {
+    super(context);
+    this.id = 'wikipedia';
+  }
+
+
+  /**
+   * search
+   * @param  lang
+   * @param  query
+   * @param  callback
+   */
+  search(lang, query, callback) {
+    if (!query) {
+      if (callback) callback('No Query', []);
+      return;
+    }
+
+    lang = lang || 'en';
+    const url = WIKIPEDIA_API.replace('en', lang) +
+      utilQsString({
+        action: 'query',
+        list: 'search',
+        srlimit: '10',
+        srinfo: 'suggestion',
+        format: 'json',
+        origin: '*',
+        srsearch: query
+      });
+
+    d3_json(url)
+      .then(result => {
+        if (result && result.error) {
+          throw new Error(result.error);
+        } else if (!result || !result.query || !result.query.search) {
+          throw new Error('No Results');
+        }
+        if (callback) {
+          const titles = result.query.search.map(d => d.title);
+          callback(null, titles);
+        }
+      })
+      .catch(err => {
+        if (callback) callback(err, []);
+      });
+  }
+
+
+  /**
+   * suggestions
+   * @param  lang
+   * @param  query
+   * @param  callback
+   */
+  suggestions(lang, query, callback) {
+    if (!query) {
+      if (callback) callback('', []);
+      return;
+    }
+
+    lang = lang || 'en';
+    const url = WIKIPEDIA_API.replace('en', lang) +
+      utilQsString({
+        action: 'opensearch',
+        namespace: 0,
+        suggest: '',
+        format: 'json',
+        origin: '*',
+        search: query
+      });
+
+    d3_json(url)
+      .then(result => {
+        if (result && result.error) {
+          throw new Error(result.error);
+        } else if (!result || result.length < 2) {
+          throw new Error('No Results');
+        }
+        if (callback) callback(null, result[1] || []);
+      })
+      .catch(err => {
+        if (callback) callback(err.message, []);
+      });
+  }
+
+
+  /**
+   * translations
+   * @param  lang
+   * @param  title
+   * @param  callback
+   */
+  translations(lang, title, callback) {
+    if (!title) {
+      if (callback) callback('No Title');
+      return;
+    }
+
+    lang = lang || 'en';
+    const url = WIKIPEDIA_API.replace('en', lang) +
+      utilQsString({
+        action: 'query',
+        prop: 'langlinks',
+        format: 'json',
+        origin: '*',
+        lllimit: 500,
+        titles: title
+      });
+
+    d3_json(url)
+      .then(result => {
+        if (result && result.error) {
+          throw new Error(result.error);
+        } else if (!result || !result.query || !result.query.pages) {
+          throw new Error('No Results');
+        }
+        if (callback) {
+          const list = result.query.pages[Object.keys(result.query.pages)[0]];
+          const translations = {};
+          if (list && list.langlinks) {
+            list.langlinks.forEach(function(d) { translations[d.lang] = d['*']; });
+          }
+          callback(null, translations);
+        }
+      })
+      .catch(err => {
+        if (callback) callback(err.message);
+      });
+  }
+
+}
diff --git a/modules/services/esri_data.js b/modules/services/esri_data.js
deleted file mode 100644
index 9d20e8f645..0000000000
--- a/modules/services/esri_data.js
+++ /dev/null
@@ -1,393 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { json as d3_json } from 'd3-fetch';
-import { select as d3_select } from 'd3-selection';
-import { Tiler } from '@rapid-sdk/math';
-import { utilQsString } from '@rapid-sdk/util';
-
-import { locationManager } from '../core/LocationManager';
-import { Graph, Tree } from '../core';
-import { osmNode, osmRelation, osmWay } from '../osm';
-import { utilRebind } from '../util';
-
-
-const GROUPID = 'bdf6c800b3ae453b9db239e03d7c1727';
-const APIROOT = 'https://openstreetmap.maps.arcgis.com/sharing/rest/content';
-const HOMEROOT = 'https://openstreetmap.maps.arcgis.com/home';
-const TILEZOOM = 14;
-const tiler = new Tiler().zoomRange(TILEZOOM);
-const dispatch = d3_dispatch('loadedData');
-
-let _datasets = {};
-let _gotDatasets = false;
-let _off;
-
-
-function abortRequest(controller) {
-  controller.abort();
-}
-
-
-// API
-//https://developers.arcgis.com/rest/users-groups-and-items/search.htm
-function searchURL(start) {
-  const params = {
-    f: 'json',
-    sortField: 'title',
-    sortOrder: 'asc',
-    num: 100,
-    start: start
-  };
-  return `${APIROOT}/groups/${GROUPID}/search?` + utilQsString(params);
-  // use to get
-  // .results[]
-  //   .extent
-  //   .id
-  //   .thumbnail
-  //   .title
-  //   .snippet
-  //   .url (featureServer)
-}
-
-function layerURL(featureServerURL) {
-  return `${featureServerURL}/layers?f=json`;
-  // should return single layer(?)
-  // .layers[0]
-  //   .copyrightText
-  //   .fields
-  //   .geometryType   "esriGeometryPoint" or "esriGeometryPolygon" ?
-}
-
-function itemURL(itemID) {
-  return `${HOMEROOT}/item.html?id=${itemID}`;
-}
-
-function tileURL(ds, extent, page) {
-  page = page || 0;
-  const layerID = ds.layer.id;
-  const maxRecordCount = ds.layer.maxRecordCount || 2000;
-  const resultOffset = maxRecordCount * page;
-  const params = {
-    f: 'geojson',
-    outfields: '*',
-    outSR: 4326,
-    geometryType: 'esriGeometryEnvelope',
-    geometry: extent.toParam(),
-    resultOffset: resultOffset,
-    resultRecordCount: maxRecordCount
-  };
-  return `${ds.url}/${layerID}/query?` + utilQsString(params);
-}
-
-
-// Add each dataset to _datasets, create internal state
-function parseDataset(ds) {
-  if (_datasets[ds.id]) return;  // unless we've seen it already
-
-  _datasets[ds.id] = ds;
-  ds.graph = new Graph();
-  ds.tree = new Tree(ds.graph);
-  ds.cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {} };
-
-  // cleanup the `licenseInfo` field by removing styles  (not used currently)
-  let license = d3_select(document.createElement('div'));
-  license.html(ds.licenseInfo);       // set innerHtml
-  license.selectAll('*')
-    .attr('style', null)
-    .attr('size', null);
-  ds.license_html = license.html();   // get innerHtml
-
-  // generate public link to this item
-  ds.itemURL = itemURL(ds.id);
-}
-
-
-function loadTilePage(ds, tile, page) {
-  const cache = ds.cache;
-  if (cache.loaded[tile.id]) return;
-
-  const controller = new AbortController();
-  const url = tileURL(ds, tile.wgs84Extent, page);
-
-  d3_json(url, { signal: controller.signal })
-    .then(geojson => {
-      if (!geojson) throw new Error('no geojson');
-
-      parseTile(ds, tile, geojson, (err, results) => {
-        if (err) throw new Error(err);
-        ds.graph.rebase(results, [ds.graph], true);
-        ds.tree.rebase(results, true);
-      });
-      return (geojson.properties && geojson.properties.exceededTransferLimit);
-    })
-    .then(morePages => {
-      if (morePages) {
-        loadTilePage(ds, tile, ++page);
-      } else {
-        cache.loaded[tile.id] = true;
-        dispatch.call('loadedData');
-        delete cache.inflight[tile.id];
-      }
-    })
-    .catch(e => {
-      if (e.name === 'AbortError') return;
-      console.error(e);  // eslint-disable-line
-    });
-
-  cache.inflight[tile.id] = controller;
-}
-
-
-function parseTile(dataset, tile, geojson, callback) {
-  if (!geojson) return callback({ message: 'No GeoJSON', status: -1 });
-
-  // expect a FeatureCollection with `features` array
-  let results = [];
-  (geojson.features || []).forEach(f => {
-    let entities = parseFeature(f, dataset);
-    if (entities) results.push.apply(results, entities);
-  });
-
-  callback(null, results);
-}
-
-
-function parseFeature(feature, dataset) {
-  const geom = feature.geometry;
-  const props = feature.properties;
-  if (!geom || !props) return null;
-
-  const featureID = props[dataset.layer.idfield] || props.OBJECTID || props.FID || props.id;
-  if (!featureID) return null;
-
-  // skip if we've seen this feature already on another tile
-  if (dataset.cache.seen[featureID]) return null;
-  dataset.cache.seen[featureID] = true;
-
-  const id = `${dataset.id}-${featureID}`;
-  const meta = { __fbid__: id, __origid__: id, __service__: 'esri', __datasetid__: dataset.id };
-  let entities = [];
-  let nodemap = new Map();
-
-  // Point:  make a single node
-  if (geom.type === 'Point') {
-    return [ new osmNode({ loc: geom.coordinates, tags: parseTags(props) }, meta) ];
-
-  // LineString:  make nodes, single way
-  } else if (geom.type === 'LineString') {
-    const nodelist = parseCoordinates(geom.coordinates);
-    if (nodelist.length < 2) return null;
-
-    const w = new osmWay({ nodes: nodelist, tags: parseTags(props) }, meta);
-    entities.push(w);
-    return entities;
-
-  // Polygon:  make nodes, way(s), possibly a relation
-  } else if (geom.type === 'Polygon') {
-    let ways = [];
-    geom.coordinates.forEach(ring => {
-      const nodelist = parseCoordinates(ring);
-      if (nodelist.length < 3) return null;
-
-      const first = nodelist[0];
-      const last = nodelist[nodelist.length - 1];
-      if (first !== last) nodelist.push(first);   // sanity check, ensure rings are closed
-
-      const w = new osmWay({ nodes: nodelist });
-      ways.push(w);
-    });
-
-    if (ways.length === 1) {  // single ring, assign tags and return
-      entities.push(
-        ways[0].update( Object.assign({ tags: parseTags(props) }, meta) )
-      );
-    } else {  // multiple rings, make a multipolygon relation with inner/outer members
-      const members = ways.map((w, i) => {
-        entities.push(w);
-        return { id: w.id, role: (i === 0 ? 'outer' : 'inner'), type: 'way' };
-      });
-      const tags = Object.assign(parseTags(props), { type: 'multipolygon' });
-      const r = new osmRelation({ members: members, tags: tags }, meta);
-      entities.push(r);
-    }
-
-    return entities;
-  }
-  // no Multitypes for now (maybe not needed)
-
-  function parseCoordinates(coords) {
-    let nodelist = [];
-    coords.forEach(coord => {
-      const key = coord.toString();
-      let n = nodemap.get(key);
-      if (!n) {
-        n = new osmNode({ loc: coord });
-        entities.push(n);
-        nodemap.set(key, n);
-      }
-      nodelist.push(n.id);
-    });
-    return nodelist;
-  }
-
-  function parseTags(props) {
-    let tags = {};
-    Object.keys(props).forEach(prop => {
-      const k = clean(dataset.layer.tagmap[prop]);
-      const v = clean(props[prop]);
-      if (k && v) {
-        tags[k] = v;
-      }
-    });
-
-    tags.source = `esri/${dataset.name}`;
-    return tags;
-  }
-
-  function clean(val) {
-    return val ? val.toString().trim() : null;
-  }
-}
-
-
-export default {
-
-  init: function () {
-    this.event = utilRebind(this, dispatch, 'on');
-  },
-
-
-  reset: function () {
-    Object.values(_datasets).forEach(ds => {
-      if (ds.cache.inflight) {
-        Object.values(ds.cache.inflight).forEach(abortRequest);
-      }
-      ds.graph = new Graph();
-      ds.tree = new Tree(ds.graph);
-      ds.cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {} };
-    });
-
-    return this;
-  },
-
-
-  graph: function (datasetID)  {
-    const ds = _datasets[datasetID];
-    return ds && ds.graph;
-  },
-
-
-  intersects: function (datasetID, extent) {
-    const ds = _datasets[datasetID];
-    if (!ds || !ds.tree || !ds.graph) return [];
-    return ds.tree.intersects(extent, ds.graph);
-  },
-
-
-  toggle: function (val) {
-    _off = !val;
-    return this;
-  },
-
-
-  loadTiles: function (datasetID, projection) {
-    if (_off) return;
-
-    // `loadDatasets` and `loadLayer` are asynchronous,
-    // so ensure both have completed before we start requesting tiles.
-    const ds = _datasets[datasetID];
-    if (!ds || !ds.layer) return;
-
-    const cache = ds.cache;
-    const tiles = tiler.getTiles(projection).tiles;
-
-    // abort inflight requests that are no longer needed
-    Object.keys(cache.inflight).forEach(k => {
-      const wanted = tiles.find(tile => tile.id === k);
-      if (!wanted) {
-        abortRequest(cache.inflight[k]);
-        delete cache.inflight[k];
-      }
-    });
-
-    tiles.forEach(tile => {
-      if (cache.loaded[tile.id] || cache.inflight[tile.id]) return;
-
-      // exit if this tile covers a blocked region (all corners are blocked)
-      const corners = tile.wgs84Extent.polygon().slice(0, 4);
-      const tileBlocked = corners.every(loc => locationManager.blocksAt(loc).length);
-      if (tileBlocked) {
-        cache.loaded[tile.id] = true;  // don't try again
-        return;
-      }
-
-      loadTilePage(ds, tile, 0);
-    });
-  },
-
-
-  loadDatasets: function () {
-    if (_gotDatasets) {
-      return Promise.resolve(_datasets);
-
-    } else {
-      return new Promise((resolve, reject) => {
-        let start = 1;
-        fetchMore(start);
-
-        function fetchMore(start) {
-          d3_json(searchURL(start))
-            .then(json => {
-              (json.results || []).forEach(ds => parseDataset(ds));
-
-              if (json.nextStart > 0) {
-                fetchMore(json.nextStart);   // fetch next page
-              } else {
-                _gotDatasets = true;   // no more pages
-                resolve(_datasets);
-              }
-            })
-            .catch(e => {
-              _gotDatasets = false;
-              reject(e);
-            });
-        }
-      });
-    }
-  },
-
-
-  loadLayer: function (datasetID) {
-    let ds = _datasets[datasetID];
-    if (!ds || !ds.url) {
-      return Promise.reject(`Unknown datasetID: ${datasetID}`);
-    } else if (ds.layer) {
-      return Promise.resolve(ds.layer);
-    }
-
-    return d3_json(layerURL(ds.url))
-      .then(json => {
-        if (!json.layers || !json.layers.length) {
-          throw new Error(`Missing layer info for datasetID: ${datasetID}`);
-        }
-
-        ds.layer = json.layers[0];  // should return a single layer
-
-        // Use the field metadata to map to OSM tags
-        let tagmap = {};
-        ds.layer.fields.forEach(f => {
-          if (f.type === 'esriFieldTypeOID') {  // this is an id field, remember it
-            ds.layer.idfield = f.name;
-          }
-          if (!f.editable) return;   // 1. keep "editable" fields only
-          tagmap[f.name] = f.alias;  // 2. field `name` -> OSM tag (stored in `alias`)
-        });
-        ds.layer.tagmap = tagmap;
-
-        return ds.layer;
-      })
-      .catch(e => {
-        if (e.name === 'AbortError') return;
-        console.error(e);  // eslint-disable-line
-      });
-  }
-};
diff --git a/modules/services/fb_ai_features.js b/modules/services/fb_ai_features.js
deleted file mode 100644
index 95244f957d..0000000000
--- a/modules/services/fb_ai_features.js
+++ /dev/null
@@ -1,351 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { xml as d3_xml } from 'd3-fetch';
-import { Tiler } from '@rapid-sdk/math';
-
-import { locationManager } from '../core/LocationManager';
-import { Graph, Tree } from '../core';
-import { osmEntity, osmNode, osmWay } from '../osm';
-import { utilRebind } from '../util';
-
-
-// constants
-var APIROOT = 'https://mapwith.ai/maps/ml_roads';
-var TILEZOOM = 16;
-var tiler = new Tiler().zoomRange(TILEZOOM);
-var dispatch = d3_dispatch('loadedData');
-
-var _datasets = {};
-var _deferredAiFeaturesParsing = new Set();
-var _off;
-
-
-function abortRequest(i) {
-    i.abort();
-}
-
-
-function tileURL(dataset, extent, taskExtent) {
-    // Conflated datasets have a different ID, so they get stored in their own graph/tree
-    var isConflated = /-conflated$/.test(dataset.id);
-    var datasetID = dataset.id.replace('-conflated', '');
-
-    var qs = {
-        conflate_with_osm: isConflated,
-        theme: 'ml_road_vector',
-        collaborator: 'fbid',
-        token: 'ASZUVdYpCkd3M6ZrzjXdQzHulqRMnxdlkeBJWEKOeTUoY_Gwm9fuEd2YObLrClgDB_xfavizBsh0oDfTWTF7Zb4C',
-        hash: 'ASYM8LPNy8k1XoJiI7A'
-    };
-
-    if (datasetID === 'fbRoads') {
-        qs.result_type = 'road_vector_xml';
-
-    } else if (datasetID === 'msBuildings') {
-        qs.result_type = 'road_building_vector_xml';
-        qs.building_source = 'microsoft';
-
-    } else {
-        qs.result_type = 'osm_xml';
-        qs.sources = `esri_building.${datasetID}`;
-    }
-
-    qs.bbox = extent.toParam();
-
-    if (taskExtent) qs.crop_bbox = taskExtent.toParam();
-
-    var url = APIROOT + '?' + fbmlQsString(qs, true);  // true = noencode
-    return url;
-
-
-    // This utilQsString does not sort the keys, because the fbml service needs them to be ordered a certain way.
-    function fbmlQsString(obj, noencode) {
-        // encode everything except special characters used in certain hash parameters:
-        // "/" in map states, ":", ",", {" and "}" in background
-        function softEncode(s) {
-            return encodeURIComponent(s).replace(/(%2F|%3A|%2C|%7B|%7D)/g, decodeURIComponent);
-        }
-
-        return Object.keys(obj).map(function(key) {  // NO SORT
-            return encodeURIComponent(key) + '=' + (
-                noencode ? softEncode(obj[key]) : encodeURIComponent(obj[key]));
-        }).join('&');
-    }
-
-}
-
-
-function getLoc(attrs) {
-    var lon = attrs.lon && attrs.lon.value;
-    var lat = attrs.lat && attrs.lat.value;
-    return [parseFloat(lon), parseFloat(lat)];
-}
-
-
-function getNodes(obj) {
-    var elems = obj.getElementsByTagName('nd');
-    var nodes = new Array(elems.length);
-    for (var i = 0, l = elems.length; i < l; i++) {
-        nodes[i] = 'n' + elems[i].attributes.ref.value;
-    }
-    return nodes;
-}
-
-
-function getTags(obj) {
-    var elems = obj.getElementsByTagName('tag');
-    var tags = {};
-    for (var i = 0, l = elems.length; i < l; i++) {
-        var attrs = elems[i].attributes;
-        var k = (attrs.k.value || '').trim();
-        var v = (attrs.v.value || '').trim();
-        if (k && v) {
-            tags[k] = v;
-        }
-    }
-
-    return tags;
-}
-
-
-function getVisible(attrs) {
-    return (!attrs.visible || attrs.visible.value !== 'false');
-}
-
-
-var parsers = {
-    node: function nodeData(obj, uid) {
-        var attrs = obj.attributes;
-        return new osmNode({
-            id: uid,
-            visible: getVisible(attrs),
-            loc: getLoc(attrs),
-            tags: getTags(obj)
-        });
-    },
-
-    way: function wayData(obj, uid) {
-        var attrs = obj.attributes;
-        return new osmWay({
-            id: uid,
-            visible: getVisible(attrs),
-            tags: getTags(obj),
-            nodes: getNodes(obj),
-        });
-    }
-};
-
-
-function parseXML(dataset, xml, tile, callback, options) {
-    options = Object.assign({ skipSeen: true }, options);
-    if (!xml || !xml.childNodes) {
-        return callback({ message: 'No XML', status: -1 });
-    }
-
-    var graph = dataset.graph;
-    var cache = dataset.cache;
-
-    var root = xml.childNodes[0];
-    var children = root.childNodes;
-    var handle = window.requestIdleCallback(function() {
-        _deferredAiFeaturesParsing.delete(handle);
-        var results = [];
-        for (var i = 0; i < children.length; i++) {
-            var result = parseChild(children[i]);
-            if (result) results.push(result);
-        }
-        callback(null, results);
-    });
-    _deferredAiFeaturesParsing.add(handle);
-
-
-    function parseChild(child) {
-        var parser = parsers[child.nodeName];
-        if (!parser) return null;
-
-        var uid = osmEntity.id.fromOSM(child.nodeName, child.attributes.id.value);
-        if (options.skipSeen) {
-            if (cache.seen[uid]) return null;  // avoid reparsing a "seen" entity
-            if (cache.origIdTile[uid]) return null;  // avoid double-parsing a split way
-            cache.seen[uid] = true;
-        }
-
-        // Handle non-deterministic way splitting from Roads Service. Splits
-        // are consistent within a single request.
-        var origUid;
-        if (child.attributes.orig_id) {
-            origUid = osmEntity.id.fromOSM(child.nodeName, child.attributes.orig_id.value);
-            // skip if seen already
-            if (graph.hasEntity(origUid) ||
-                (cache.origIdTile[origUid] && cache.origIdTile[origUid] !== tile.id)) {
-                return null;
-            }
-            cache.origIdTile[origUid] = tile.id;
-        }
-
-        var entity = parser(child, uid);
-
-        // Ignore duplicate buildings in the MS Buildings dataset.
-        // They will appear with unique entity id, but with the same nodelist.
-        // See https://github.com/facebook/Rapid/issues/873
-        if (/^msBuildings/.test(dataset.id) && entity.type === 'way') {
-            const firstNodeID = entity.nodes[0];
-            if (cache.firstNodeIDs.has(firstNodeID)) return null;
-            cache.firstNodeIDs.add(firstNodeID);
-        }
-
-        var meta = {
-            __fbid__: child.attributes.id.value,
-            __origid__: origUid,
-            __service__: 'fbml',
-            __datasetid__: dataset.id
-        };
-        return Object.assign(entity, meta);
-    }
-}
-
-
-export default {
-
-    init: function() {
-        this.event = utilRebind(this, dispatch, 'on');
-
-        // allocate a special dataset for the rapid intro graph.
-        var datasetID = 'rapid_intro_graph';
-        var graph = new Graph();
-        var tree = new Tree(graph);
-        var cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {}, firstNodeIDs: new Set() };
-        var ds = { id: datasetID, graph: graph, tree: tree, cache: cache };
-        _datasets[datasetID] = ds;
-    },
-
-    reset: function() {
-        Array.from(_deferredAiFeaturesParsing).forEach(function(handle) {
-            window.cancelIdleCallback(handle);
-            _deferredAiFeaturesParsing.delete(handle);
-        });
-
-        Object.values(_datasets).forEach(function(ds) {
-            if (ds.cache.inflight) {
-                Object.values(ds.cache.inflight).forEach(abortRequest);
-            }
-            ds.graph = new Graph();
-            ds.tree = new Tree(ds.graph);
-            ds.cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {}, firstNodeIDs: new Set() };
-        });
-
-        return this;
-    },
-
-
-    graph: function (datasetID) {
-        var ds = _datasets[datasetID];
-        return ds && ds.graph;
-    },
-
-
-    intersects: function (datasetID, extent) {
-        var ds = _datasets[datasetID];
-        if (!ds || !ds.tree || !ds.graph) return [];
-        return ds.tree.intersects(extent, ds.graph);
-    },
-
-
-    merge: function(datasetID, entities) {
-        var ds = _datasets[datasetID];
-        if (!ds || !ds.tree || !ds.graph) return;
-        ds.graph.rebase(entities, [ds.graph], false);
-        ds.tree.rebase(entities, false);
-    },
-
-
-    cache: function (datasetID, obj) {
-        var ds = _datasets[datasetID];
-        if (!ds || !ds.cache) return;
-
-        function cloneDeep(source) {
-            return JSON.parse(JSON.stringify(source));
-        }
-
-        if (!arguments.length) {
-            return {
-                tile: cloneDeep(ds.cache)
-            };
-        }
-
-        // access cache directly for testing
-        if (obj === 'get') {
-            return ds.cache;
-        }
-
-        ds.cache = obj;
-    },
-
-
-    toggle: function(val) {
-        _off = !val;
-        return this;
-    },
-
-
-    loadTiles: function(datasetID, projection, taskExtent) {
-        if (_off) return;
-
-        var ds = _datasets[datasetID];
-        var graph, tree, cache;
-        if (ds) {
-            graph = ds.graph;
-            tree = ds.tree;
-            cache = ds.cache;
-        } else {
-            // as tile requests arrive, setup the resources needed to hold the results
-            graph = new Graph();
-            tree = new Tree(graph);
-            cache = { inflight: {}, loaded: {}, seen: {}, origIdTile: {}, firstNodeIDs: new Set() };
-            ds = { id: datasetID, graph: graph, tree: tree, cache: cache };
-            _datasets[datasetID] = ds;
-        }
-
-        var tiles = tiler.getTiles(projection).tiles;
-
-        // abort inflight requests that are no longer needed
-        Object.keys(cache.inflight).forEach(k => {
-            var wanted = tiles.find(function(tile) { return k === tile.id; });
-            if (!wanted) {
-                abortRequest(cache.inflight[k]);
-                delete cache.inflight[k];
-            }
-        });
-
-        tiles.forEach(function(tile) {
-            if (cache.loaded[tile.id] || cache.inflight[tile.id]) return;
-
-            // exit if this tile covers a blocked region (all corners are blocked)
-            const corners = tile.wgs84Extent.polygon().slice(0, 4);
-            const tileBlocked = corners.every(loc => locationManager.blocksAt(loc).length);
-            if (tileBlocked) {
-                cache.loaded[tile.id] = true;  // don't try again
-                return;
-            }
-
-            var controller = new AbortController();
-            d3_xml(tileURL(ds, tile.wgs84Extent, taskExtent), { signal: controller.signal })
-                .then(function (dom) {
-                    delete cache.inflight[tile.id];
-                    if (!dom) return;
-                    parseXML(ds, dom, tile, function(err, results) {
-                        if (err) return;
-                        graph.rebase(results, [graph], true);
-                        tree.rebase(results, true);
-                        cache.loaded[tile.id] = true;
-                        dispatch.call('loadedData');
-                    });
-                })
-                .catch(e => {
-                  if (e.name === 'AbortError') return;
-                  console.error(e);  // eslint-disable-line
-                });
-
-            cache.inflight[tile.id] = controller;
-        });
-    }
-};
diff --git a/modules/services/index.js b/modules/services/index.js
index cf21dccde1..8dd53b80d5 100644
--- a/modules/services/index.js
+++ b/modules/services/index.js
@@ -1,58 +1,60 @@
-import serviceEsriData from './esri_data';
-import serviceFbAIFeatures from './fb_ai_features';
-import serviceKeepRight from './keepRight';
-import serviceImproveOSM from './improveOSM';
-import serviceOsmose from './osmose';
-import serviceMapillary from './mapillary';
-import serviceMapRules from './maprules';
-import serviceNominatim from './nominatim';
-import serviceNsi from './nsi';
-import serviceKartaview from './kartaview';
-import serviceOsm from './osm';
-import serviceOsmWikibase from './osm_wikibase';
-import serviceStreetside from './streetside';
-import serviceTaginfo from './taginfo';
-import serviceVectorTile from './vector_tile';
-import serviceWikidata from './wikidata';
-import serviceWikipedia from './wikipedia';
+import { AbstractService } from './AbstractService';
+import { EsriService } from './EsriService';
+import { ImproveOsmService } from './ImproveOsmService';
+import { KartaviewService } from './KartaviewService';
+import { KeepRightService } from './KeepRightService';
+import { MapillaryService } from './MapillaryService';
+import { MapWithAIService } from './MapWithAIService';
+import { NominatimService } from './NominatimService';
+import { NsiService } from './NsiService';
+import { OsmService } from './OsmService';
+import { OsmoseService } from './OsmoseService';
+import { OsmWikibaseService } from './OsmWikibaseService';
+import { StreetsideService } from './StreetsideService';
+import { TaginfoService } from './TaginfoService';
+import { VectorTileService } from './VectorTileService';
+import { WikidataService } from './WikidataService';
+import { WikipediaService } from './WikipediaService';
 
-
-export let services = {
-  esriData: serviceEsriData,
-  fbMLRoads: serviceFbAIFeatures,
-  geocoder: serviceNominatim,
-  keepRight: serviceKeepRight,
-  improveOSM: serviceImproveOSM,
-  osmose: serviceOsmose,
-  mapillary: serviceMapillary,
-  nsi: serviceNsi,
-  kartaview: serviceKartaview,
-  osm: serviceOsm,
-  osmWikibase: serviceOsmWikibase,
-  maprules: serviceMapRules,
-  streetside: serviceStreetside,
-  taginfo: serviceTaginfo,
-  vectorTile: serviceVectorTile,
-  wikidata: serviceWikidata,
-  wikipedia: serviceWikipedia,
+export {
+  AbstractService,
+  EsriService,
+  ImproveOsmService,
+  KartaviewService,
+  KeepRightService,
+  MapillaryService,
+  MapWithAIService,
+  NominatimService,
+  NsiService,
+  OsmService,
+  OsmoseService,
+  OsmWikibaseService,
+  StreetsideService,
+  TaginfoService,
+  VectorTileService,
+  WikidataService,
+  WikipediaService
 };
 
-export {
-  serviceEsriData,
-  serviceFbAIFeatures,
-  serviceKeepRight,
-  serviceImproveOSM,
-  serviceOsmose,
-  serviceMapillary,
-  serviceMapRules,
-  serviceNominatim,
-  serviceNsi,
-  serviceKartaview,
-  serviceOsm,
-  serviceOsmWikibase,
-  serviceStreetside,
-  serviceTaginfo,
-  serviceVectorTile,
-  serviceWikidata,
-  serviceWikipedia,
+// At init time, we will instantiate any that are in the 'available' collection.
+export const services = {
+  available:    new Map(),   // Map (id -> Service constructor)
+  instantiated: new Map()    // Map (id -> Service instance)
 };
+
+services.available.set('esri', EsriService);
+services.available.set('improveOSM', ImproveOsmService);
+services.available.set('kartaview', KartaviewService);
+services.available.set('keepRight', KeepRightService);
+services.available.set('mapillary', MapillaryService);
+services.available.set('mapwithai', MapWithAIService);
+services.available.set('nominatim', NominatimService);
+services.available.set('nsi', NsiService);
+services.available.set('osm', OsmService);
+services.available.set('osmose', OsmoseService);
+services.available.set('osmwikibase', OsmWikibaseService);
+services.available.set('streetside', StreetsideService);
+services.available.set('taginfo', TaginfoService);
+services.available.set('vectortile', VectorTileService);
+services.available.set('wikidata', WikidataService);
+services.available.set('wikipedia', WikipediaService);
diff --git a/modules/services/keepRight.js b/modules/services/keepRight.js
deleted file mode 100644
index 45db0314ea..0000000000
--- a/modules/services/keepRight.js
+++ /dev/null
@@ -1,527 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { json as d3_json } from 'd3-fetch';
-import { Extent, Tiler, vecAdd} from '@rapid-sdk/math';
-import { utilQsString } from '@rapid-sdk/util';
-import RBush from 'rbush';
-
-import { fileFetcher } from '../core/file_fetcher';
-import { QAItem } from '../osm';
-import { t } from '../core/localizer';
-import { utilRebind } from '../util';
-
-
-const TILEZOOM = 14;
-const tiler = new Tiler().zoomRange(TILEZOOM);
-const dispatch = d3_dispatch('loaded');
-const _krUrlRoot = 'https://www.keepright.at';
-let _krData = { errorTypes: {}, localizeStrings: {} };
-
-// This gets reassigned if reset
-let _cache;
-
-const KR_RULES = [
-  // no 20 - multiple node on same spot - these are mostly boundaries overlapping roads
-  30, 40, 50, 60, 70, 90, 100, 110, 120, 130, 150, 160, 170, 180,
-  190, 191, 192, 193, 194, 195, 196, 197, 198,
-  200, 201, 202, 203, 204, 205, 206, 207, 208, 210, 220,
-  230, 231, 232, 270, 280, 281, 282, 283, 284, 285,
-  290, 291, 292, 293, 294, 295, 296, 297, 298, 300, 310, 311, 312, 313,
-  320, 350, 360, 370, 380, 390, 400, 401, 402, 410, 411, 412, 413
-];
-
-// A mapping of KeepRight rule numbers to their respective colors.
-const KR_COLORS = new Map();
-['20', '40', '210', '270', '310', '320', '350'].forEach(key => KR_COLORS.set(key, 0xffff99));
-['60', '70', '90', '100', '110', '150', '220', '380'].forEach(key => KR_COLORS.set(key, 0x55dd00));
-['360', '370', '410'].forEach(key => KR_COLORS.set(key, 0xff99bb));
-KR_COLORS.set('50',  0xffff99);
-KR_COLORS.set('120', 0xcc3355);
-KR_COLORS.set('130', 0xffaa33);
-KR_COLORS.set('160', 0xbb6600);
-KR_COLORS.set('170', 0xffff00);
-KR_COLORS.set('180', 0xaaccee);
-KR_COLORS.set('190', 0xff3333);
-KR_COLORS.set('200', 0xfdbf6f);
-KR_COLORS.set('230', 0xbb6600);
-KR_COLORS.set('280', 0x5f47a0);
-KR_COLORS.set('290', 0xaaccee);
-KR_COLORS.set('300', 0x009900);
-KR_COLORS.set('390', 0x009900);
-KR_COLORS.set('400', 0xcc3355);
-
-
-function abortRequest(controller) {
-  if (controller) {
-    controller.abort();
-  }
-}
-
-function abortUnwantedRequests(cache, tiles) {
-  Object.keys(cache.inflightTile).forEach(k => {
-    const wanted = tiles.find(tile => k === tile.id);
-    if (!wanted) {
-      abortRequest(cache.inflightTile[k]);
-      delete cache.inflightTile[k];
-    }
-  });
-}
-
-
-function encodeIssueRtree(d) {
-  return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d };
-}
-
-
-// Replace or remove QAItem from rtree
-function updateRtree(item, replace) {
-  _cache.rtree.remove(item, (a, b) => a.data.id === b.data.id);
-
-  if (replace) {
-    _cache.rtree.insert(item);
-  }
-}
-
-
-function tokenReplacements(d) {
-  if (!(d instanceof QAItem)) return;
-
-  const htmlRegex = new RegExp(/<\/[a-z][\s\S]*>/);
-  const replacements = {};
-
-  const issueTemplate = _krData.errorTypes[d.whichType];
-  if (!issueTemplate) {
-    /* eslint-disable no-console */
-    console.log('No Template: ', d.whichType);
-    console.log('  ', d.description);
-    /* eslint-enable no-console */
-    return;
-  }
-
-  // some descriptions are just fixed text
-  if (!issueTemplate.regex) return;
-
-  // regex pattern should match description with variable details captured
-  const errorRegex = new RegExp(issueTemplate.regex, 'i');
-  const errorMatch = errorRegex.exec(d.description);
-  if (!errorMatch) {
-    /* eslint-disable no-console */
-    console.log('Unmatched: ', d.whichType);
-    console.log('  ', d.description);
-    console.log('  ', errorRegex);
-    /* eslint-enable no-console */
-    return;
-  }
-
-  for (let i = 1; i < errorMatch.length; i++) {   // skip first
-    let capture = errorMatch[i];
-    let idType;
-
-    idType = 'IDs' in issueTemplate ? issueTemplate.IDs[i-1] : '';
-    if (idType && capture) {   // link IDs if present in the capture
-      capture = parseError(capture, idType);
-    } else if (htmlRegex.test(capture)) {   // escape any html in non-IDs
-      capture = '\\' +  capture + '\\';
-    } else {
-      const compare = capture.toLowerCase();
-      if (_krData.localizeStrings[compare]) {   // some replacement strings can be localized
-        capture = t('QA.keepRight.error_parts.' + _krData.localizeStrings[compare]);
-      }
-    }
-
-    replacements['var' + i] = capture;
-  }
-
-  return replacements;
-}
-
-
-function parseError(capture, idType) {
-  const compare = capture.toLowerCase();
-  if (_krData.localizeStrings[compare]) {   // some replacement strings can be localized
-    capture = t('QA.keepRight.error_parts.' + _krData.localizeStrings[compare]);
-  }
-
-  switch (idType) {
-    // link a string like "this node"
-    case 'this':
-      capture = linkErrorObject(capture);
-      break;
-
-    case 'url':
-      capture = linkURL(capture);
-      break;
-
-    // link an entity ID
-    case 'n':
-    case 'w':
-    case 'r':
-      capture = linkEntity(idType + capture);
-      break;
-
-    // some errors have more complex ID lists/variance
-    case '20':
-      capture = parse20(capture);
-      break;
-    case '211':
-      capture = parse211(capture);
-      break;
-    case '231':
-      capture = parse231(capture);
-      break;
-    case '294':
-      capture = parse294(capture);
-      break;
-    case '370':
-      capture = parse370(capture);
-      break;
-  }
-
-  return capture;
-
-
-  function linkErrorObject(d) {
-    return `<a class="error_object_link">${d}</a>`;
-  }
-
-  function linkEntity(d) {
-    return `<a class="error_entity_link">${d}</a>`;
-  }
-
-  function linkURL(d) {
-    return `<a class="kr_external_link" target="_blank" href="${d}">${d}</a>`;
-  }
-
-  // arbitrary node list of form: #ID, #ID, #ID...
-  function parse211(capture) {
-    let newList = [];
-    const items = capture.split(', ');
-
-    items.forEach(item => {
-      // ID has # at the front
-      let id = linkEntity('n' + item.slice(1));
-      newList.push(id);
-    });
-
-    return newList.join(', ');
-  }
-
-  // arbitrary way list of form: #ID(layer),#ID(layer),#ID(layer)...
-  function parse231(capture) {
-    let newList = [];
-    // unfortunately 'layer' can itself contain commas, so we split on '),'
-    const items = capture.split('),');
-
-    items.forEach(item => {
-      const match = item.match(/\#(\d+)\((.+)\)?/);
-      if (match !== null && match.length > 2) {
-        newList.push(linkEntity('w' + match[1]) + ' ' +
-          t('QA.keepRight.errorTypes.231.layer', { layer: match[2] })
-        );
-      }
-    });
-
-    return newList.join(', ');
-  }
-
-  // arbitrary node/relation list of form: from node #ID,to relation #ID,to node #ID...
-  function parse294(capture) {
-    let newList = [];
-    const items = capture.split(',');
-
-    items.forEach(item => {
-      // item of form "from/to node/relation #ID"
-      item = item.split(' ');
-
-      // to/from role is more clear in quotes
-      const role = `"${item[0]}"`;
-
-      // first letter of node/relation provides the type
-      const idType = item[1].slice(0,1);
-
-      // ID has # at the front
-      let id = item[2].slice(1);
-      id = linkEntity(idType + id);
-
-      newList.push(`${role} ${item[1]} ${id}`);
-    });
-
-    return newList.join(', ');
-  }
-
-  // may or may not include the string "(including the name 'name')"
-  function parse370(capture) {
-    if (!capture) return '';
-
-    const match = capture.match(/\(including the name (\'.+\')\)/);
-    if (match && match.length) {
-      return t('QA.keepRight.errorTypes.370.including_the_name', { name: match[1] });
-    }
-    return '';
-  }
-
-  // arbitrary node list of form: #ID,#ID,#ID...
-  function parse20(capture) {
-    let newList = [];
-    const items = capture.split(',');
-
-    items.forEach(item => {
-      // ID has # at the front
-      const id = linkEntity('n' + item.slice(1));
-      newList.push(id);
-    });
-
-    return newList.join(', ');
-  }
-}
-
-
-export default {
-  title: 'keepRight',
-
-  init() {
-    fileFetcher.get('keepRight')
-      .then(d => _krData = d);
-
-    if (!_cache) {
-      this.reset();
-    }
-
-    this.event = utilRebind(this, dispatch, 'on');
-  },
-
-  reset() {
-    if (_cache) {
-      Object.values(_cache.inflightTile).forEach(abortRequest);
-    }
-
-    _cache = {
-      data: {},
-      loadedTile: {},
-      inflightTile: {},
-      inflightPost: {},
-      closed: {},
-      rtree: new RBush()
-    };
-  },
-
-
-  // KeepRight API:  http://osm.mueschelsoft.de/keepright/interfacing.php
-  loadIssues(projection) {
-    const options = {
-      format: 'geojson',
-      ch: KR_RULES
-    };
-
-    // determine the needed tiles to cover the view
-    const tiles = tiler.getTiles(projection).tiles;
-
-    // abort inflight requests that are no longer needed
-    abortUnwantedRequests(_cache, tiles);
-
-    // issue new requests..
-    tiles.forEach(tile => {
-      if (_cache.loadedTile[tile.id] || _cache.inflightTile[tile.id]) return;
-
-      const [ left, top, right, bottom ] = tile.wgs84Extent.rectangle();
-      const params = Object.assign({}, options, { left, bottom, right, top });
-      const url = `${_krUrlRoot}/export.php?` + utilQsString(params);
-      const controller = new AbortController();
-
-      _cache.inflightTile[tile.id] = controller;
-
-      d3_json(url, { signal: controller.signal })
-        .then(data => {
-          delete _cache.inflightTile[tile.id];
-          _cache.loadedTile[tile.id] = true;
-          if (!data || !data.features || !data.features.length) {
-            throw new Error('No Data');
-          }
-
-          data.features.forEach(feature => {
-            const {
-              properties: {
-                error_type: itemType,
-                error_id: id,
-                comment = null,
-                object_id: objectId,
-                object_type: objectType,
-                schema,
-                title
-              }
-            } = feature;
-            let {
-              geometry: { coordinates: loc },
-              properties: { description = '' }
-            } = feature;
-
-            // if there is a parent, save its error type e.g.:
-            //  Error 191 = "highway-highway"
-            //  Error 190 = "intersections without junctions"  (parent)
-            const issueTemplate = _krData.errorTypes[itemType];
-            const parentIssueType = (Math.floor(itemType / 10) * 10).toString();
-
-            // try to handle error type directly, fallback to parent error type.
-            const whichType = issueTemplate ? itemType : parentIssueType;
-            const whichTemplate = _krData.errorTypes[whichType];
-
-            // Rewrite a few of the errors at this point..
-            // This is done to make them easier to linkify and translate.
-            switch (whichType) {
-              case '170':
-                description = `This feature has a FIXME tag: ${description}`;
-                break;
-              case '292':
-              case '293':
-                description = description.replace('A turn-', 'This turn-');
-                break;
-              case '294':
-              case '295':
-              case '296':
-              case '297':
-              case '298':
-                description = `This turn-restriction~${description}`;
-                break;
-              case '300':
-                description = 'This highway is missing a maxspeed tag';
-                break;
-              case '411':
-              case '412':
-              case '413':
-                description = `This feature~${description}`;
-                break;
-            }
-
-            // move markers slightly so it doesn't obscure the geometry,
-            // then move markers away from other coincident markers
-            let coincident = false;
-            do {
-              // first time, move marker up. after that, move marker right.
-              let delta = coincident ? [0.00001, 0] : [0, 0.00001];
-              loc = vecAdd(loc, delta);
-              let bbox = new Extent(loc).bbox();
-              coincident = _cache.rtree.search(bbox).length;
-            } while (coincident);
-
-            let d = new QAItem(loc, this, itemType, id, {
-              comment,
-              description,
-              whichType,
-              parentIssueType,
-              severity: whichTemplate.severity || 'error',
-              objectId,
-              objectType,
-              schema,
-              title
-            });
-
-            d.replacements = tokenReplacements(d);
-
-            _cache.data[id] = d;
-            _cache.rtree.insert(encodeIssueRtree(d));
-          });
-
-          dispatch.call('loaded');
-        })
-        .catch(() => {
-          delete _cache.inflightTile[tile.id];
-          _cache.loadedTile[tile.id] = true;
-        });
-
-    });
-  },
-
-
-  postUpdate(d, callback) {
-    if (_cache.inflightPost[d.id]) {
-      return callback({ message: 'Error update already inflight', status: -2 }, d);
-    }
-
-    const params = { schema: d.schema, id: d.id };
-
-    if (d.newStatus) {
-      params.st = d.newStatus;
-    }
-    if (d.newComment !== undefined) {
-      params.co = d.newComment;
-    }
-
-    // NOTE: This throws a CORS err, but it seems successful.
-    // We don't care too much about the response, so this is fine.
-    const url = `${_krUrlRoot}/comment.php?` + utilQsString(params);
-    const controller = new AbortController();
-
-    _cache.inflightPost[d.id] = controller;
-
-    // Since this is expected to throw an error just continue as if it worked
-    // (worst case scenario the request truly fails and issue will show up if Rapid restarts)
-    d3_json(url, { signal: controller.signal })
-      .finally(() => {
-        delete _cache.inflightPost[d.id];
-
-        if (d.newStatus === 'ignore') {
-          // ignore permanently (false positive)
-          this.removeItem(d);
-        } else if (d.newStatus === 'ignore_t') {
-          // ignore temporarily (error fixed)
-          this.removeItem(d);
-          _cache.closed[`${d.schema}:${d.id}`] = true;
-        } else {
-          d = this.replaceItem(d.update({
-            comment: d.newComment,
-            newComment: undefined,
-            newState: undefined
-          }));
-        }
-
-        if (callback) callback(null, d);
-      });
-  },
-
-  // Get all cached QAItems covering the viewport
-  getItems(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
-
-    return _cache.rtree.search(bbox).map(d => d.data);
-  },
-
-  // Get a QAItem from cache
-  getError(id) {
-    return _cache.data[id];
-  },
-
-  // Get the color associated with this rule id
-  getColor(parentIssueType) {
-    return KR_COLORS.get(parentIssueType) ?? 0xffffff;
-  },
-
-  // Replace a single QAItem in the cache
-  replaceItem(item) {
-    if (!(item instanceof QAItem) || !item.id) return;
-
-    _cache.data[item.id] = item;
-    updateRtree(encodeIssueRtree(item), true); // true = replace
-    return item;
-  },
-
-  // Remove a single QAItem from the cache
-  removeItem(item) {
-    if (!(item instanceof QAItem) || !item.id) return;
-
-    delete _cache.data[item.id];
-    updateRtree(encodeIssueRtree(item), false); // false = remove
-  },
-
-  issueURL(item) {
-    return `${_krUrlRoot}/report_map.php?schema=${item.schema}&error=${item.id}`;
-  },
-
-  // Get an array of issues closed during this session.
-  // Used to populate `closed:keepright` changeset tag
-  getClosedIDs() {
-    return Object.keys(_cache.closed).sort();
-  }
-
-};
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
deleted file mode 100644
index 4abc162b87..0000000000
--- a/modules/services/mapillary.js
+++ /dev/null
@@ -1,695 +0,0 @@
-/* global mapillary:false */
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { select as d3_select } from 'd3-selection';
-import { Extent, Tiler } from '@rapid-sdk/math';
-import { VectorTile } from '@mapbox/vector-tile';
-import Protobuf from 'pbf';
-import RBush from 'rbush';
-
-import { utilRebind } from '../util';
-
-const accessToken = 'MLY|3376030635833192|f13ab0bdf6b2f7b99e0d8bd5868e1d88';
-const apiUrl = 'https://graph.mapillary.com/';
-const baseTileUrl = 'https://tiles.mapillary.com/maps/vtp';
-const mapFeatureTileUrl = `${baseTileUrl}/mly_map_feature_point/2/{z}/{x}/{y}?access_token=${accessToken}`;
-const tileUrl = `${baseTileUrl}/mly1_public/2/{z}/{x}/{y}?access_token=${accessToken}`;
-const trafficSignTileUrl = `${baseTileUrl}/mly_map_feature_traffic_sign/2/{z}/{x}/{y}?access_token=${accessToken}`;
-
-const viewercss = 'mapillary-js/mapillary.css';
-const viewerjs = 'mapillary-js/mapillary.js';
-const minZoom = 14;
-const dispatch = d3_dispatch('change', 'loadedImages', 'loadedSigns', 'loadedMapFeatures', 'bearingChanged', 'imageChanged');
-const tiler = new Tiler().skipNullIsland(true);
-
-let _loadViewerPromise;
-let _mlyActiveImage;
-let _mlyCache;
-let _mlyFallback = false;
-let _mlyHighlightedDetection;
-let _mlyShowFeatureDetections = false;
-let _mlyShowSignDetections = false;
-let _mlyViewer;
-let _mlyViewerFilter = ['all'];
-
-
-// Load all data for the specified type from Mapillary vector tiles
-function loadTiles(which, url, maxZoom, projection) {
-  // determine the needed tiles to cover the view
-  const tiles = tiler.zoomRange(minZoom, maxZoom).getTiles(projection).tiles;
-  tiles.forEach(tile => loadTile(which, url, tile));
-}
-
-
-// Load all data for the specified type from one vector tile
-function loadTile(which, url, tile) {
-  const cache = _mlyCache.requests;
-  const tileID = `${tile.id}-${which}`;
-  if (cache.loaded[tileID] || cache.inflight[tileID]) return;
-
-  const controller = new AbortController();
-  cache.inflight[tileID] = controller;
-  const requestUrl = url
-    .replace('{x}', tile.xyz[0])
-    .replace('{y}', tile.xyz[1])
-    .replace('{z}', tile.xyz[2]);
-
-  fetch(requestUrl, { signal: controller.signal })
-    .then(response => {
-      if (!response.ok) {
-        throw new Error(response.status + ' ' + response.statusText);
-      }
-      cache.loaded[tileID] = true;
-      return response.arrayBuffer();
-    })
-    .then(data => {
-      if (!data) {
-        throw new Error('No Data');
-      }
-
-      loadTileDataToCache(data, tile);
-
-      if (which === 'images') {
-        dispatch.call('loadedImages');
-      } else if (which === 'signs') {
-        dispatch.call('loadedSigns');
-      } else if (which === 'points') {
-        dispatch.call('loadedMapFeatures');
-      }
-    })
-    .catch(err => {
-      if (err.name === 'AbortError') return;          // ok
-      if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
-      cache.loaded[tileID] = true;  // don't retry
-    })
-    .finally(() => {
-      delete cache.inflight[tileID];
-    });
-}
-
-
-// Load the data from the vector tile into cache
-function loadTileDataToCache(data, tile) {
-  const vectorTile = new VectorTile(new Protobuf(data));
-
-  if (vectorTile.layers.hasOwnProperty('image')) {
-    const cache = _mlyCache.images;
-    const layer = vectorTile.layers.image;
-    let boxes = [];
-
-    for (let i = 0; i < layer.length; i++) {
-      const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
-      if (!feature) continue;
-      if (cache.forImageID[feature.properties.id] !== undefined) continue;  // seen already
-
-      const loc = feature.geometry.coordinates;
-      const d = {
-        id: feature.properties.id,
-        loc: loc,
-        captured_at: feature.properties.captured_at,
-        ca: feature.properties.compass_angle,
-        isPano: feature.properties.is_pano,
-        sequenceID: feature.properties.sequence_id,
-      };
-      cache.forImageID[d.id] = d;
-      boxes.push({ minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d });
-    }
-    cache.rtree.load(boxes);
-  }
-
-  if (vectorTile.layers.hasOwnProperty('sequence')) {
-    const cache = _mlyCache.sequences;
-    const layer = vectorTile.layers.sequence;
-
-    for (let i = 0; i < layer.length; i++) {
-      const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
-      if (!feature) continue;
-      const sequenceID = feature.properties.id;
-
-      let lineStrings = cache.get(sequenceID);
-      if (!lineStrings) {
-        lineStrings = [];
-        cache.set(sequenceID, lineStrings);
-      }
-      lineStrings.push(feature);
-    }
-  }
-
-  if (vectorTile.layers.hasOwnProperty('point')) {
-    const cache = _mlyCache.points;
-    const layer = vectorTile.layers.point;
-    let boxes = [];
-
-    for (let i = 0; i < layer.length; i++) {
-      const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
-      if (!feature) continue;
-
-      const loc = feature.geometry.coordinates;
-      const d = {
-        id: feature.properties.id,
-        loc: loc,
-        first_seen_at: feature.properties.first_seen_at,
-        last_seen_at: feature.properties.last_seen_at,
-        value: feature.properties.value
-      };
-
-      boxes.push({ minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d });
-    }
-    cache.rtree.load(boxes);
-  }
-
-  if (vectorTile.layers.hasOwnProperty('traffic_sign')) {
-    const cache = _mlyCache.signs;
-    const layer = vectorTile.layers.traffic_sign;
-    let boxes = [];
-
-    for (let i = 0; i < layer.length; i++) {
-      const feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
-      const loc = feature.geometry.coordinates;
-
-      const d = {
-        id: feature.properties.id,
-        loc: loc,
-        first_seen_at: feature.properties.first_seen_at,
-        last_seen_at: feature.properties.last_seen_at,
-        value: feature.properties.value
-      };
-      boxes.push({ minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: d });
-    }
-    cache.rtree.load(boxes);
-  }
-}
-
-
-// Get data from the API
-function loadDataAsync(url) {
-  return fetch(url)
-    .then(response => {
-      if (!response.ok) {
-        throw new Error(response.status + ' ' + response.statusText);
-      }
-      return response.json();
-    })
-    .then(result => {
-      return result?.data || [];
-    })
-    .catch(err => {
-      if (err.name === 'AbortError') return;          // ok
-      if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
-    });
-}
-
-
-export default {
-  // Initialize Mapillary
-  init: function() {
-    if (!_mlyCache) {
-      this.reset();
-    }
-
-    this.event = utilRebind(this, dispatch, 'on');
-  },
-
-  // Reset cache and state
-  reset: function() {
-    if (_mlyCache) {
-      Object.values(_mlyCache.requests.inflight).forEach(function(request) { request.abort(); });
-    }
-
-    _mlyCache = {
-      images: { rtree: new RBush(), forImageID: {} },
-      image_detections: { forImageID: {} },
-      signs: { rtree: new RBush() },
-      points: { rtree: new RBush() },
-      sequences: new Map(),    // Map(sequenceID -> Array of LineStrings)
-      requests: { loaded: {}, inflight: {} }
-    };
-
-    _mlyActiveImage = null;
-  },
-
-  // Get visible images
-  images: function(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
-    return _mlyCache.images.rtree.search(box).map(d => d.data);
-  },
-
-  // Get visible traffic signs
-  signs: function(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
-    return _mlyCache.signs.rtree.search(box).map(d => d.data);
-  },
-
-  // Get visible map (point) features
-  mapFeatures: function(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
-    return _mlyCache.points.rtree.search(box).map(d => d.data);
-  },
-
-  // Get cached image by id
-  cachedImage: function(imageID) {
-    return _mlyCache.images.forImageID[imageID];
-  },
-
-  // Get visible sequences
-  sequences: function(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
-    let result = new Map();  // Map(sequenceID -> Array of LineStrings)
-
-    // Gather sequences for images in viewport
-    for (const box of _mlyCache.images.rtree.search(bbox)) {
-      const sequenceID = box.data.sequenceID;
-      if (!sequenceID) continue;  // no sequence for this image
-      const sequence = _mlyCache.sequences.get(sequenceID);
-      if (!sequence) continue;  // sequence not ready
-
-      if (!result.has(sequenceID)) {
-        result.set(sequenceID, sequence);
-      }
-    }
-    return [...result.values()];
-  },
-
-
-  // Load images in the visible area
-  loadImages: function(projection) {
-    loadTiles('images', tileUrl, 14, projection);
-  },
-
-
-  // Load traffic signs in the visible area
-  loadSigns: function(projection) {
-    loadTiles('signs', trafficSignTileUrl, 14, projection);
-  },
-
-
-  // Load map (point) features in the visible area
-  loadMapFeatures: function(projection) {
-    loadTiles('points', mapFeatureTileUrl, 14, projection);
-  },
-
-
-  // Return a promise that resolves when the image viewer (Mapillary JS) library has finished loading
-  loadViewerAsync: function(context) {
-    if (_loadViewerPromise) return _loadViewerPromise;
-
-    // add mly-wrapper
-    const wrap = context.container().select('.photoviewer')
-      .selectAll('.mly-wrapper')
-      .data([0]);
-
-    wrap.enter()
-      .append('div')
-      .attr('id', 'ideditor-mly')
-      .attr('class', 'photo-wrapper mly-wrapper')
-      .classed('hide', true);
-
-    const that = this;
-
-    _loadViewerPromise = new Promise((resolve, reject) => {
-      let loadedCount = 0;
-
-      function loaded() {
-        loadedCount += 1;
-        // wait until both files are loaded
-        if (loadedCount === 2) resolve();
-      }
-
-      const head = d3_select('head');
-
-      // load mapillary-viewercss
-      head.selectAll('#ideditor-mapillary-viewercss')
-        .data([0])
-        .enter()
-        .append('link')
-        .attr('id', 'ideditor-mapillary-viewercss')
-        .attr('rel', 'stylesheet')
-        .attr('crossorigin', 'anonymous')
-        .attr('href', context.asset(viewercss))
-        .on('load.serviceMapillary', loaded)
-        .on('error.serviceMapillary', reject);
-
-      // load mapillary-viewerjs
-      head.selectAll('#ideditor-mapillary-viewerjs')
-        .data([0])
-        .enter()
-        .append('script')
-        .attr('id', 'ideditor-mapillary-viewerjs')
-        .attr('crossorigin', 'anonymous')
-        .attr('src', context.asset(viewerjs))
-        .on('load.serviceMapillary', loaded)
-        .on('error.serviceMapillary', reject);
-    })
-    .then(() => that.initViewer(context))
-    .catch(err => {
-      if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
-      _loadViewerPromise = null;
-    });
-
-    return _loadViewerPromise;
-  },
-
-
-  // Remove previous detections in image viewer
-  resetTags: function() {
-    if (_mlyViewer && !_mlyFallback) {
-      _mlyViewer.getComponent('tag').removeAll();
-    }
-  },
-
-
-  // Show map feature detections in image viewer
-  showFeatureDetections: function(value) {
-    _mlyShowFeatureDetections = value;
-    if (!_mlyShowFeatureDetections && !_mlyShowSignDetections) {
-      this.resetTags();
-    }
-  },
-
-
-  // Show traffic sign detections in image viewer
-  showSignDetections: function(value) {
-    _mlyShowSignDetections = value;
-    if (!_mlyShowFeatureDetections && !_mlyShowSignDetections) {
-      this.resetTags();
-    }
-  },
-
-
-  // Apply filter to image viewer
-  filterViewer: function(context) {
-    const showsPano = context.photos().showsPanoramic;
-    const showsFlat = context.photos().showsFlat;
-    const fromDate = context.photos().fromDate;
-    const toDate = context.photos().toDate;
-    const filter = ['all'];
-
-    if (!showsPano) filter.push([ '!=', 'cameraType', 'spherical' ]);
-    if (!showsFlat && showsPano) filter.push(['==', 'pano', true]);
-    if (fromDate) {
-      filter.push(['>=', 'capturedAt', new Date(fromDate).getTime()]);
-    }
-    if (toDate) {
-      filter.push(['>=', 'capturedAt', new Date(toDate).getTime()]);
-    }
-
-    if (_mlyViewer) {
-      _mlyViewer.setFilter(filter);
-    }
-    _mlyViewerFilter = filter;
-
-    return filter;
-  },
-
-
-  // Make the image viewer visible
-  showViewer: function(context) {
-    const wrap = context.container().select('.photoviewer')
-      .classed('hide', false);
-
-    const isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size();
-
-    if (isHidden && _mlyViewer) {
-      wrap
-        .selectAll('.photo-wrapper:not(.mly-wrapper)')
-        .classed('hide', true);
-
-      wrap
-        .selectAll('.photo-wrapper.mly-wrapper')
-        .classed('hide', false);
-
-      _mlyViewer.resize();
-    }
-
-    return this;
-  },
-
-
-  // Hide the image viewer and resets map markers
-  hideViewer: function(context) {
-    _mlyActiveImage = null;
-    context.photos().selectPhoto(null);
-
-    if (!_mlyFallback && _mlyViewer) {
-      _mlyViewer.getComponent('sequence').stop();
-    }
-
-    const viewer = context.container().select('.photoviewer');
-    if (!viewer.empty()) viewer.datum(null);
-
-    viewer
-      .classed('hide', true)
-      .selectAll('.photo-wrapper')
-      .classed('hide', true);
-
-    dispatch.call('imageChanged');
-    dispatch.call('loadedMapFeatures');
-    dispatch.call('loadedSigns');
-
-    return this.setStyles(context, null);
-  },
-
-
-  // Highlight the detection in the viewer that is related to the clicked map feature
-  highlightDetection: function(detection) {
-    if (detection) {
-      _mlyHighlightedDetection = detection.id;
-    }
-
-    return this;
-  },
-
-
-  // Initialize image viewer (Mapillary JS)
-  initViewer: function(context) {
-    const that = this;
-    if (!window.mapillary) return;
-
-    const opts = {
-      accessToken: accessToken,
-      component: {
-        cover: false,
-        keyboard: false,
-        tag: true
-      },
-      container: 'ideditor-mly',
-    };
-
-    // Disable components requiring WebGL support
-    if (!mapillary.isSupported() && mapillary.isFallbackSupported()) {
-      _mlyFallback = true;
-      opts.component = {
-        cover: false,
-        direction: false,
-        imagePlane: false,
-        keyboard: false,
-        mouse: false,
-        sequence: false,
-        tag: false,
-        image: true,        // fallback
-        navigation: true    // fallback
-      };
-    }
-
-    _mlyViewer = new mapillary.Viewer(opts);
-    _mlyViewer.on('image', imageChanged);
-    _mlyViewer.on('bearing', bearingChanged);
-
-    if (_mlyViewerFilter) {
-      _mlyViewer.setFilter(_mlyViewerFilter);
-    }
-
-    // Register viewer resize handler
-    context.ui().photoviewer.on('resize.mapillary', () => {
-      if (_mlyViewer) _mlyViewer.resize();
-    });
-
-    // imageChanged: called after the viewer has changed images and is ready.
-    function imageChanged(node) {
-      that.resetTags();
-      const image = node.image;
-      that.setActiveImage(image);
-      that.setStyles(context, null);
-      const loc = [image.originalLngLat.lng, image.originalLngLat.lat];
-      context.map().centerEase(loc);
-      context.photos().selectPhoto('mapillary', image.id);
-
-      if (_mlyShowFeatureDetections || _mlyShowSignDetections) {
-        that.updateDetections(image.id, `${apiUrl}/${image.id}/detections?access_token=${accessToken}&fields=id,image,geometry,value`);
-      }
-      dispatch.call('imageChanged');
-    }
-
-
-    // bearingChanged: called when the bearing changes in the image viewer.
-    function bearingChanged(e) {
-      dispatch.call('bearingChanged', undefined, e);
-    }
-  },
-
-
-  // Move to an image
-  // note: call `context.photos().selectPhoto(layerID, photoID)` instead
-  // That will deal with the URL and call this function
-  selectImage: function(context, imageID) {
-    if (_mlyViewer && imageID) {
-      _mlyViewer
-        .moveTo(imageID)
-        .catch(err => console.error('mly3', err));   // eslint-disable-line no-console
-    }
-    return this;
-  },
-
-
-  // Return the currently displayed image
-  getActiveImage: function() {
-    return _mlyActiveImage;
-  },
-
-
-  // Return a list of detection objects for the given id
-  getDetections: function(id) {
-    return loadDataAsync(`${apiUrl}/${id}/detections?access_token=${accessToken}&fields=id,value,image`);
-  },
-
-
-  // Set the currently visible image
-  setActiveImage: function(image) {
-    if (image) {
-      _mlyActiveImage = {
-        ca: image.originalCompassAngle,
-        id: image.id,
-        loc: [image.originalLngLat.lng, image.originalLngLat.lat],
-        isPano: image.cameraType === 'spherical',
-        sequenceID: image.sequenceID
-      };
-    } else {
-      _mlyActiveImage = null;
-    }
-  },
-
-
-  // Update the currently highlighted sequence and selected bubble.
-  setStyles: function(context, hovered) {
-    const hoveredImageID = hovered?.id;
-    const hoveredSequenceID = hovered?.sequenceID;
-    const selectedSequenceID = _mlyActiveImage && _mlyActiveImage.sequenceID;
-
-    context.container().selectAll('.layer-mapillary .viewfield-group')
-      .classed('highlighted', function(d) { return (d.sequenceID === selectedSequenceID) || (d.id === hoveredImageID); })
-      .classed('hovered', function(d) { return d.id === hoveredImageID; });
-
-    context.container().selectAll('.layer-mapillary .sequence')
-      .classed('highlighted', function(d) { return d.properties.id === hoveredSequenceID; })
-      .classed('currentView', function(d) { return d.properties.id === selectedSequenceID; });
-
-    return this;
-  },
-
-
-  // Get detections for the current image and shows them in the image viewer
-  updateDetections: function(imageID, url) {
-    if (!_mlyViewer || _mlyFallback) return;
-    if (!imageID) return;
-
-    const cache = _mlyCache.image_detections;
-
-    if (cache.forImageID[imageID]) {
-      showDetections(_mlyCache.image_detections.forImageID[imageID]);
-    } else {
-      loadDataAsync(url)
-        .then(detections => {
-          detections.forEach(function(detection) {
-            if (!cache.forImageID[imageID]) {
-              cache.forImageID[imageID] = [];
-            }
-            cache.forImageID[imageID].push({
-              geometry: detection.geometry,
-              id: detection.id,
-              image_id: imageID,
-              value:detection.value
-            });
-          });
-
-          showDetections(_mlyCache.image_detections.forImageID[imageID] || []);
-        });
-    }
-
-
-    // Create a tag for each detection and shows it in the image viewer
-    function showDetections(detections) {
-      const tagComponent = _mlyViewer.getComponent('tag');
-      for (const data of detections) {
-        const tag = makeTag(data);
-        if (tag) {
-          tagComponent.add([tag]);
-        }
-      }
-    }
-
-    // Create a Mapillary JS tag object
-    function makeTag(data) {
-      const valueParts = data.value.split('--');
-      if (!valueParts.length) return;
-
-      let tag;
-      let text;
-      let color = 0xffffff;
-
-      if (_mlyHighlightedDetection === data.id) {
-        color = 0xffff00;
-        text = valueParts[1];
-        if (text === 'flat' || text === 'discrete' || text === 'sign') {
-          text = valueParts[2];
-        }
-        text = text.replace(/-/g, ' ');
-        text = text.charAt(0).toUpperCase() + text.slice(1);
-        _mlyHighlightedDetection = null;
-      }
-
-      const decodedGeometry = window.atob(data.geometry);
-      let uintArray = new Uint8Array(decodedGeometry.length);
-      for (let i = 0; i < decodedGeometry.length; i++) {
-        uintArray[i] = decodedGeometry.charCodeAt(i);
-      }
-      const tile = new VectorTile(new Protobuf(uintArray.buffer));
-      const layer = tile.layers['mpy-or'];
-
-      const geometries = layer.feature(0).loadGeometry();
-
-      const polygon = geometries
-        .map(ring => ring.map(point => [point.x / layer.extent, point.y / layer.extent]));
-
-      tag = new mapillary.OutlineTag(
-        data.id,
-        new mapillary.PolygonGeometry(polygon[0]), {
-          text: text,
-          textColor: color,
-          lineColor: color,
-          lineWidth: 2,
-          fillColor: color,
-          fillOpacity: 0.3,
-        }
-      );
-
-      return tag;
-    }
-  },
-
-
-  // Return the current cache
-  cache: function() {
-    return _mlyCache;
-  }
-};
diff --git a/modules/services/maprules.js b/modules/services/maprules.js
deleted file mode 100644
index 670ceeba6e..0000000000
--- a/modules/services/maprules.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import { utilArrayIntersection } from '@rapid-sdk/util';
-
-import { osmAreaKeys as areaKeys } from '../osm/tags';
-import { validationIssue } from '../core/validation';
-
-
-var buildRuleChecks = function() {
-    return {
-        equals: function (equals) {
-            return function(tags) {
-                return Object.keys(equals).every(function(k) {
-                    return equals[k] === tags[k];
-                });
-            };
-        },
-        notEquals: function (notEquals) {
-            return function(tags) {
-                return Object.keys(notEquals).some(function(k) {
-                    return notEquals[k] !== tags[k];
-                });
-            };
-        },
-        absence: function(absence) {
-            return function(tags) {
-                return Object.keys(tags).indexOf(absence) === -1;
-            };
-        },
-        presence: function(presence) {
-            return function(tags) {
-                return Object.keys(tags).indexOf(presence) > -1;
-            };
-        },
-        greaterThan: function(greaterThan) {
-            var key = Object.keys(greaterThan)[0];
-            var value = greaterThan[key];
-
-            return function(tags) {
-                return tags[key] > value;
-            };
-        },
-        greaterThanEqual: function(greaterThanEqual) {
-            var key = Object.keys(greaterThanEqual)[0];
-            var value = greaterThanEqual[key];
-
-            return function(tags) {
-                return tags[key] >= value;
-            };
-        },
-        lessThan: function(lessThan) {
-            var key = Object.keys(lessThan)[0];
-            var value = lessThan[key];
-
-            return function(tags) {
-                return tags[key] < value;
-            };
-        },
-        lessThanEqual: function(lessThanEqual) {
-            var key = Object.keys(lessThanEqual)[0];
-            var value = lessThanEqual[key];
-
-            return function(tags) {
-                return tags[key] <= value;
-            };
-        },
-        positiveRegex: function(positiveRegex) {
-            var tagKey = Object.keys(positiveRegex)[0];
-            var expression = positiveRegex[tagKey].join('|');
-            var regex = new RegExp(expression);
-
-            return function(tags) {
-                return regex.test(tags[tagKey]);
-            };
-        },
-        negativeRegex: function(negativeRegex) {
-            var tagKey = Object.keys(negativeRegex)[0];
-            var expression = negativeRegex[tagKey].join('|');
-            var regex = new RegExp(expression);
-
-            return function(tags) {
-                return !regex.test(tags[tagKey]);
-            };
-        }
-    };
-};
-
-var buildLineKeys = function() {
-    return {
-        highway: {
-            rest_area: true,
-            services: true
-        },
-        railway: {
-            roundhouse: true,
-            station: true,
-            traverser: true,
-            turntable: true,
-            wash: true
-        }
-    };
-};
-
-export default {
-    init: function() {
-        this._ruleChecks  = buildRuleChecks();
-        this._validationRules = [];
-        this._areaKeys = areaKeys;
-        this._lineKeys = buildLineKeys();
-    },
-
-    // list of rules only relevant to tag checks...
-    filterRuleChecks: function(selector) {
-        var _ruleChecks = this._ruleChecks;
-        return Object.keys(selector).reduce(function(rules, key) {
-            if (['geometry', 'error', 'warning'].indexOf(key) === -1) {
-                rules.push(_ruleChecks[key](selector[key]));
-            }
-            return rules;
-        }, []);
-    },
-
-    // builds tagMap from mapcss-parse selector object...
-    buildTagMap: function(selector) {
-        var getRegexValues = function(regexes) {
-            return regexes.map(function(regex) {
-                return regex.replace(/\$|\^/g, '');
-            });
-        };
-
-        var tagMap = Object.keys(selector).reduce(function (expectedTags, key) {
-            var values;
-            var isRegex = /regex/gi.test(key);
-            var isEqual = /equals/gi.test(key);
-
-            if (isRegex || isEqual) {
-                Object.keys(selector[key]).forEach(function(selectorKey) {
-                    values = isEqual ? [selector[key][selectorKey]] : getRegexValues(selector[key][selectorKey]);
-
-                    if (expectedTags.hasOwnProperty(selectorKey)) {
-                        values = values.concat(expectedTags[selectorKey]);
-                    }
-
-                    expectedTags[selectorKey] = values;
-                });
-
-            } else if (/(greater|less)Than(Equal)?|presence/g.test(key)) {
-                var tagKey = /presence/.test(key) ? selector[key] : Object.keys(selector[key])[0];
-
-                values = [selector[key][tagKey]];
-
-                if (expectedTags.hasOwnProperty(tagKey)) {
-                    values = values.concat(expectedTags[tagKey]);
-                }
-
-                expectedTags[tagKey] = values;
-            }
-
-            return expectedTags;
-        }, {});
-
-        return tagMap;
-    },
-
-    // inspired by osmWay#isArea()
-    inferGeometry: function(tagMap) {
-        var _lineKeys = this._lineKeys;
-        var _areaKeys = this._areaKeys;
-
-        var keyValueDoesNotImplyArea = function(key) {
-            return utilArrayIntersection(tagMap[key], Object.keys(_areaKeys[key])).length > 0;
-        };
-        var keyValueImpliesLine = function(key) {
-            return utilArrayIntersection(tagMap[key], Object.keys(_lineKeys[key])).length > 0;
-        };
-
-        if (tagMap.hasOwnProperty('area')) {
-            if (tagMap.area.indexOf('yes') > -1) {
-                return 'area';
-            }
-            if (tagMap.area.indexOf('no') > -1) {
-                return 'line';
-            }
-        }
-
-        for (var key in tagMap) {
-            if (key in _areaKeys && !keyValueDoesNotImplyArea(key)) {
-                return 'area';
-            }
-            if (key in _lineKeys && keyValueImpliesLine(key)) {
-                return 'area';
-            }
-        }
-
-        return 'line';
-    },
-
-    // adds from mapcss-parse selector check...
-    addRule: function(selector) {
-        var rule = {
-            // checks relevant to mapcss-selector
-            checks: this.filterRuleChecks(selector),
-            // true if all conditions for a tag error are true..
-            matches: function(entity) {
-                return this.checks.every(function(check) {
-                    return check(entity.tags);
-                });
-            },
-            // borrowed from Way#isArea()
-            inferredGeometry: this.inferGeometry(this.buildTagMap(selector), this._areaKeys),
-            geometryMatches: function(entity, graph) {
-                if (entity.type === 'node' || entity.type === 'relation') {
-                    return selector.geometry === entity.type;
-                } else if (entity.type === 'way') {
-                    return this.inferredGeometry === entity.geometry(graph);
-                }
-            },
-            // when geometries match and tag matches are present, return a warning...
-            findIssues: function (entity, graph, issues) {
-                if (this.geometryMatches(entity, graph) && this.matches(entity)) {
-                    var severity = Object.keys(selector).indexOf('error') > -1
-                            ? 'error'
-                            : 'warning';
-                    var message = selector[severity];
-                    issues.push(new validationIssue({
-                        type: 'maprules',
-                        severity: severity,
-                        message: function() {
-                            return message;
-                        },
-                        entityIds: [entity.id]
-                    }));
-                }
-            }
-        };
-        this._validationRules.push(rule);
-    },
-
-    clearRules: function() { this._validationRules = []; },
-
-    // returns validationRules...
-    validationRules: function() { return this._validationRules; },
-
-    // returns ruleChecks
-    ruleChecks: function() { return this._ruleChecks; }
-};
diff --git a/modules/services/nominatim.js b/modules/services/nominatim.js
deleted file mode 100644
index 32e613c34f..0000000000
--- a/modules/services/nominatim.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { json as d3_json } from 'd3-fetch';
-import { Extent } from '@rapid-sdk/math';
-import { utilQsString } from '@rapid-sdk/util';
-import RBush from 'rbush';
-
-import { localizer } from '../core';
-
-
-var apibase = 'https://nominatim.openstreetmap.org/';
-var _inflight = {};
-var _nominatimCache;
-
-
-export default {
-
-    init: function() {
-        _inflight = {};
-        _nominatimCache = new RBush();
-    },
-
-    reset: function() {
-        Object.values(_inflight).forEach(function(controller) { controller.abort(); });
-        _inflight = {};
-        _nominatimCache = new RBush();
-    },
-
-
-    countryCode: function (location, callback) {
-        this.reverse(location, function(err, result) {
-            if (err) {
-                return callback(err);
-            } else if (result.address) {
-                return callback(null, result.address.country_code);
-            } else {
-                return callback('Unable to geocode', null);
-            }
-        });
-    },
-
-
-    reverse: function (loc, callback) {
-        var cached = _nominatimCache.search(
-            { minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1] }
-        );
-
-        if (cached.length > 0) {
-            if (callback) callback(null, cached[0].data);
-            return;
-        }
-
-        var params = { zoom: 13, format: 'json', addressdetails: 1, lat: loc[1], lon: loc[0] };
-        var url = apibase + 'reverse?' + utilQsString(params);
-
-        if (_inflight[url]) return;
-        var controller = new AbortController();
-        _inflight[url] = controller;
-
-        d3_json(url, {
-            signal: controller.signal,
-            headers: { 'Accept-Language': localizer.localeCodes().join(',') }
-        })
-            .then(function(result) {
-                delete _inflight[url];
-                if (result && result.error) {
-                    throw new Error(result.error);
-                }
-                var extent = new Extent(loc).padByMeters(200);
-                _nominatimCache.insert(Object.assign(extent.bbox(), {data: result}));
-                if (callback) callback(null, result);
-            })
-            .catch(function(err) {
-                delete _inflight[url];
-                if (err.name === 'AbortError') return;
-                if (callback) callback(err.message);
-            });
-    },
-
-
-    search: function (val, callback) {
-        var searchVal = encodeURIComponent(val);
-        var url = apibase + 'search/' + searchVal + '?limit=10&format=json';
-
-        if (_inflight[url]) return;
-        var controller = new AbortController();
-        _inflight[url] = controller;
-
-        d3_json(url, {
-            signal: controller.signal,
-            headers: { 'Accept-Language': localizer.localeCodes().join(',') }
-        })
-            .then(function(result) {
-                delete _inflight[url];
-                if (result && result.error) {
-                    throw new Error(result.error);
-                }
-                if (callback) callback(null, result);
-            })
-            .catch(function(err) {
-                delete _inflight[url];
-                if (err.name === 'AbortError') return;
-                if (callback) callback(err.message);
-            });
-    }
-
-};
diff --git a/modules/services/nsi.js b/modules/services/nsi.js
deleted file mode 100644
index 0c4bf01ab9..0000000000
--- a/modules/services/nsi.js
+++ /dev/null
@@ -1,749 +0,0 @@
-import { Matcher } from 'name-suggestion-index';
-
-import { fileFetcher, locationManager } from '../core';
-import { presetManager } from '../presets';
-
-// This service contains all the code related to the **name-suggestion-index** (aka NSI)
-// NSI contains the most correct tagging for many commonly mapped features.
-// See https://github.com/osmlab/name-suggestion-index  and  https://nsi.guide
-
-
-// DATA
-
-let _nsiStatus = 'loading';  // 'loading', 'ok', 'failed'
-let _nsi = {};
-
-// Sometimes we can upgrade a feature tagged like `building=yes` to a better tag.
-const buildingPreset = {
-  'building/commercial': true,
-  'building/government': true,
-  'building/hotel': true,
-  'building/retail': true,
-  'building/office': true,
-  'building/supermarket': true,
-  'building/yes': true
-};
-
-// Exceptions to the namelike regexes.
-// Usually a tag suffix contains a language code like `name:en`, `name:ru`
-// but we want to exclude things like `operator:type`, `name:etymology`, etc..
-const notNames = /:(colou?r|type|forward|backward|left|right|etymology|pronunciation|wikipedia)$/i;
-
-// Exceptions to the branchlike regexes
-const notBranches = /(coop|express|wireless|factory|outlet)/i;
-
-
-// PRIVATE FUNCTIONS
-
-// `setNsiSources()`
-// Adds the sources to Rapid's filemap so we can start downloading data.
-//
-function setNsiSources() {
-  const sources = {
-    'nsi_data': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/nsi.min.json',
-    'nsi_dissolved': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/dissolved.min.json',
-    'nsi_features': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/featureCollection.min.json',
-    'nsi_generics': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/genericWords.min.json',
-    'nsi_presets': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/presets/nsi-id-presets.min.json',
-    'nsi_replacements': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/replacements.min.json',
-    'nsi_trees': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@6.0/dist/trees.min.json'
-  };
-
-  let fileMap = fileFetcher.fileMap();
-  for (const k in sources) {
-    if (!fileMap[k]) fileMap[k] = sources[k];
-  }
-}
-
-
-// `loadNsiPresets()`
-//  Returns a Promise fulfilled when the presets have been downloaded and merged into Rapid.
-//
-function loadNsiPresets() {
-  return (
-    Promise.all([
-      fileFetcher.get('nsi_presets'),
-      fileFetcher.get('nsi_features')
-    ])
-    .then(vals => {
-      // Add `suggestion=true` to all the nsi presets
-      // The preset json schema doesn't include it, but the Rapid code still uses it
-      Object.values(vals[0].presets).forEach(preset => preset.suggestion = true);
-
-      presetManager.merge({
-        presets: vals[0].presets,
-        featureCollection: vals[1]
-      });
-    })
-  );
-}
-
-
-// `loadNsiData()`
-//  Returns a Promise fulfilled when the other data have been downloaded and processed
-//
-function loadNsiData() {
-  return (
-    Promise.all([
-      fileFetcher.get('nsi_data'),
-      fileFetcher.get('nsi_dissolved'),
-      fileFetcher.get('nsi_replacements'),
-      fileFetcher.get('nsi_trees')
-    ])
-    .then(vals => {
-      _nsi = {
-        data:          vals[0].nsi,            // the raw name-suggestion-index data
-        dissolved:     vals[1].dissolved,      // list of dissolved items
-        replacements:  vals[2].replacements,   // trivial old->new qid replacements
-        trees:         vals[3].trees,          // metadata about trees, main tags
-        kvt:           new Map(),              // Map (k -> Map (v -> t) )
-        qids:          new Map(),              // Map (wd/wp tag values -> qids)
-        ids:           new Map()               // Map (id -> NSI item)
-      };
-
-      const matcher = _nsi.matcher = new Matcher();
-      matcher.buildMatchIndex(_nsi.data);
-
-// *** BEGIN HACK ***
-
-// old - built in matcher will set up the locationindex by resolving all the locationSets one-by-one
-      // matcher.buildLocationIndex(_nsi.data, locationManager.loco());
-
-// new - Use the location manager instead of redoing that work
-// It has already processed the presets at this point
-
-// We need to monkeypatch a few of the collections that the NSI matcher depends on.
-// The `itemLocation` structure maps itemIDs to locationSetIDs
-matcher.itemLocation = new Map();
-
-// The `locationSets` structure maps locationSetIDs to GeoJSON
-// We definitely need this, but don't need full geojson, just { properties: { area: xxx }}
-matcher.locationSets = new Map();
-
-Object.keys(_nsi.data).forEach(tkv => {
-  const items = _nsi.data[tkv].items;
-  if (!Array.isArray(items) || !items.length) return;
-
-  items.forEach(item => {
-    if (matcher.itemLocation.has(item.id)) return;   // we've seen item id already - shouldn't be possible?
-
-    const locationSetID = locationManager.locationSetID(item.locationSet);
-    matcher.itemLocation.set(item.id, locationSetID);
-
-    if (matcher.locationSets.has(locationSetID)) return;   // we've seen this locationSet before..
-
-    const fakeFeature = { id: locationSetID, properties: { id: locationSetID, area: 1 } };
-    matcher.locationSets.set(locationSetID, fakeFeature);
-  });
-});
-
-// The `locationIndex` is an instance of which-polygon spatial index for the locationSets.
-// We only really need this to _look like_ which-polygon query `_wp.locationIndex(bbox, true);`
-// i.e. it needs to return the properties of the locationsets
-matcher.locationIndex = (bbox) => {
-  const validHere = locationManager.locationSetsAt([bbox[0], bbox[1]]);
-  const results = [];
-
-  for (const [locationSetID, area] of Object.entries(validHere)) {
-    const fakeFeature = matcher.locationSets.get(locationSetID);
-    if (fakeFeature) {
-      fakeFeature.properties.area = area;
-      results.push(fakeFeature);
-    }
-  }
-  return results;
-};
-
-// *** END HACK ***
-
-
-      Object.keys(_nsi.data).forEach(tkv => {
-        const category = _nsi.data[tkv];
-        const parts = tkv.split('/', 3);     // tkv = "tree/key/value"
-        const t = parts[0];
-        const k = parts[1];
-        const v = parts[2];
-
-        // Build a reverse index of keys -> values -> trees present in the name-suggestion-index
-        // Collect primary keys  (e.g. "amenity", "craft", "shop", "man_made", "route", etc)
-        // "amenity": {
-        //   "restaurant": "brands"
-        // }
-        let vmap = _nsi.kvt.get(k);
-        if (!vmap) {
-          vmap = new Map();
-          _nsi.kvt.set(k, vmap);
-        }
-        vmap.set(v, t);
-
-        const tree = _nsi.trees[t];     // e.g. "brands", "operators"
-        const mainTag = tree.mainTag;   // e.g. "brand:wikidata", "operator:wikidata", etc
-
-        const items = category.items || [];
-        items.forEach(item => {
-          // Remember some useful things for later, cache NSI id -> item
-          item.tkv = tkv;
-          item.mainTag = mainTag;
-          _nsi.ids.set(item.id, item);
-
-          // Cache Wikidata/Wikipedia values -> qid, for #6416
-          const wd = item.tags[mainTag];
-          const wp = item.tags[mainTag.replace('wikidata', 'wikipedia')];
-          if (wd)         _nsi.qids.set(wd, wd);
-          if (wp && wd)   _nsi.qids.set(wp, wd);
-        });
-      });
-    })
-  );
-}
-
-
-// `gatherKVs()`
-// Gather all the k/v pairs that we will run through the NSI matcher.
-// An OSM tags object can contain anything, but only a few tags will be interesting to NSI.
-//
-// This function will return the interesting tag pairs like:
-//   "amenity/restaurant", "man_made/flagpole"
-// and fallbacks like
-//   "amenity/yes"
-// excluding things like
-//   "tiger:reviewed", "surface", "ref", etc.
-//
-// Arguments
-//   `tags`: `Object` containing the feature's OSM tags
-// Returns
-//   `Object` containing kv pairs to test:
-//   {
-//     'primary': Set(),
-//     'alternate': Set()
-//   }
-//
-function gatherKVs(tags) {
-  let primary = new Set();
-  let alternate = new Set();
-
-  Object.keys(tags).forEach(osmkey => {
-    const osmvalue = tags[osmkey];
-    if (!osmvalue) return;
-
-    // Match a 'route_master' as if it were a 'route' - name-suggestion-index#5184
-    if (osmkey === 'route_master') osmkey = 'route';
-
-    const vmap = _nsi.kvt.get(osmkey);
-    if (!vmap) return;  // not an interesting key
-
-    if (vmap.get(osmvalue)) {     // Matched a category in NSI
-      primary.add(`${osmkey}/${osmvalue}`);     // interesting key/value
-    } else if (osmvalue === 'yes') {
-      alternate.add(`${osmkey}/${osmvalue}`);   // fallback key/yes
-    }
-  });
-
-  // Can we try a generic building fallback match? - See #6122, #7197
-  // Only try this if we do a preset match and find nothing else remarkable about that building.
-  // For example, a way with `building=yes` + `name=Westfield` may be a Westfield department store.
-  // But a way with `building=yes` + `name=Westfield` + `public_transport=station` is a train station for a town named "Westfield"
-  const preset = presetManager.matchTags(tags, 'area');
-  if (buildingPreset[preset.id]) {
-    alternate.add('building/yes');
-  }
-
-  return { primary: primary, alternate: alternate };
-}
-
-
-// `identifyTree()`
-// NSI has a concept of trees: "brands", "operators", "flags", "transit".
-// The tree determines things like which tags are namelike, and which tags hold important wikidata.
-// This takes an Object of tags and tries to identify what tree to use.
-//
-// Arguments
-//   `tags`: `Object` containing the feature's OSM tags
-// Returns
-//   `string` the name of the tree if known
-//   or 'unknown' if it could match several trees (e.g. amenity/yes)
-//   or null if no match
-//
-function identifyTree(tags) {
-  let unknown;
-  let t;
-
-  // Check all tags
-  Object.keys(tags).forEach(osmkey => {
-    if (t) return;  // found already
-
-    const osmvalue = tags[osmkey];
-    if (!osmvalue) return;
-
-    // Match a 'route_master' as if it were a 'route' - name-suggestion-index#5184
-    if (osmkey === 'route_master') osmkey = 'route';
-
-    const vmap = _nsi.kvt.get(osmkey);
-    if (!vmap) return;  // this key is not in nsi
-
-    if (osmvalue === 'yes') {
-      unknown = 'unknown';
-    } else {
-      t = vmap.get(osmvalue);
-    }
-  });
-
-  return t || unknown || null;
-}
-
-
-// `gatherNames()`
-// Gather all the namelike values that we will run through the NSI matcher.
-// It will gather values primarily from tags `name`, `name:ru`, `flag:name`
-//  and fallback to alternate tags like `brand`, `brand:ru`, `alt_name`
-//
-// Arguments
-//   `tags`: `Object` containing the feature's OSM tags
-// Returns
-//   `Object` containing namelike values to test:
-//   {
-//     'primary': Set(),
-//     'fallbacks': Set()
-//   }
-//
-function gatherNames(tags) {
-  const empty = { primary: new Set(), alternate: new Set() };
-  let primary = new Set();
-  let alternate = new Set();
-  let foundSemi = false;
-  let testNameFragments = false;
-  let patterns;
-
-  // Patterns for matching OSM keys that might contain namelike values.
-  // These roughly correspond to the "trees" concept in name-suggestion-index,
-  let t = identifyTree(tags);
-  if (!t) return empty;
-
-  if (t === 'transit') {
-    patterns = {
-      primary: /^network$/i,
-      alternate: /^(operator|operator:\w+|network:\w+|\w+_name|\w+_name:\w+)$/i
-    };
-  } else if (t === 'flags') {
-    patterns = {
-      primary: /^(flag:name|flag:name:\w+)$/i,
-      alternate: /^(flag|flag:\w+|subject|subject:\w+)$/i   // note: no `country`, we special-case it below
-    };
-  } else if (t === 'brands') {
-    testNameFragments = true;
-    patterns = {
-      primary: /^(name|name:\w+)$/i,
-      alternate: /^(brand|brand:\w+|operator|operator:\w+|\w+_name|\w+_name:\w+)/i,
-    };
-  } else if (t === 'operators') {
-    testNameFragments = true;
-    patterns = {
-      primary: /^(name|name:\w+|operator|operator:\w+)$/i,
-      alternate: /^(brand|brand:\w+|\w+_name|\w+_name:\w+)/i,
-    };
-  } else {  // unknown/multiple
-    testNameFragments = true;
-    patterns = {
-      primary: /^(name|name:\w+)$/i,
-      alternate: /^(brand|brand:\w+|network|network:\w+|operator|operator:\w+|\w+_name|\w+_name:\w+)/i,
-    };
-  }
-
-  // Test `name` fragments, longest to shortest, to fit them into a "Name Branch" pattern.
-  // e.g. "TUI ReiseCenter - Neuss Innenstadt" -> ["TUI", "ReiseCenter", "Neuss", "Innenstadt"]
-  if (tags.name && testNameFragments) {
-    const nameParts = tags.name.split(/[\s\-\/,.]/);
-    for (let split = nameParts.length; split > 0; split--) {
-      const name = nameParts.slice(0, split).join(' ');  // e.g. "TUI ReiseCenter"
-      primary.add(name);
-    }
-  }
-
-  // Check all tags
-  Object.keys(tags).forEach(osmkey => {
-    const osmvalue = tags[osmkey];
-    if (!osmvalue) return;
-
-    if (isNamelike(osmkey, 'primary')) {
-      if (/;/.test(osmvalue)) {
-        foundSemi = true;
-      } else {
-        primary.add(osmvalue);
-        alternate.delete(osmvalue);
-      }
-    } else if (!primary.has(osmvalue) && isNamelike(osmkey, 'alternate')) {
-      if (/;/.test(osmvalue)) {
-        foundSemi = true;
-      } else {
-        alternate.add(osmvalue);
-      }
-    }
-  });
-
-  // For flags only, fallback to `country` tag only if no other namelike values were found.
-  // See https://github.com/openstreetmap/iD/pull/8305#issuecomment-769174070
-  if (tags.man_made === 'flagpole' && !primary.size && !alternate.size && !!tags.country) {
-    const osmvalue = tags.country;
-    if (/;/.test(osmvalue)) {
-      foundSemi = true;
-    } else {
-      alternate.add(osmvalue);
-    }
-  }
-
-  // If any namelike value contained a semicolon, return empty set and don't try matching anything.
-  if (foundSemi) {
-    return empty;
-  } else {
-    return { primary: primary, alternate: alternate };
-  }
-
-  function isNamelike(osmkey, which) {
-    if (osmkey === 'old_name') return false;
-    return patterns[which].test(osmkey) && !notNames.test(osmkey);
-  }
-}
-
-
-// `gatherTuples()`
-// Generate all combinations of [key,value,name] that we want to test.
-// This prioritizes them so that the primary name and k/v pairs go first
-//
-// Arguments
-//   `tryKVs`: `Object` containing primary and alternate k/v pairs to test
-//   `tryNames`: `Object` containing primary and alternate names to test
-// Returns
-//   `Array`: tuple objects ordered by priority
-//
-function gatherTuples(tryKVs, tryNames) {
-  let tuples = [];
-  ['primary', 'alternate'].forEach(whichName => {
-    // test names longest to shortest
-    const arr = Array.from(tryNames[whichName]).sort((a, b) => b.length - a.length);
-    arr.forEach(n => {
-      ['primary', 'alternate'].forEach(whichKV => {
-        tryKVs[whichKV].forEach(kv => {
-          const parts = kv.split('/', 2);
-          const k = parts[0];
-          const v = parts[1];
-          tuples.push({ k: k, v: v, n: n });
-        });
-      });
-    });
-  });
-  return tuples;
-}
-
-
-// `_upgradeTags()`
-// Try to match a feature to a canonical record in name-suggestion-index
-// and upgrade the tags to match.
-//
-// Arguments
-//   `tags`: `Object` containing the feature's OSM tags
-//   `loc`: Location where this feature exists, as a [lon, lat]
-// Returns
-//   `Object` containing the result, or `null` if no changes needed:
-//   {
-//     'newTags': `Object` - The tags the the feature should have
-//     'matched': `Object` - The matched item
-//   }
-//
-function _upgradeTags(tags, loc) {
-  let newTags = Object.assign({}, tags);  // shallow copy
-  let changed = false;
-
-  // Before anything, perform trivial Wikipedia/Wikidata replacements
-  Object.keys(newTags).forEach(osmkey => {
-    const matchTag = osmkey.match(/^(\w+:)?wikidata$/);
-    if (matchTag) {                         // Look at '*:wikidata' tags
-      const prefix = (matchTag[1] || '');
-      const wd = newTags[osmkey];
-      const replace = _nsi.replacements[wd];    // If it matches a QID in the replacement list...
-
-      if (replace && replace.wikidata !== undefined) {   // replace or delete `*:wikidata` tag
-        changed = true;
-        if (replace.wikidata) {
-          newTags[osmkey] = replace.wikidata;
-        } else {
-          delete newTags[osmkey];
-        }
-      }
-      if (replace && replace.wikipedia !== undefined) {  // replace or delete `*:wikipedia` tag
-        changed = true;
-        const wpkey = `${prefix}wikipedia`;
-        if (replace.wikipedia) {
-          newTags[wpkey] = replace.wikipedia;
-        } else {
-          delete newTags[wpkey];
-        }
-      }
-    }
-  });
-
-  // Match a 'route_master' as if it were a 'route' - name-suggestion-index#5184
-  const isRouteMaster = (tags.type === 'route_master');
-
-  // Gather key/value tag pairs to try to match
-  const tryKVs = gatherKVs(tags);
-  if (!tryKVs.primary.size && !tryKVs.alternate.size) {
-    return changed ? { newTags: newTags, matched: null } : null;
-  }
-
-  // Gather namelike tag values to try to match
-  const tryNames = gatherNames(tags);
-
-  // Do `wikidata=*` or `wikipedia=*` tags identify this entity as a chain? - See #6416
-  // If so, these tags can be swapped to e.g. `brand:wikidata`/`brand:wikipedia`.
-  const foundQID = _nsi.qids.get(tags.wikidata) || _nsi.qids.get(tags.wikipedia);
-  if (foundQID) tryNames.primary.add(foundQID);  // matcher will recognize the Wikidata QID as name too
-
-  if (!tryNames.primary.size && !tryNames.alternate.size) {
-    return changed ? { newTags: newTags, matched: null } : null;
-  }
-
-  // Order the [key,value,name] tuples - test primary before alternate
-  const tuples = gatherTuples(tryKVs, tryNames);
-
-  for (let i = 0; i < tuples.length; i++) {
-    const tuple = tuples[i];
-    const hits = _nsi.matcher.match(tuple.k, tuple.v, tuple.n, loc);   // Attempt to match an item in NSI
-
-    if (!hits || !hits.length) continue;  // no match, try next tuple
-    if (hits[0].match !== 'primary' && hits[0].match !== 'alternate') break;  // a generic match, stop looking
-
-    // A match may contain multiple results, the first one is likely the best one for this location
-    // e.g. `['pfk-a54c14', 'kfc-1ff19c', 'kfc-658eea']`
-    let itemID, item;
-    for (let j = 0; j < hits.length; j++) {
-      const hit = hits[j];
-      itemID = hit.itemID;
-      if (_nsi.dissolved[itemID]) continue;       // Don't upgrade to a dissolved item
-
-      item = _nsi.ids.get(itemID);
-      if (!item) continue;
-      const mainTag = item.mainTag;               // e.g. `brand:wikidata`
-      const itemQID = item.tags[mainTag];         // e.g. `brand:wikidata` qid
-      const notQID = newTags[`not:${mainTag}`];   // e.g. `not:brand:wikidata` qid
-
-      if (                                        // Exceptions, skip this hit
-        (!itemQID || itemQID === notQID) ||       // No `*:wikidata` or matched a `not:*:wikidata`
-        (newTags.office && !item.tags.office)     // feature may be a corporate office for a brand? - #6416
-      ) {
-        item = null;
-        continue;  // continue looking
-      } else {
-        break;     // use `item`
-      }
-    }
-
-    // Can't use any of these hits, try next tuple..
-    if (!item) continue;
-
-    // At this point we have matched a canonical item and can suggest tag upgrades..
-    item = JSON.parse(JSON.stringify(item));   // deep copy
-    const tkv = item.tkv;
-    const parts = tkv.split('/', 3);     // tkv = "tree/key/value"
-    const k = parts[1];
-    const v = parts[2];
-    const category = _nsi.data[tkv];
-    const properties = category.properties || {};
-
-    // Preserve some tags that we specifically don't want NSI to overwrite. ('^name', sometimes)
-    let preserveTags = item.preserveTags || properties.preserveTags || [];
-
-    // These tags can be toplevel tags -or- attributes - so we generally want to preserve existing values - #8615
-    // We'll only _replace_ the tag value if this tag is the toplevel/defining tag for the matched item (`k`)
-    ['building', 'emergency', 'internet_access', 'takeaway'].forEach(osmkey => {
-      if (k !== osmkey) preserveTags.push(`^${osmkey}$`);
-    });
-
-    const regexes = preserveTags.map(s => new RegExp(s, 'i'));
-
-    let keepTags = {};
-    Object.keys(newTags).forEach(osmkey => {
-      if (regexes.some(regex => regex.test(osmkey))) {
-        keepTags[osmkey] = newTags[osmkey];
-      }
-    });
-
-    // Remove any primary tags ("amenity", "craft", "shop", "man_made", "route", etc) that have a
-    // value like `amenity=yes` or `shop=yes` (exceptions have already been added to `keepTags` above)
-    _nsi.kvt.forEach((vmap, k) => {
-      if (newTags[k] === 'yes') delete newTags[k];
-    });
-
-    // Replace mistagged `wikidata`/`wikipedia` with e.g. `brand:wikidata`/`brand:wikipedia`
-    if (foundQID) {
-      delete newTags.wikipedia;
-      delete newTags.wikidata;
-    }
-
-    // Do the tag upgrade
-    Object.assign(newTags, item.tags, keepTags);
-
-    // Swap `route` back to `route_master` - name-suggestion-index#5184
-    if (isRouteMaster) {
-      newTags.route_master = newTags.route;
-      delete newTags.route;
-    }
-
-    // Special `branch` splitting rules - IF..
-    // - NSI is suggesting to replace `name`, AND
-    // - `branch` doesn't already contain something, AND
-    // - original name has not moved to an alternate name (e.g. "Dunkin' Donuts" -> "Dunkin'"), AND
-    // - original name is "some name" + "some stuff", THEN
-    // consider splitting `name` into `name`/`branch`..
-    const origName = tags.name;
-    const newName = newTags.name;
-    if (newName && origName && newName !== origName && !newTags.branch) {
-      const newNames = gatherNames(newTags);
-      const newSet = new Set([...newNames.primary, ...newNames.alternate]);
-      const isMoved = newSet.has(origName);   // another tag holds the original name now
-
-      if (!isMoved) {
-        // Test name fragments, longest to shortest, to fit them into a "Name Branch" pattern.
-        // e.g. "TUI ReiseCenter - Neuss Innenstadt" -> ["TUI", "ReiseCenter", "Neuss", "Innenstadt"]
-        const nameParts = origName.split(/[\s\-\/,.]/);
-        for (let split = nameParts.length; split > 0; split--) {
-          const name = nameParts.slice(0, split).join(' ');  // e.g. "TUI ReiseCenter"
-          const branch = nameParts.slice(split).join(' ');   // e.g. "Neuss Innenstadt"
-          const nameHits = _nsi.matcher.match(k, v, name, loc);
-          if (!nameHits || !nameHits.length) continue;    // no match, try next name fragment
-
-          if (nameHits.some(hit => hit.itemID === itemID)) {   // matched the name fragment to the same itemID above
-            if (branch) {
-              if (notBranches.test(branch)) {   // "branch" was detected but is noise ("factory outlet", etc)
-                newTags.name = origName;        // Leave `name` alone, this part of the name may be significant..
-              } else {
-                const branchHits = _nsi.matcher.match(k, v, branch, loc);
-                if (branchHits && branchHits.length) {                                             // if "branch" matched something else in NSI..
-                  if (branchHits[0].match === 'primary' || branchHits[0].match === 'alternate') {  // if another brand! (e.g. "KFC - Taco Bell"?)
-                    return null;                                                                   //   bail out - can't suggest tags in this case
-                  }                                                                                // else a generic (e.g. "gas", "cafe") - ignore
-                } else {                     // "branch" is not noise and not something in NSI
-                  newTags.branch = branch;   // Stick it in the `branch` tag..
-                }
-              }
-            }
-            break;
-          }
-        }
-      }
-    }
-
-    return { newTags: newTags, matched: item };
-  }
-
-  return changed ? { newTags: newTags, matched: null } : null;
-}
-
-
-// `_isGenericName()`
-// Is the `name` tag generic?
-//
-// Arguments
-//   `tags`: `Object` containing the feature's OSM tags
-// Returns
-//   `true` if it is generic, `false` if not
-//
-function _isGenericName(tags) {
-  const n = tags.name;
-  if (!n) return false;
-
-  // tryNames just contains the `name` tag value and nothing else
-  const tryNames = { primary: new Set([n]), alternate: new Set() };
-
-  // Gather key/value tag pairs to try to match
-  const tryKVs = gatherKVs(tags);
-  if (!tryKVs.primary.size && !tryKVs.alternate.size)  return false;
-
-  // Order the [key,value,name] tuples - test primary before alternate
-  const tuples = gatherTuples(tryKVs, tryNames);
-
-  for (let i = 0; i < tuples.length; i++) {
-    const tuple = tuples[i];
-    const hits = _nsi.matcher.match(tuple.k, tuple.v, tuple.n);   // Attempt to match an item in NSI
-
-    // If we get a `excludeGeneric` hit, this is a generic name.
-    if (hits && hits.length && hits[0].match === 'excludeGeneric') return true;
-  }
-
-  return false;
-}
-
-
-
-// PUBLIC INTERFACE
-
-export default {
-
-  // `init()`
-  // On init, start preparing the name-suggestion-index
-  //
-  init: () => {
-    // Note: service.init is called immediately after the presetManager has started loading its data.
-    // We expect to chain onto an unfulfilled promise here.
-    setNsiSources();
-    presetManager.ensureLoaded()
-      .then(() => loadNsiPresets())
-      .then(() => loadNsiData())
-      .then(() => _nsiStatus = 'ok')
-      .catch(e => {
-        console.error(e);  // eslint-disable-line
-        _nsiStatus = 'failed';
-      });
-  },
-
-
-  // `reset()`
-  // Reset is called when user saves data to OSM (does nothing here)
-  //
-  reset: () => {},
-
-
-  // `status()`
-  // To let other code know how it's going...
-  //
-  // Returns
-  //   `String`: 'loading', 'ok', 'failed'
-  //
-  status: () => _nsiStatus,
-
-
-  // `isGenericName()`
-  // Is the `name` tag generic?
-  //
-  // Arguments
-  //   `tags`: `Object` containing the feature's OSM tags
-  // Returns
-  //   `true` if it is generic, `false` if not
-  //
-  isGenericName: (tags) => _isGenericName(tags),
-
-
-  // `upgradeTags()`
-  // Suggest tag upgrades.
-  // This function will not modify the input tags, it makes a copy.
-  //
-  // Arguments
-  //   `tags`: `Object` containing the feature's OSM tags
-  //   `loc`: Location where this feature exists, as a [lon, lat]
-  // Returns
-  //   `Object` containing the result, or `null` if no changes needed:
-  //   {
-  //     'newTags': `Object` - The tags the the feature should have
-  //     'matched': `Object` - The matched item
-  //   }
-  //
-  upgradeTags: (tags, loc) => _upgradeTags(tags, loc),
-
-
-  // `cache()`
-  // Direct access to the NSI cache, useful for testing or breaking things
-  //
-  // Returns
-  //   `Object`: the internal NSI cache
-  //
-  cache: () => _nsi
-};
diff --git a/modules/services/osm.js b/modules/services/osm.js
deleted file mode 100644
index ea46a6ee51..0000000000
--- a/modules/services/osm.js
+++ /dev/null
@@ -1,1535 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { json as d3_json, xml as d3_xml } from 'd3-fetch';
-import { Extent, Projection, Tiler, geoZoomToScale, vecAdd } from '@rapid-sdk/math';
-import { utilArrayChunk, utilArrayGroupBy, utilArrayUniq, utilObjectOmit, utilQsString, utilStringQs } from '@rapid-sdk/util';
-import _throttle from 'lodash-es/throttle';
-import { osmAuth } from 'osm-auth';
-import RBush from 'rbush';
-
-import { JXON } from '../util/jxon';
-import { locationManager } from '../core/LocationManager';
-import { osmEntity, osmNode, osmNote, osmRelation, osmWay } from '../osm';
-import { utilRebind } from '../util';
-
-
-var tiler = new Tiler();
-var dispatch = d3_dispatch('apiStatusChange', 'authLoading', 'authDone', 'change', 'loading', 'loaded', 'loadedNotes');
-
-var urlroot = 'https://www.openstreetmap.org';
-var q = utilStringQs(window.location.hash);
-var credentialsMode = 'omit';
-if (q.hasOwnProperty('osm_api_url')) {
-    urlroot = q.osm_api_url;
-    credentialsMode = 'include';
-}
-
-var origin = window.location.origin;
-var redirectPath;
-// We often deploy different test builds to other pathnames, but we can always
-// redirect to the common /rapid/land.html redirect_uri to complete OAuth2 on that domain.
-if (origin === 'https://mapwith.ai') {
-    redirectPath = 'https://mapwith.ai/rapid/';
-} else if (origin === 'https://rapideditor.org') {
-    redirectPath = 'https://rapideditor.org/rapid/';
-} else {
-    redirectPath = window.location.origin + window.location.pathname;
-}
-
-var oauth = osmAuth({
-    url: urlroot,
-    client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
-    client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE',
-    scope: 'read_prefs write_prefs write_api read_gpx write_notes',
-    redirect_uri: redirectPath + 'land.html',
-    loading: authLoading,
-    done: authDone
-});
-
-// hardcode default block of Google Maps
-var _imageryBlocklists = [/.*\.google(apis)?\..*\/(vt|kh)[\?\/].*([xyz]=.*){3}.*/];
-var _tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: new RBush() };
-var _noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: new RBush() };
-var _userCache = { toLoad: {}, user: {} };
-var _cachedApiStatus;
-var _changeset = {};
-
-var _deferred = new Set();
-var _connectionID = 1;
-var _tileZoom = 16;
-var _noteZoom = 12;
-var _rateLimitError;
-var _userChangesets;
-var _userDetails;
-var _off;
-
-// set a default but also load this from the API status
-var _maxWayNodes = 2000;
-
-
-function authLoading() {
-    dispatch.call('authLoading');
-}
-
-
-function authDone() {
-    dispatch.call('authDone');
-}
-
-
-function abortRequest(controllerOrXHR) {
-    if (controllerOrXHR) {
-        controllerOrXHR.abort();
-    }
-}
-
-
-function hasInflightRequests(cache) {
-    return Object.keys(cache.inflight).length;
-}
-
-
-function abortUnwantedRequests(cache, visibleTiles) {
-    Object.keys(cache.inflight).forEach(function(k) {
-        if (cache.toLoad[k]) return;
-        if (visibleTiles.find(function(tile) { return k === tile.id; })) return;
-
-        abortRequest(cache.inflight[k]);
-        delete cache.inflight[k];
-    });
-}
-
-
-function getLoc(attrs) {
-    var lon = attrs.lon && attrs.lon.value;
-    var lat = attrs.lat && attrs.lat.value;
-    return [parseFloat(lon), parseFloat(lat)];
-}
-
-
-function getNodes(obj) {
-    var elems = obj.getElementsByTagName('nd');
-    var nodes = new Array(elems.length);
-    for (var i = 0, l = elems.length; i < l; i++) {
-        nodes[i] = 'n' + elems[i].attributes.ref.value;
-    }
-    return nodes;
-}
-
-function getNodesJSON(obj) {
-    var elems = obj.nodes;
-    var nodes = new Array(elems.length);
-    for (var i = 0, l = elems.length; i < l; i++) {
-        nodes[i] = 'n' + elems[i];
-    }
-    return nodes;
-}
-
-function getTags(obj) {
-    var elems = obj.getElementsByTagName('tag');
-    var tags = {};
-    for (var i = 0, l = elems.length; i < l; i++) {
-        var attrs = elems[i].attributes;
-        tags[attrs.k.value] = attrs.v.value;
-    }
-
-    return tags;
-}
-
-
-function getMembers(obj) {
-    var elems = obj.getElementsByTagName('member');
-    var members = new Array(elems.length);
-    for (var i = 0, l = elems.length; i < l; i++) {
-        var attrs = elems[i].attributes;
-        members[i] = {
-            id: attrs.type.value[0] + attrs.ref.value,
-            type: attrs.type.value,
-            role: attrs.role.value
-        };
-    }
-    return members;
-}
-
-function getMembersJSON(obj) {
-    var elems = obj.members;
-    var members = new Array(elems.length);
-    for (var i = 0, l = elems.length; i < l; i++) {
-        var attrs = elems[i];
-        members[i] = {
-            id: attrs.type[0] + attrs.ref,
-            type: attrs.type,
-            role: attrs.role
-        };
-    }
-    return members;
-}
-
-function getVisible(attrs) {
-    return (!attrs.visible || attrs.visible.value !== 'false');
-}
-
-
-function parseComments(comments) {
-    var parsedComments = [];
-
-    // for each comment
-    for (var i = 0; i < comments.length; i++) {
-        var comment = comments[i];
-        if (comment.nodeName === 'comment') {
-            var childNodes = comment.childNodes;
-            var parsedComment = {};
-
-            for (var j = 0; j < childNodes.length; j++) {
-                var node = childNodes[j];
-                var nodeName = node.nodeName;
-                if (nodeName === '#text') continue;
-                parsedComment[nodeName] = node.textContent;
-
-                if (nodeName === 'uid') {
-                    var uid = node.textContent;
-                    if (uid && !_userCache.user[uid]) {
-                        _userCache.toLoad[uid] = true;
-                    }
-                }
-            }
-
-            if (parsedComment) {
-                parsedComments.push(parsedComment);
-            }
-        }
-    }
-    return parsedComments;
-}
-
-
-function encodeNoteRtree(note) {
-    return {
-        minX: note.loc[0],
-        minY: note.loc[1],
-        maxX: note.loc[0],
-        maxY: note.loc[1],
-        data: note
-    };
-}
-
-
-var jsonparsers = {
-
-    node: function nodeData(obj, uid) {
-        return new osmNode({
-            id:  uid,
-            visible: typeof obj.visible === 'boolean' ? obj.visible : true,
-            version: obj.version && obj.version.toString(),
-            changeset: obj.changeset && obj.changeset.toString(),
-            timestamp: obj.timestamp,
-            user: obj.user,
-            uid: obj.uid && obj.uid.toString(),
-            loc: [parseFloat(obj.lon), parseFloat(obj.lat)],
-            tags: obj.tags
-        });
-    },
-
-    way: function wayData(obj, uid) {
-        return new osmWay({
-            id:  uid,
-            visible: typeof obj.visible === 'boolean' ? obj.visible : true,
-            version: obj.version && obj.version.toString(),
-            changeset: obj.changeset && obj.changeset.toString(),
-            timestamp: obj.timestamp,
-            user: obj.user,
-            uid: obj.uid && obj.uid.toString(),
-            tags: obj.tags,
-            nodes: getNodesJSON(obj)
-        });
-    },
-
-    relation: function relationData(obj, uid) {
-        return new osmRelation({
-            id:  uid,
-            visible: typeof obj.visible === 'boolean' ? obj.visible : true,
-            version: obj.version && obj.version.toString(),
-            changeset: obj.changeset && obj.changeset.toString(),
-            timestamp: obj.timestamp,
-            user: obj.user,
-            uid: obj.uid && obj.uid.toString(),
-            tags: obj.tags,
-            members: getMembersJSON(obj)
-        });
-    },
-
-    user: function parseUser(obj, uid) {
-        return {
-            id: uid,
-            display_name: obj.display_name,
-            account_created: obj.account_created,
-            image_url: obj.img && obj.img.href,
-            changesets_count: obj.changesets && obj.changesets.count && obj.changesets.count.toString() || '0',
-            active_blocks: obj.blocks && obj.blocks.received && obj.blocks.received.active && obj.blocks.received.active.toString() || '0'
-        };
-    }
-};
-
-
-/**
- * parseJSON
- * @param payload
- * @param callback
- * @param options
- */
-function parseJSON(payload, callback, options) {
-  options = Object.assign({ skipSeen: true }, options);
-
-  if (!payload)  {
-    return callback({ message: 'No JSON', status: -1 });
-  }
-
-  let json = payload;
-  if (typeof json !== 'object') {
-    json = JSON.parse(payload);
-  }
-  if (!json.elements) {
-    return callback({ message: 'No JSON', status: -1 });
-  }
-  if (json.elements.some(el => el.type === 'error')) {
-      // We have received partial data, and so we should ignore this response.
-      return callback({ message: 'Partial JSON', status: -1 });
-  }
-
-  const children = json.elements;
-
-  const handle = window.requestIdleCallback(() => {
-    _deferred.delete(handle);
-
-    let results = { data: [], seenIDs: new Set() };
-
-    for (let i = 0; i < children.length; i++) {
-      const child = children[i];
-      const parser = jsonparsers[child.type];
-      if (!parser) continue;
-
-      const uid = osmEntity.id.fromOSM(child.type, child.id);
-      results.seenIDs.add(uid);
-
-      if (options.skipSeen) {
-        if (_tileCache.seen[uid]) continue;  // avoid reparsing a "seen" entity
-        _tileCache.seen[uid] = true;
-      }
-
-      const parsed = parser(child, uid);
-      if (parsed) {
-        results.data.push(parsed);
-      }
-    }
-
-    callback(null, results);
-  });
-
-  _deferred.add(handle);
-}
-
-
-/**
- * parseUserJSON
- * @param payload
- * @param callback
- * @param options
- */
-function parseUserJSON(payload, callback, options) {
-  options = Object.assign({ skipSeen: true }, options);
-
-  if (!payload)  {
-    return callback({ message: 'No JSON', status: -1 });
-  }
-
-  let json = payload;
-  if (typeof json !== 'object') {
-    json = JSON.parse(payload);
-  }
-
-  if (!json.users && !json.user) {
-    return callback({ message: 'No JSON', status: -1 });
-  }
-
-  const objects = json.users || [json];
-
-  const handle = window.requestIdleCallback(() => {
-    _deferred.delete(handle);
-
-    let results = { data: [], seenIDs: new Set() };
-
-    for (let i = 0; i < objects.length; i++) {
-      const obj = objects[i];
-      const uid = obj.user.id && obj.user.id.toString();
-      results.seenIDs.add(uid);
-
-      if (options.skipSeen && _userCache.user[uid]) {  // avoid reparsing a "seen" entity
-        delete _userCache.toLoad[uid];
-        continue;
-      }
-
-      const user = jsonparsers.user(obj.user, uid);
-      if (user) {
-        delete _userCache.toLoad[uid];
-        _userCache.user[uid] = user;
-        results.data.push(user);
-      }
-    }
-
-    callback(null, results);
-
-  });
-
-  _deferred.add(handle);
-}
-
-
-
-
-var parsers = {
-    node: function nodeData(obj, uid) {
-        var attrs = obj.attributes;
-        return new osmNode({
-            id: uid,
-            visible: getVisible(attrs),
-            version: attrs.version.value,
-            changeset: attrs.changeset && attrs.changeset.value,
-            timestamp: attrs.timestamp && attrs.timestamp.value,
-            user: attrs.user && attrs.user.value,
-            uid: attrs.uid && attrs.uid.value,
-            loc: getLoc(attrs),
-            tags: getTags(obj)
-        });
-    },
-
-    way: function wayData(obj, uid) {
-        var attrs = obj.attributes;
-        return new osmWay({
-            id: uid,
-            visible: getVisible(attrs),
-            version: attrs.version.value,
-            changeset: attrs.changeset && attrs.changeset.value,
-            timestamp: attrs.timestamp && attrs.timestamp.value,
-            user: attrs.user && attrs.user.value,
-            uid: attrs.uid && attrs.uid.value,
-            tags: getTags(obj),
-            nodes: getNodes(obj),
-        });
-    },
-
-    relation: function relationData(obj, uid) {
-        var attrs = obj.attributes;
-        return new osmRelation({
-            id: uid,
-            visible: getVisible(attrs),
-            version: attrs.version.value,
-            changeset: attrs.changeset && attrs.changeset.value,
-            timestamp: attrs.timestamp && attrs.timestamp.value,
-            user: attrs.user && attrs.user.value,
-            uid: attrs.uid && attrs.uid.value,
-            tags: getTags(obj),
-            members: getMembers(obj)
-        });
-    },
-
-    note: function parseNote(obj, uid) {
-        var attrs = obj.attributes;
-        var childNodes = obj.childNodes;
-        var props = {};
-
-        props.id = uid;
-        props.loc = getLoc(attrs);
-
-        // if notes are coincident, move them apart slightly
-        var coincident = false;
-        var epsilon = 0.00001;
-        do {
-            if (coincident) {
-                props.loc = vecAdd(props.loc, [epsilon, epsilon]);
-            }
-            var bbox = new Extent(props.loc).bbox();
-            coincident = _noteCache.rtree.search(bbox).length;
-        } while (coincident);
-
-        // parse note contents
-        for (var i = 0; i < childNodes.length; i++) {
-            var node = childNodes[i];
-            var nodeName = node.nodeName;
-            if (nodeName === '#text') continue;
-
-            // if the element is comments, parse the comments
-            if (nodeName === 'comments') {
-                props[nodeName] = parseComments(node.childNodes);
-            } else {
-                props[nodeName] = node.textContent;
-            }
-        }
-
-        var note = new osmNote(props);
-        var item = encodeNoteRtree(note);
-        _noteCache.note[note.id] = note;
-        _noteCache.rtree.insert(item);
-
-        return note;
-    },
-
-    user: function parseUser(obj, uid) {
-        var attrs = obj.attributes;
-        var user = {
-            id: uid,
-            display_name: attrs.display_name && attrs.display_name.value,
-            account_created: attrs.account_created && attrs.account_created.value,
-            changesets_count: '0',
-            active_blocks: '0'
-        };
-
-        var img = obj.getElementsByTagName('img');
-        if (img && img[0] && img[0].getAttribute('href')) {
-            user.image_url = img[0].getAttribute('href');
-        }
-
-        var changesets = obj.getElementsByTagName('changesets');
-        if (changesets && changesets[0] && changesets[0].getAttribute('count')) {
-            user.changesets_count = changesets[0].getAttribute('count');
-        }
-
-        var blocks = obj.getElementsByTagName('blocks');
-        if (blocks && blocks[0]) {
-            var received = blocks[0].getElementsByTagName('received');
-            if (received && received[0] && received[0].getAttribute('active')) {
-                user.active_blocks = received[0].getAttribute('active');
-            }
-        }
-
-        _userCache.user[uid] = user;
-        delete _userCache.toLoad[uid];
-        return user;
-    }
-};
-
-
-/**
- * parseXML
- * @param xml
- * @param callback
- * @param options
- */
-function parseXML(xml, callback, options) {
-  options = Object.assign({ skipSeen: true }, options);
-
-  if (!xml || !xml.childNodes) {
-    return callback({ message: 'No XML', status: -1 });
-  }
-
-  const root = xml.childNodes[0];
-  const children = Array.from(root.childNodes);
-  if (children.some(child => child.nodename === 'error')) {
-    return callback({ message: 'Partial XML', status: -1 });
-  }
-
-  const handle = window.requestIdleCallback(() => {
-    _deferred.delete(handle);
-
-    let results = { data: [], seenIDs: new Set() };
-
-    for (let i = 0; i < children.length; i++) {
-      const child = children[i];
-      const parser = parsers[child.nodeName];
-      if (!parser) continue;
-
-      let uid;
-      if (child.nodeName === 'user') {
-        uid = child.attributes.id.value;
-        results.seenIDs.add(uid);
-
-        if (options.skipSeen && _userCache.user[uid]) {  // avoid reparsing a "seen" entity
-          delete _userCache.toLoad[uid];
-          continue;
-        }
-
-      } else if (child.nodeName === 'note') {
-        uid = child.getElementsByTagName('id')[0].textContent;
-        results.seenIDs.add(uid);
-
-      } else {
-        uid = osmEntity.id.fromOSM(child.nodeName, child.attributes.id.value);
-        results.seenIDs.add(uid);
-
-        if (options.skipSeen) {
-          if (_tileCache.seen[uid]) continue;  // avoid reparsing a "seen" entity
-          _tileCache.seen[uid] = true;
-        }
-      }
-
-      const parsed = parser(child, uid);
-      if (parsed) {
-        results.data.push(parsed);
-      }
-    }
-
-    callback(null, results);
-  });
-
-  _deferred.add(handle);
-}
-
-
-// replace or remove note from rtree
-function updateRtree(item, replace) {
-    _noteCache.rtree.remove(item, function isEql(a, b) { return a.data.id === b.data.id; });
-
-    if (replace) {
-        _noteCache.rtree.insert(item);
-    }
-}
-
-
-function wrapcb(thisArg, callback, cid) {
-    return function(err, result) {
-        if (err) {
-            // 400 Bad Request, 401 Unauthorized, 403 Forbidden..
-            if (err.status === 400 || err.status === 401 || err.status === 403) {
-                thisArg.logout();
-            }
-            return callback.call(thisArg, err);
-
-        } else if (thisArg.getConnectionId() !== cid) {
-            return callback.call(thisArg, { message: 'Connection Switched', status: -1 });
-
-        } else {
-            return callback.call(thisArg, err, result);
-        }
-    };
-}
-
-
-export default {
-
-    init: function() {
-        utilRebind(this, dispatch, 'on');
-    },
-
-
-    reset: function() {
-        Array.from(_deferred).forEach(function(handle) {
-            window.cancelIdleCallback(handle);
-            _deferred.delete(handle);
-        });
-
-        _connectionID++;
-        _userChangesets = undefined;
-        _userDetails = undefined;
-        _rateLimitError = undefined;
-
-        Object.values(_tileCache.inflight).forEach(abortRequest);
-        Object.values(_noteCache.inflight).forEach(abortRequest);
-        Object.values(_noteCache.inflightPost).forEach(abortRequest);
-        if (_changeset.inflight) abortRequest(_changeset.inflight);
-
-        _tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: new RBush() };
-        _noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: new RBush() };
-        _userCache = { toLoad: {}, user: {} };
-        _cachedApiStatus = undefined;
-        _changeset = {};
-
-        return this;
-    },
-
-
-    getConnectionId: function() {
-        return _connectionID;
-    },
-
-
-    getUrlRoot: function() {
-        return urlroot;
-    },
-
-
-    changesetURL: function(changesetID) {
-        return urlroot + '/changeset/' + changesetID;
-    },
-
-
-    changesetsURL: function(center, zoom) {
-        var precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-        return urlroot + '/history#map=' +
-            Math.floor(zoom) + '/' +
-            center[1].toFixed(precision) + '/' +
-            center[0].toFixed(precision);
-    },
-
-
-    entityURL: function(entity) {
-        return urlroot + '/' + entity.type + '/' + entity.osmId();
-    },
-
-
-    historyURL: function(entity) {
-        return urlroot + '/' + entity.type + '/' + entity.osmId() + '/history';
-    },
-
-
-    userURL: function(username) {
-        return urlroot + '/user/' + username;
-    },
-
-
-    noteURL: function(note) {
-        return urlroot + '/note/' + note.id;
-    },
-
-
-    noteReportURL: function(note) {
-        return urlroot + '/reports/new?reportable_type=Note&reportable_id=' + note.id;
-    },
-
-
-    // Generic method to load data from the OSM API
-    // Can handle either auth or unauth calls.
-    loadFromAPI: function(path, callback, options) {
-        options = Object.assign({ skipSeen: true }, options);
-        var that = this;
-        var cid = _connectionID;
-
-        function done(err, payload) {
-            if (that.getConnectionId() !== cid) {
-                if (callback) callback({ message: 'Connection Switched', status: -1 });
-                return;
-            }
-
-            var isAuthenticated = that.authenticated();
-
-            // 400 Bad Request, 401 Unauthorized, 403 Forbidden
-            // Logout and retry the request..
-            if (isAuthenticated && err && err.status &&
-                    (err.status === 400 || err.status === 401 || err.status === 403)) {
-                that.logout();
-                that.loadFromAPI(path, callback, options);
-
-            // else, no retry..
-            } else {
-                // 509 Bandwidth Limit Exceeded, 429 Too Many Requests
-                // Set the rateLimitError flag and trigger a warning..
-                if (!isAuthenticated && !_rateLimitError && err && err.status &&
-                        (err.status === 509 || err.status === 429)) {
-                    _rateLimitError = err;
-                    dispatch.call('change');
-                    that.reloadApiStatus();
-
-                } else if ((err && _cachedApiStatus === 'online') ||
-                    (!err && _cachedApiStatus !== 'online')) {
-                    // If the response's error state doesn't match the status,
-                    // it's likely we lost or gained the connection so reload the status
-                    that.reloadApiStatus();
-                }
-
-                if (callback) {
-                    if (err) {
-                        return callback(err);
-                    } else {
-                        if (path.indexOf('.json') !== -1) {
-                            return parseJSON(payload, callback, options);
-                        } else {
-                            return parseXML(payload, callback, options);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (this.authenticated()) {
-            return oauth.xhr({ method: 'GET', path: path }, done);
-        } else {
-            var url = urlroot + path;
-            var controller = new AbortController();
-            var fn;
-            if (path.indexOf('.json') !== -1) {
-                fn = d3_json;
-            } else {
-                fn = d3_xml;
-            }
-
-            fn(url, { signal: controller.signal })
-                .then(function(data) {
-                    done(null, data);
-                })
-                .catch(function(err) {
-                    if (err.name === 'AbortError') return;
-                    // d3-fetch includes status in the error message,
-                    // but we can't access the response itself
-                    // https://github.com/d3/d3-fetch/issues/27
-                    var match = err.message.match(/^\d{3}/);
-                    if (match) {
-                        done({ status: +match[0], statusText: err.message });
-                    } else {
-                        done(err.message);
-                    }
-                });
-            return controller;
-        }
-    },
-
-
-    // Load a single entity by id (ways and relations use the `/full` call to include
-    // nodes and members). Parent relations are not included, see `loadEntityRelations`.
-    // GET /api/0.6/node/#id
-    // GET /api/0.6/[way|relation]/#id/full
-    loadEntity: function(id, callback) {
-        var type = osmEntity.id.type(id);
-        var osmID = osmEntity.id.toOSM(id);
-        var options = { skipSeen: false };
-
-        this.loadFromAPI(
-            '/api/0.6/' + type + '/' + osmID + (type !== 'node' ? '/full' : '') + '.json',
-            callback,
-            options
-        );
-    },
-
-
-    // Load a single entity with a specific version
-    // GET /api/0.6/[node|way|relation]/#id/#version
-    loadEntityVersion: function(id, version, callback) {
-        var type = osmEntity.id.type(id);
-        var osmID = osmEntity.id.toOSM(id);
-        var options = { skipSeen: false };
-
-        this.loadFromAPI(
-            '/api/0.6/' + type + '/' + osmID + '/' + version + '.json',
-            callback,
-            options
-        );
-    },
-
-
-    // Load the relations of a single entity with the given.
-    // GET /api/0.6/[node|way|relation]/#id/relations
-    loadEntityRelations: function(id, callback) {
-        var type = osmEntity.id.type(id);
-        var osmID = osmEntity.id.toOSM(id);
-        var options = { skipSeen: false };
-
-        this.loadFromAPI(
-            '/api/0.6/' + type + '/' + osmID + '/relations.json',
-            callback,
-            options
-        );
-    },
-
-
-    // Load multiple entities in chunks
-    // (note: callback may be called multiple times)
-    // Unlike `loadEntity`, child nodes and members are not fetched
-    // GET /api/0.6/[nodes|ways|relations]?#parameters
-    loadMultiple: function(ids, callback) {
-        var that = this;
-        var groups = utilArrayGroupBy(utilArrayUniq(ids), osmEntity.id.type);
-
-        Object.keys(groups).forEach(function(k) {
-            var type = k + 's';   // nodes, ways, relations
-            var osmIDs = groups[k].map(function(id) { return osmEntity.id.toOSM(id); });
-            var options = { skipSeen: false };
-
-            utilArrayChunk(osmIDs, 150).forEach(function(arr) {
-                that.loadFromAPI(
-                    '/api/0.6/' + type + '.json?' + type + '=' + arr.join(),
-                    callback,
-                    options
-                );
-            });
-        });
-    },
-
-
-    // Create, upload, and close a changeset
-    // PUT /api/0.6/changeset/create
-    // POST /api/0.6/changeset/#id/upload
-    // PUT /api/0.6/changeset/#id/close
-    putChangeset: function(changeset, changes, callback) {
-        var cid = _connectionID;
-
-        if (_changeset.inflight) {
-            return callback({ message: 'Changeset already inflight', status: -2 }, changeset);
-
-        } else if (_changeset.open) {   // reuse existing open changeset..
-            return createdChangeset.call(this, null, _changeset.open);
-
-        } else {   // Open a new changeset..
-            var options = {
-                method: 'PUT',
-                path: '/api/0.6/changeset/create',
-                headers: { 'Content-Type': 'text/xml' },
-                content: JXON.stringify(changeset.asJXON())
-            };
-            _changeset.inflight = oauth.xhr(
-                options,
-                wrapcb(this, createdChangeset, cid)
-            );
-        }
-
-
-        function createdChangeset(err, changesetID) {
-            _changeset.inflight = null;
-            if (err) { return callback(err, changeset); }
-
-            _changeset.open = changesetID;
-            changeset = changeset.update({ id: changesetID });
-
-            // Upload the changeset..
-            var options = {
-                method: 'POST',
-                path: '/api/0.6/changeset/' + changesetID + '/upload',
-                headers: { 'Content-Type': 'text/xml' },
-                content: JXON.stringify(changeset.osmChangeJXON(changes))
-            };
-            _changeset.inflight = oauth.xhr(
-                options,
-                wrapcb(this, uploadedChangeset, cid)
-            );
-        }
-
-
-        function uploadedChangeset(err) {
-            _changeset.inflight = null;
-            if (err) return callback(err, changeset);
-
-            // Upload was successful, safe to call the callback.
-            // Add delay to allow for postgres replication #1646 #2678
-            window.setTimeout(function() { callback(null, changeset); }, 2500);
-            _changeset.open = null;
-
-            // At this point, we don't really care if the connection was switched..
-            // Only try to close the changeset if we're still talking to the same server.
-            if (this.getConnectionId() === cid) {
-                // Still attempt to close changeset, but ignore response because #2667
-                oauth.xhr({
-                    method: 'PUT',
-                    path: '/api/0.6/changeset/' + changeset.id + '/close',
-                    headers: { 'Content-Type': 'text/xml' }
-                }, function() { return true; });
-            }
-        }
-    },
-
-
-    // Load multiple users in chunks
-    // (note: callback may be called multiple times)
-    // GET /api/0.6/users?users=#id1,#id2,...,#idn
-    loadUsers: function(uids, callback) {
-        var toLoad = [];
-        var cached = [];
-
-        utilArrayUniq(uids).forEach(function(uid) {
-            if (_userCache.user[uid]) {
-                delete _userCache.toLoad[uid];
-                cached.push(_userCache.user[uid]);
-            } else {
-                toLoad.push(uid);
-            }
-        });
-
-        if (cached.length || !this.authenticated()) {
-            callback(undefined, cached);
-            if (!this.authenticated()) return;  // require auth
-        }
-
-        utilArrayChunk(toLoad, 150).forEach(function(arr) {
-            oauth.xhr(
-                { method: 'GET', path: '/api/0.6/users.json?users=' + arr.join() },
-                wrapcb(this, done, _connectionID)
-            );
-        }.bind(this));
-
-        function done(err, payload) {
-            if (err) return callback(err);
-
-            var options = { skipSeen: true };
-            return parseUserJSON(payload, function(err, results) {
-                if (err) return callback(err);
-                return callback(undefined, results.data);
-            }, options);
-        }
-    },
-
-
-    // Load a given user by id
-    // GET /api/0.6/user/#id
-    loadUser: function(uid, callback) {
-        if (_userCache.user[uid] || !this.authenticated()) {   // require auth
-            delete _userCache.toLoad[uid];
-            return callback(undefined, _userCache.user[uid]);
-        }
-
-        oauth.xhr(
-            { method: 'GET', path: '/api/0.6/user/' + uid + '.json' },
-            wrapcb(this, done, _connectionID)
-        );
-
-        function done(err, payload) {
-            if (err) return callback(err);
-
-            var options = { skipSeen: true };
-            return parseUserJSON(payload, function(err, results) {
-                if (err) return callback(err);
-                return callback(undefined, results.data[0]);
-            }, options);
-        }
-    },
-
-
-    // Load the details of the logged-in user
-    // GET /api/0.6/user/details
-    userDetails: function(callback) {
-        if (_userDetails) {    // retrieve cached
-            return callback(undefined, _userDetails);
-        }
-
-        oauth.xhr(
-            { method: 'GET', path: '/api/0.6/user/details.json' },
-            wrapcb(this, done, _connectionID)
-        );
-
-        function done(err, payload) {
-            if (err) return callback(err);
-
-            var options = { skipSeen: false };
-            return parseUserJSON(payload, function(err, results) {
-                if (err) return callback(err);
-                _userDetails = results.data[0];
-                return callback(undefined, _userDetails);
-            }, options);
-        }
-    },
-
-
-    // Load previous changesets for the logged in user
-    // GET /api/0.6/changesets?user=#id
-    userChangesets: function(callback) {
-        if (_userChangesets) {    // retrieve cached
-            return callback(undefined, _userChangesets);
-        }
-
-        this.userDetails(
-            wrapcb(this, gotDetails, _connectionID)
-        );
-
-
-        function gotDetails(err, user) {
-            if (err) { return callback(err); }
-
-            oauth.xhr(
-                { method: 'GET', path: '/api/0.6/changesets?user=' + user.id },
-                wrapcb(this, done, _connectionID)
-            );
-        }
-
-        function done(err, xml) {
-            if (err) { return callback(err); }
-
-            _userChangesets = Array.prototype.map.call(
-                xml.getElementsByTagName('changeset'),
-                function (changeset) { return { tags: getTags(changeset) }; }
-            ).filter(function (changeset) {
-                var comment = changeset.tags.comment;
-                return comment && comment !== '';
-            });
-
-            return callback(undefined, _userChangesets);
-        }
-    },
-
-
-    // Fetch the status of the OSM API
-    // GET /api/capabilities
-    status: function(callback) {
-        var url = urlroot + '/api/capabilities';
-        var errback = wrapcb(this, done, _connectionID);
-        d3_xml(url, { credentials: credentialsMode })
-            .then(function(data) { errback(null, data); })
-            .catch(function(err) { errback(err.message); });
-
-        function done(err, xml) {
-            if (err) {
-                // the status is null if no response could be retrieved
-                return callback(err, null);
-            }
-
-            // update blocklists
-            var elements = xml.getElementsByTagName('blacklist');
-            var regexes = [];
-            for (var i = 0; i < elements.length; i++) {
-                var regexString = elements[i].getAttribute('regex');  // needs unencode?
-                if (regexString) {
-                    try {
-                        var regex = new RegExp(regexString);
-                        regexes.push(regex);
-                    } catch (e) {
-                        /* noop */
-                    }
-                }
-            }
-            if (regexes.length) {
-                _imageryBlocklists = regexes;
-            }
-
-            if (_rateLimitError) {
-                return callback(_rateLimitError, 'rateLimited');
-            } else {
-                var waynodes = xml.getElementsByTagName('waynodes');
-                var maxWayNodes = waynodes.length && parseInt(waynodes[0].getAttribute('maximum'), 10);
-                if (maxWayNodes && isFinite(maxWayNodes)) _maxWayNodes = maxWayNodes;
-
-                var apiStatus = xml.getElementsByTagName('status');
-                var val = apiStatus[0].getAttribute('api');
-                return callback(undefined, val);
-            }
-        }
-    },
-
-    // Calls `status` and dispatches an `apiStatusChange` event if the returned
-    // status differs from the cached status.
-    reloadApiStatus: function() {
-        // throttle to avoid unnecessary API calls
-        if (!this.throttledReloadApiStatus) {
-            var that = this;
-            this.throttledReloadApiStatus = _throttle(function() {
-                that.status(function(err, status) {
-                    if (status !== _cachedApiStatus) {
-                        _cachedApiStatus = status;
-                        dispatch.call('apiStatusChange', that, err, status);
-                    }
-                });
-            }, 500);
-        }
-        this.throttledReloadApiStatus();
-    },
-
-
-    // Returns the maximum number of nodes a single way can have
-    maxWayNodes: function() {
-        return _maxWayNodes;
-    },
-
-
-    // Load data (entities) from the API in tiles
-    // GET /api/0.6/map?bbox=
-    loadTiles: function(projection, callback) {
-        if (_off) return;
-
-        // determine the needed tiles to cover the view
-        var tiles = tiler
-            .zoomRange(_tileZoom)
-            .margin(1)       // prefetch offscreen tiles as well
-            .getTiles(projection)
-            .tiles;
-
-        // abort inflight requests that are no longer needed
-        var hadRequests = hasInflightRequests(_tileCache);
-        abortUnwantedRequests(_tileCache, tiles);
-        if (hadRequests && !hasInflightRequests(_tileCache)) {
-            dispatch.call('loaded');    // stop the spinner
-        }
-
-        // issue new requests..
-        tiles.forEach(function(tile) {
-            this.loadTile(tile, callback);
-        }, this);
-    },
-
-
-    // Load a single data tile
-    // GET /api/0.6/map?bbox=
-    loadTile: function(tile, callback) {
-        if (_off) return;
-        if (_tileCache.loaded[tile.id] || _tileCache.inflight[tile.id]) return;
-
-        // exit if this tile covers a blocked region (all corners are blocked)
-        const corners = tile.wgs84Extent.polygon().slice(0, 4);
-        const tileBlocked = corners.every(loc => locationManager.blocksAt(loc).length);
-        if (tileBlocked) {
-            _tileCache.loaded[tile.id] = true;   // don't try again
-            return;
-        }
-
-        if (!hasInflightRequests(_tileCache)) {
-            dispatch.call('loading');   // start the spinner
-        }
-
-        var path = '/api/0.6/map.json?bbox=';
-        var options = { skipSeen: true };
-
-        _tileCache.inflight[tile.id] = this.loadFromAPI(
-            path + tile.wgs84Extent.toParam(),
-            tileCallback,
-            options
-        );
-
-        function tileCallback(err, result) {
-            delete _tileCache.inflight[tile.id];
-            if (!err) {
-                delete _tileCache.toLoad[tile.id];
-                _tileCache.loaded[tile.id] = true;
-                var bbox = tile.wgs84Extent.bbox();
-                bbox.id = tile.id;
-                _tileCache.rtree.insert(bbox);
-            }
-            if (callback) {
-                callback(err, Object.assign({}, result, { tile: tile }));
-            }
-            if (!hasInflightRequests(_tileCache)) {
-                dispatch.call('loaded');     // stop the spinner
-            }
-        }
-    },
-
-
-    isDataLoaded: function(loc) {
-        var bbox = { minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1] };
-        return _tileCache.rtree.collides(bbox);
-    },
-
-
-    // load the tile that covers the given `loc`
-    loadTileAtLoc: function(loc, callback) {
-        // Back off if the toLoad queue is filling up.. re #6417
-        // (Currently `loadTileAtLoc` requests are considered low priority - used by operations to
-        // let users safely edit geometries which extend to unloaded tiles.  We can drop some.)
-        if (Object.keys(_tileCache.toLoad).length > 50) return;
-
-        var k = geoZoomToScale(_tileZoom + 1);
-        var offset = new Projection().scale(k).project(loc);
-        var proj = new Projection().transform({ k: k, x: -offset[0], y: -offset[1] });
-        var tiles = tiler.zoomRange(_tileZoom).getTiles(proj).tiles;
-
-        tiles.forEach(function(tile) {
-            if (_tileCache.toLoad[tile.id] || _tileCache.loaded[tile.id] || _tileCache.inflight[tile.id]) return;
-
-            _tileCache.toLoad[tile.id] = true;
-            this.loadTile(tile, callback);
-        }, this);
-    },
-
-
-    // Load notes from the API in tiles
-    // GET /api/0.6/notes?bbox=
-    loadNotes: function(projection, noteOptions) {
-        noteOptions = Object.assign({ limit: 10000, closed: 7 }, noteOptions);
-        if (_off) return;
-
-        var that = this;
-        var path = '/api/0.6/notes?limit=' + noteOptions.limit + '&closed=' + noteOptions.closed + '&bbox=';
-        var throttleLoadUsers = _throttle(function() {
-            var uids = Object.keys(_userCache.toLoad);
-            if (!uids.length) return;
-            that.loadUsers(uids, function() {});  // eagerly load user details
-        }, 750);
-
-        // determine the needed tiles to cover the view
-        var tiles = tiler
-            .zoomRange(_noteZoom)
-            .margin(1)       // prefetch offscreen tiles as well
-            .getTiles(projection)
-            .tiles;
-
-        // abort inflight requests that are no longer needed
-        abortUnwantedRequests(_noteCache, tiles);
-
-        // issue new requests..
-        tiles.forEach(function(tile) {
-            if (_noteCache.loaded[tile.id] || _noteCache.inflight[tile.id]) return;
-
-            // exit if this tile covers a blocked region (all corners are blocked)
-            const corners = tile.wgs84Extent.polygon().slice(0, 4);
-            const tileBlocked = corners.every(loc => locationManager.blocksAt(loc).length);
-            if (tileBlocked) {
-                _noteCache.loaded[tile.id] = true;   // don't try again
-                return;
-            }
-
-            var options = { skipSeen: false };
-            _noteCache.inflight[tile.id] = that.loadFromAPI(
-                path + tile.wgs84Extent.toParam(),
-                function(err) {
-                    delete _noteCache.inflight[tile.id];
-                    if (!err) {
-                        _noteCache.loaded[tile.id] = true;
-                    }
-                    throttleLoadUsers();
-                    dispatch.call('loadedNotes');
-                },
-                options
-            );
-        });
-    },
-
-
-    // Create a note
-    // POST /api/0.6/notes?params
-    postNoteCreate: function(note, callback) {
-        if (!this.authenticated()) {
-            return callback({ message: 'Not Authenticated', status: -3 }, note);
-        }
-        if (_noteCache.inflightPost[note.id]) {
-            return callback({ message: 'Note update already inflight', status: -2 }, note);
-        }
-
-        if (!note.loc[0] || !note.loc[1] || !note.newComment) return; // location & description required
-
-        var comment = note.newComment;
-        if (note.newCategory && note.newCategory !== 'None') { comment += ' #' + note.newCategory; }
-
-        var path = '/api/0.6/notes?' + utilQsString({ lon: note.loc[0], lat: note.loc[1], text: comment });
-
-        _noteCache.inflightPost[note.id] = oauth.xhr(
-            { method: 'POST', path: path },
-            wrapcb(this, done, _connectionID)
-        );
-
-
-        function done(err, xml) {
-            delete _noteCache.inflightPost[note.id];
-            if (err) { return callback(err); }
-
-            // we get the updated note back, remove from caches and reparse..
-            this.removeNote(note);
-
-            var options = { skipSeen: false };
-            return parseXML(xml, function(err, results) {
-                if (err) {
-                    return callback(err);
-                } else {
-                    return callback(undefined, results.data[0]);
-                }
-            }, options);
-        }
-    },
-
-
-    // Update a note
-    // POST /api/0.6/notes/#id/comment?text=comment
-    // POST /api/0.6/notes/#id/close?text=comment
-    // POST /api/0.6/notes/#id/reopen?text=comment
-    postNoteUpdate: function(note, newStatus, callback) {
-        if (!this.authenticated()) {
-            return callback({ message: 'Not Authenticated', status: -3 }, note);
-        }
-        if (_noteCache.inflightPost[note.id]) {
-            return callback({ message: 'Note update already inflight', status: -2 }, note);
-        }
-
-        var action;
-        if (note.status !== 'closed' && newStatus === 'closed') {
-            action = 'close';
-        } else if (note.status !== 'open' && newStatus === 'open') {
-            action = 'reopen';
-        } else {
-            action = 'comment';
-            if (!note.newComment) return; // when commenting, comment required
-        }
-
-        var path = '/api/0.6/notes/' + note.id + '/' + action;
-        if (note.newComment) {
-            path += '?' + utilQsString({ text: note.newComment });
-        }
-
-        _noteCache.inflightPost[note.id] = oauth.xhr(
-            { method: 'POST', path: path },
-            wrapcb(this, done, _connectionID)
-        );
-
-
-        function done(err, xml) {
-            delete _noteCache.inflightPost[note.id];
-            if (err) { return callback(err); }
-
-            // we get the updated note back, remove from caches and reparse..
-            this.removeNote(note);
-
-            // update closed note cache - used to populate `closed:note` changeset tag
-            if (action === 'close') {
-                _noteCache.closed[note.id] = true;
-            } else if (action === 'reopen') {
-                delete _noteCache.closed[note.id];
-            }
-
-            var options = { skipSeen: false };
-            return parseXML(xml, function(err, results) {
-                if (err) {
-                    return callback(err);
-                } else {
-                    return callback(undefined, results.data[0]);
-                }
-            }, options);
-        }
-    },
-
-
-    switch: function(newOptions) {
-        urlroot = newOptions.url;
-
-        // Copy the existing options, but omit 'access_token'.
-        // (if we did preauth, access_token won't work on a different server)
-        var oldOptions = utilObjectOmit(oauth.options(), 'access_token');
-        oauth.options(Object.assign(oldOptions, newOptions));
-
-        this.reset();
-        this.userChangesets(function() {});  // eagerly load user details/changesets
-        dispatch.call('change');
-        return this;
-    },
-
-
-    toggle: function(val) {
-        _off = !val;
-        return this;
-    },
-
-
-    isChangesetInflight: function() {
-        return !!_changeset.inflight;
-    },
-
-
-    // get/set cached data
-    // This is used to save/restore the state when entering/exiting the walkthrough
-    // Also used for testing purposes.
-    caches: function(obj) {
-        function cloneCache(source) {
-            var target = {};
-            Object.keys(source).forEach(function(k) {
-                if (k === 'rtree') {
-                    target.rtree = new RBush().fromJSON(source.rtree.toJSON());  // clone rbush
-                } else if (k === 'note') {
-                    target.note = {};
-                    Object.keys(source.note).forEach(function(id) {
-                        target.note[id] = osmNote(source.note[id]);   // copy notes
-                    });
-                } else {
-                    target[k] = JSON.parse(JSON.stringify(source[k]));   // clone deep
-                }
-            });
-            return target;
-        }
-
-        if (!arguments.length) {
-            return {
-                tile: cloneCache(_tileCache),
-                note: cloneCache(_noteCache),
-                user: cloneCache(_userCache)
-            };
-        }
-
-        // access caches directly for testing (e.g., loading notes rtree)
-        if (obj === 'get') {
-            return {
-                tile: _tileCache,
-                note: _noteCache,
-                user: _userCache
-            };
-        }
-
-        if (obj.tile) {
-            _tileCache = obj.tile;
-            _tileCache.inflight = {};
-        }
-        if (obj.note) {
-            _noteCache = obj.note;
-            _noteCache.inflight = {};
-            _noteCache.inflightPost = {};
-        }
-        if (obj.user) {
-            _userCache = obj.user;
-        }
-
-        return this;
-    },
-
-
-    logout: function() {
-        _userChangesets = undefined;
-        _userDetails = undefined;
-        oauth.logout();
-        dispatch.call('change');
-        return this;
-    },
-
-
-    authenticated: function() {
-        return oauth.authenticated();
-    },
-
-
-    authenticate: function(callback) {
-        var that = this;
-        var cid = _connectionID;
-        _userChangesets = undefined;
-        _userDetails = undefined;
-
-        function done(err, res) {
-            if (err) {
-                if (callback) callback(err);
-                return;
-            }
-            if (that.getConnectionId() !== cid) {
-                if (callback) callback({ message: 'Connection Switched', status: -1 });
-                return;
-            }
-            _rateLimitError = undefined;
-            dispatch.call('change');
-            if (callback) callback(err, res);
-            that.userChangesets(function() {});  // eagerly load user details/changesets
-        }
-
-        oauth.authenticate(done);
-    },
-
-
-    imageryBlocklists: function() {
-        return _imageryBlocklists;
-    },
-
-
-    // get all cached notes covering the viewport
-    notes: function(projection) {
-        var viewport = projection.dimensions();
-        var min = [viewport[0][0], viewport[1][1]];
-        var max = [viewport[1][0], viewport[0][1]];
-        var bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
-
-        return _noteCache.rtree.search(bbox)
-            .map(function(d) { return d.data; });
-    },
-
-
-    // get a single note from the cache
-    getNote: function(id) {
-        return _noteCache.note[id];
-    },
-
-
-    // remove a single note from the cache
-    removeNote: function(note) {
-        if (!(note instanceof osmNote) || !note.id) return;
-
-        delete _noteCache.note[note.id];
-        updateRtree(encodeNoteRtree(note), false);  // false = remove
-    },
-
-
-    // replace a single note in the cache
-    replaceNote: function(note) {
-        if (!(note instanceof osmNote) || !note.id) return;
-
-        _noteCache.note[note.id] = note;
-        updateRtree(encodeNoteRtree(note), true);  // true = replace
-        return note;
-    },
-
-
-    // Get an array of note IDs closed during this session.
-    // Used to populate `closed:note` changeset tag
-    getClosedIDs: function() {
-        return Object.keys(_noteCache.closed).sort();
-    }
-
-};
diff --git a/modules/services/osm_wikibase.js b/modules/services/osm_wikibase.js
deleted file mode 100644
index c78d0fe166..0000000000
--- a/modules/services/osm_wikibase.js
+++ /dev/null
@@ -1,347 +0,0 @@
-import { json as d3_json } from 'd3-fetch';
-import { utilQsString } from '@rapid-sdk/util';
-import _debounce from 'lodash-es/debounce';
-
-import { localizer } from '../core/localizer';
-
-
-var apibase = 'https://wiki.openstreetmap.org/w/api.php';
-var _inflight = {};
-var _wikibaseCache = {};
-var _localeIDs = { en: false };
-
-
-var debouncedRequest = _debounce(request, 500, { leading: false });
-
-function request(url, callback) {
-    if (_inflight[url]) return;
-    var controller = new AbortController();
-    _inflight[url] = controller;
-
-    d3_json(url, { signal: controller.signal })
-        .then(function(result) {
-            delete _inflight[url];
-            if (callback) callback(null, result);
-        })
-        .catch(function(err) {
-            delete _inflight[url];
-            if (err.name === 'AbortError') return;
-            if (callback) callback(err.message);
-        });
-}
-
-
-export default {
-
-    init: function() {
-        _inflight = {};
-        _wikibaseCache = {};
-        _localeIDs = {};
-    },
-
-
-    reset: function() {
-        Object.values(_inflight).forEach(function(controller) { controller.abort(); });
-        _inflight = {};
-    },
-
-
-    /**
-     * Get the best value for the property, or undefined if not found
-     * @param entity object from wikibase
-     * @param property string e.g. 'P4' for image
-     * @param langCode string e.g. 'fr' for French
-     */
-    claimToValue: function(entity, property, langCode) {
-        if (!entity.claims[property]) return undefined;
-        var locale = _localeIDs[langCode];
-        var preferredPick, localePick;
-
-        entity.claims[property].forEach(function(stmt) {
-            // If exists, use value limited to the needed language (has a qualifier P26 = locale)
-            // Or if not found, use the first value with the "preferred" rank
-            if (!preferredPick && stmt.rank === 'preferred') {
-                preferredPick = stmt;
-            }
-            if (locale && stmt.qualifiers && stmt.qualifiers.P26 &&
-                stmt.qualifiers.P26[0].datavalue.value.id === locale
-            ) {
-                localePick = stmt;
-            }
-        });
-
-        var result = localePick || preferredPick;
-        if (result) {
-            var datavalue = result.mainsnak.datavalue;
-            return datavalue.type === 'wikibase-entityid' ? datavalue.value.id : datavalue.value;
-        } else {
-            return undefined;
-        }
-    },
-
-
-    /**
-     * Convert monolingual property into a key-value object (language -> value)
-     * @param entity object from wikibase
-     * @param property string e.g. 'P31' for monolingual wiki page title
-     */
-    monolingualClaimToValueObj: function(entity, property) {
-        if (!entity || !entity.claims[property]) return undefined;
-
-        return entity.claims[property].reduce(function(acc, obj) {
-            var value = obj.mainsnak.datavalue.value;
-            acc[value.language] = value.text;
-            return acc;
-        }, {});
-    },
-
-
-    toSitelink: function(key, value) {
-        var result = value ? ('Tag:' + key + '=' + value) : 'Key:' + key;
-        return result.replace(/_/g, ' ').trim();
-    },
-
-
-    //
-    // Pass params object of the form:
-    // {
-    //   key: 'string',
-    //   value: 'string',
-    //   langCode: 'string'
-    // }
-    //
-    getEntity: function(params, callback) {
-        var doRequest = params.debounce ? debouncedRequest : request;
-        var that = this;
-        var titles = [];
-        var result = {};
-        var rtypeSitelink = (params.key === 'type' && params.value) ? ('Relation:' + params.value).replace(/_/g, ' ').trim() : false;
-        var keySitelink = params.key ? this.toSitelink(params.key) : false;
-        var tagSitelink = (params.key && params.value) ? this.toSitelink(params.key, params.value) : false;
-        var localeSitelink;
-
-        if (params.langCodes) {
-            params.langCodes.forEach(function(langCode) {
-                if (_localeIDs[langCode] === undefined) {
-                    // If this is the first time we are asking about this locale,
-                    // fetch corresponding entity (if it exists), and cache it.
-                    // If there is no such entry, cache `false` value to avoid re-requesting it.
-                    localeSitelink = ('Locale:' + langCode).replace(/_/g, ' ').trim();
-                    titles.push(localeSitelink);
-                }
-            });
-        }
-
-        if (rtypeSitelink) {
-            if (_wikibaseCache[rtypeSitelink]) {
-                result.rtype = _wikibaseCache[rtypeSitelink];
-            } else {
-                titles.push(rtypeSitelink);
-            }
-        }
-
-        if (keySitelink) {
-            if (_wikibaseCache[keySitelink]) {
-                result.key = _wikibaseCache[keySitelink];
-            } else {
-                titles.push(keySitelink);
-            }
-        }
-
-        if (tagSitelink) {
-            if (_wikibaseCache[tagSitelink]) {
-                result.tag = _wikibaseCache[tagSitelink];
-            } else {
-                titles.push(tagSitelink);
-            }
-        }
-
-        if (!titles.length) {
-            // Nothing to do, we already had everything in the cache
-            return callback(null, result);
-        }
-
-        // Requesting just the user language code
-        // If backend recognizes the code, it will perform proper fallbacks,
-        // and the result will contain the requested code. If not, all values are returned:
-        // {"zh-tw":{"value":"...","language":"zh-tw","source-language":"zh-hant"}
-        // {"pt-br":{"value":"...","language":"pt","for-language":"pt-br"}}
-        var obj = {
-            action: 'wbgetentities',
-            sites: 'wiki',
-            titles: titles.join('|'),
-            languages: params.langCodes.join('|'),
-            languagefallback: 1,
-            origin: '*',
-            format: 'json',
-            // There is an MW Wikibase API bug https://phabricator.wikimedia.org/T212069
-            // We shouldn't use v1 until it gets fixed, but should switch to it afterwards
-            // formatversion: 2,
-        };
-
-        var url = apibase + '?' + utilQsString(obj);
-        doRequest(url, function(err, d) {
-            if (err) {
-                callback(err);
-            } else if (!d.success || d.error) {
-                callback(d.error.messages.map(function(v) { return v.html['*']; }).join('<br>'));
-            } else {
-                var localeID = false;
-                Object.values(d.entities).forEach(function(res) {
-                    if (res.missing !== '') {
-
-                        var title = res.sitelinks.wiki.title;
-                        if (title === rtypeSitelink) {
-                            _wikibaseCache[rtypeSitelink] = res;
-                            result.rtype = res;
-                        } else if (title === keySitelink) {
-                            _wikibaseCache[keySitelink] = res;
-                            result.key = res;
-                        } else if (title === tagSitelink) {
-                            _wikibaseCache[tagSitelink] = res;
-                            result.tag = res;
-                        } else if (title === localeSitelink) {
-                            localeID = res.id;
-                        } else {
-                            console.log('Unexpected title ' + title);  // eslint-disable-line no-console
-                        }
-                    }
-                });
-
-                if (localeSitelink) {
-                    // If locale ID is not found, store false to prevent repeated queries
-                    that.addLocale(params.langCodes[0], localeID);
-                }
-
-                callback(null, result);
-            }
-        });
-    },
-
-
-    //
-    // Pass params object of the form:
-    // {
-    //   key: 'string',     // required
-    //   value: 'string'    // optional
-    // }
-    //
-    // Get an result object used to display tag documentation
-    // {
-    //   title:        'string',
-    //   description:  'string',
-    //   editURL:      'string',
-    //   imageURL:     'string',
-    //   wiki:         { title: 'string', text: 'string', url: 'string' }
-    // }
-    //
-    getDocs: function(params, callback) {
-        var that = this;
-        var langCodes = localizer.localeCodes().map(function(code) {
-            return code.toLowerCase();
-        });
-        params.langCodes = langCodes;
-
-        this.getEntity(params, function(err, data) {
-            if (err) {
-                callback(err);
-                return;
-            }
-
-            var entity = data.rtype || data.tag || data.key;
-            if (!entity) {
-                callback('No entity');
-                return;
-            }
-
-            var i;
-            var description;
-            for (i in langCodes) {
-                let code = langCodes[i];
-                if (entity.descriptions[code] && entity.descriptions[code].language === code) {
-                    description = entity.descriptions[code];
-                    break;
-                }
-            }
-            if (!description && Object.values(entity.descriptions).length) description = Object.values(entity.descriptions)[0];
-
-            // prepare result
-            var result = {
-                title: entity.title,
-                description: description ? description.value : '',
-                descriptionLocaleCode: description ? description.language : '',
-                editURL: 'https://wiki.openstreetmap.org/wiki/' + entity.title
-            };
-
-            // add image
-            if (entity.claims) {
-                var imageroot;
-                var image = that.claimToValue(entity, 'P4', langCodes[0]);
-                if (image) {
-                    imageroot = 'https://commons.wikimedia.org/w/index.php';
-                } else {
-                    image = that.claimToValue(entity, 'P28', langCodes[0]);
-                    if (image) {
-                        imageroot = 'https://wiki.openstreetmap.org/w/index.php';
-                    }
-                }
-                if (imageroot && image) {
-                    result.imageURL = imageroot + '?' + utilQsString({
-                        title: 'Special:Redirect/file/' + image,
-                        width: 400
-                    });
-                }
-            }
-
-            // Try to get a wiki page from tag data item first, followed by the corresponding key data item.
-            // If neither tag nor key data item contain a wiki page in the needed language nor English,
-            // get the first found wiki page from either the tag or the key item.
-            var rtypeWiki = that.monolingualClaimToValueObj(data.rtype, 'P31');
-            var tagWiki = that.monolingualClaimToValueObj(data.tag, 'P31');
-            var keyWiki = that.monolingualClaimToValueObj(data.key, 'P31');
-
-            var wikis = [rtypeWiki, tagWiki, keyWiki];
-            for (i in wikis) {
-                var wiki = wikis[i];
-                for (var j in langCodes) {
-                    var code = langCodes[j];
-                    var referenceId = (langCodes[0].split('-')[0] !== 'en' && code.split('-')[0] === 'en') ? 'inspector.wiki_en_reference' : 'inspector.wiki_reference';
-                    var info = getWikiInfo(wiki, code, referenceId);
-                    if (info) {
-                        result.wiki = info;
-                        break;
-                    }
-                }
-                if (result.wiki) break;
-            }
-
-            callback(null, result);
-
-
-            // Helper method to get wiki info if a given language exists
-            function getWikiInfo(wiki, langCode, tKey) {
-                if (wiki && wiki[langCode]) {
-                    return {
-                        title: wiki[langCode],
-                        text: tKey,
-                        url: 'https://wiki.openstreetmap.org/wiki/' + wiki[langCode]
-                    };
-                }
-            }
-        });
-    },
-
-
-    addLocale: function(langCode, qid) {
-        // Makes it easier to unit test
-        _localeIDs[langCode] = qid;
-    },
-
-
-    apibase: function(val) {
-        if (!arguments.length) return apibase;
-        apibase = val;
-        return this;
-    }
-
-};
diff --git a/modules/services/osmose.js b/modules/services/osmose.js
deleted file mode 100644
index 5b1513eca9..0000000000
--- a/modules/services/osmose.js
+++ /dev/null
@@ -1,338 +0,0 @@
-import * as PIXI from 'pixi.js';
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { json as d3_json } from 'd3-fetch';
-import { Extent, Tiler, vecAdd } from '@rapid-sdk/math';
-import { utilQsString } from '@rapid-sdk/util';
-import { marked } from 'marked';
-import RBush from 'rbush';
-
-import { fileFetcher } from '../core/file_fetcher';
-import { localizer } from '../core/localizer';
-import { QAItem } from '../osm';
-import { utilRebind } from '../util';
-
-
-const TILEZOOM = 14;
-const tiler = new Tiler().zoomRange(TILEZOOM);
-const dispatch = d3_dispatch('loaded');
-const _osmoseUrlRoot = 'https://osmose.openstreetmap.fr/api/0.3';
-
-// persistent data - loaded at init
-const _osmoseColors = new Map();    // Map (itemType -> hex color)
-const _osmoseStrings = new Map();   // Map (locale -> Object containing strings)
-const _osmoseData = { icons: {}, types: [] };
-
-// cache gets cleared on reset
-let _osmoseCache;
-
-
-function abortRequest(controller) {
-  if (controller) {
-    controller.abort();
-  }
-}
-
-function abortUnwantedRequests(cache, tiles) {
-  Object.keys(cache.inflightTile).forEach(k => {
-    let wanted = tiles.find(tile => k === tile.id);
-    if (!wanted) {
-      abortRequest(cache.inflightTile[k]);
-      delete cache.inflightTile[k];
-    }
-  });
-}
-
-function encodeIssueRtree(d) {
-  return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d };
-}
-
-// Replace or remove QAItem from rtree
-function updateRtree(item, replace) {
-  _osmoseCache.rtree.remove(item, (a, b) => a.data.id === b.data.id);
-  if (replace) {
-    _osmoseCache.rtree.insert(item);
-  }
-}
-
-
-// Issues shouldn't obscure each other
-function preventCoincident(loc) {
-  let coincident = false;
-  do {
-    // first time, move marker up. after that, move marker right.
-    let delta = coincident ? [0.00001, 0] : [0, 0.00001];
-    loc = vecAdd(loc, delta);
-    let bbox = new Extent(loc).bbox();
-    coincident = _osmoseCache.rtree.search(bbox).length;
-  } while (coincident);
-
-  return loc;
-}
-
-
-export default {
-  title: 'osmose',
-
-  init() {
-    this.reset();
-    this.event = utilRebind(this, dispatch, 'on');
-
-    fileFetcher.get('qa_data')
-      .then(d => {
-        _osmoseData.icons = d.osmose.icons;
-        _osmoseData.types = Object.keys(d.osmose.icons)
-          .map(s => s.split('-')[0])
-          .reduce((unique, item) => unique.indexOf(item) !== -1 ? unique : [...unique, item], []);
-      })
-      .then(this.loadStringsAsync);
-  },
-
-
-  reset() {
-    if (_osmoseCache) {
-      Object.values(_osmoseCache.inflightTile).forEach(abortRequest);
-    }
-    _osmoseCache = {
-      issues: new Map(),    // Map (itemID -> QAItem)
-      loadedTile: {},
-      inflightTile: {},
-      inflightPost: {},
-      closed: {},
-      rtree: new RBush()
-    };
-  },
-
-
-  loadIssues(projection) {
-    // determine the needed tiles to cover the view
-    const tiles = tiler.getTiles(projection).tiles;
-
-    // abort inflight requests that are no longer needed
-    abortUnwantedRequests(_osmoseCache, tiles);
-
-    // issue new requests..
-    tiles.forEach(tile => {
-      if (_osmoseCache.loadedTile[tile.id] || _osmoseCache.inflightTile[tile.id]) return;
-
-      const [x, y, z] = tile.xyz;
-      const params = { item: _osmoseData.types };   // Only request the types that we support
-      const url = `${_osmoseUrlRoot}/issues/${z}/${x}/${y}.json?` + utilQsString(params);
-
-      const controller = new AbortController();
-      _osmoseCache.inflightTile[tile.id] = controller;
-
-      d3_json(url, { signal: controller.signal })
-        .then(data => {
-          delete _osmoseCache.inflightTile[tile.id];
-          _osmoseCache.loadedTile[tile.id] = true;
-
-          if (data.features) {
-            data.features.forEach(issue => {
-              // Osmose issues are uniquely identified by a unique
-              // `item` and `class` combination (both integer values)
-              const { item, class: cl, uuid: id } = issue.properties;
-              const itemType = `${item}-${cl}`;
-
-              // Filter out unsupported issue types (some are too specific or advanced)
-              if (itemType in _osmoseData.icons) {
-                let loc = issue.geometry.coordinates; // lon, lat
-                loc = preventCoincident(loc);
-
-                let d = new QAItem(loc, this, itemType, id, { item });
-
-                // Assigning `elems` here prevents UI detail requests
-                if (item === 8300 || item === 8360) {
-                  d.elems = [];
-                }
-
-                _osmoseCache.issues.set(d.id, d);
-                _osmoseCache.rtree.insert(encodeIssueRtree(d));
-              }
-            });
-          }
-
-          dispatch.call('loaded');
-        })
-        .catch(() => {
-          delete _osmoseCache.inflightTile[tile.id];
-          _osmoseCache.loadedTile[tile.id] = true;
-        });
-    });
-  },
-
-
-  loadIssueDetailAsync(issue) {
-    // Issue details only need to be fetched once
-    if (issue.elems !== undefined) return Promise.resolve(issue);
-
-    const url = `${_osmoseUrlRoot}/issue/${issue.id}?langs=${localizer.localeCode()}`;
-    const handleResponse = (data) => {
-      // Associated elements used for highlighting
-      // Assign directly for immediate use in the callback
-      issue.elems = data.elems.map(e => e.type.substring(0,1) + e.id);
-      // Some issues have instance specific detail in a subtitle
-      issue.detail = data.subtitle ? marked.parse(data.subtitle.auto) : '';
-      this.replaceItem(issue);
-    };
-
-    return d3_json(url)
-      .then(handleResponse)
-      .then(() => issue);
-  },
-
-
-  // Load the strings for the types of issues that we support
-  loadStringsAsync() {
-    // Only need to cache strings for supported issue types
-    const itemTypes = Object.keys(_osmoseData.icons);
-
-    // For now, we only do this one time at init.
-    // Todo: support switching locales
-    let stringData = {};
-    const locale = localizer.localeCode();
-    _osmoseStrings.set(locale, stringData);
-
-    // Using multiple individual item + class requests to reduce fetched data size
-    const allRequests = itemTypes.map(itemType => {
-
-      const handleResponse = (data) => {
-        // Bunch of nested single value arrays of objects
-        const [ cat = { items:[] } ] = data.categories;
-        const [ item = { class:[] } ] = cat.items;
-        const [ cl = null ] = item.class;
-
-        // If null default value is reached, data wasn't as expected (or was empty)
-        if (!cl) {
-          /* eslint-disable no-console */
-          console.log(`Osmose strings request (${itemType}) had unexpected data`);
-          /* eslint-enable no-console */
-          return;
-        }
-
-        // Cache served item colors to automatically style issue markers later
-        const { item: itemInt, color } = item;
-        if (/^#[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/.test(color)) {
-          _osmoseColors.set(itemInt, PIXI.utils.string2hex(color));
-        }
-
-        // Value of root key will be null if no string exists
-        // If string exists, value is an object with key 'auto' for string
-        const { title, detail, fix, trap } = cl;
-
-        let issueStrings = {};
-        // Force title to begin with an uppercase letter
-        if (title)  issueStrings.title = title.auto.charAt(0).toUpperCase() + title.auto.slice(1);
-        if (detail) issueStrings.detail = marked.parse(detail.auto);
-        if (trap)   issueStrings.trap = marked.parse(trap.auto);
-        if (fix)    issueStrings.fix = marked.parse(fix.auto);
-
-        stringData[itemType] = issueStrings;
-      };
-
-      // Osmose API falls back to English strings where untranslated or if locale doesn't exist
-      const [item, cl] = itemType.split('-');
-      const url = `${_osmoseUrlRoot}/items/${item}/class/${cl}?langs=${locale}`;
-
-      return d3_json(url).then(handleResponse);
-    }).filter(Boolean);
-
-    return Promise.all(allRequests);
-  },
-
-
-  getStrings(itemType, locale = localizer.localeCode()) {
-    const stringData = _osmoseStrings.get(locale) ?? {};
-    return stringData[itemType] ?? {};
-  },
-
-
-  getColor(itemInt) {
-    return _osmoseColors.get(itemInt) ?? 0xffffff;
-  },
-
-
-  postUpdate(issue, callback) {
-    if (_osmoseCache.inflightPost[issue.id]) {
-      return callback({ message: 'Issue update already inflight', status: -2 }, issue);
-    }
-
-    // UI sets the status to either 'done' or 'false'
-    const url = `${_osmoseUrlRoot}/issue/${issue.id}/${issue.newStatus}`;
-    const controller = new AbortController();
-    const after = () => {
-      delete _osmoseCache.inflightPost[issue.id];
-
-      this.removeItem(issue);
-      if (issue.newStatus === 'done') {
-        // Keep track of the number of issues closed per `item` to tag the changeset
-        if (!(issue.item in _osmoseCache.closed)) {
-          _osmoseCache.closed[issue.item] = 0;
-        }
-        _osmoseCache.closed[issue.item] += 1;
-      }
-      if (callback) callback(null, issue);
-    };
-
-    _osmoseCache.inflightPost[issue.id] = controller;
-
-    fetch(url, { signal: controller.signal })
-      .then(after)
-      .catch(err => {
-        delete _osmoseCache.inflightPost[issue.id];
-        if (callback) callback(err.message);
-      });
-  },
-
-
-  // Get all cached QAItems covering the viewport
-  getItems(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
-
-    return _osmoseCache.rtree.search(bbox).map(d => d.data);
-  },
-
-
-  // Get a QAItem from cache
-  getError(issueID) {
-    return _osmoseCache.issues.get(issueID);
-  },
-
-
-  // get the name of the icon to display for this item
-  getIcon(itemType) {
-    return _osmoseData.icons[itemType];
-  },
-
-
-  // Replace a single QAItem in the cache
-  replaceItem(item) {
-    if (!(item instanceof QAItem) || !item.id) return;
-
-    _osmoseCache.issues.set(item.id, item);
-    updateRtree(encodeIssueRtree(item), true); // true = replace
-    return item;
-  },
-
-
-  // Remove a single QAItem from the cache
-  removeItem(item) {
-    if (!(item instanceof QAItem) || !item.id) return;
-
-    _osmoseCache.isseus.delete(item.id);
-    updateRtree(encodeIssueRtree(item), false); // false = remove
-  },
-
-
-  // Used to populate `closed:osmose:*` changeset tags
-  getClosedCounts() {
-    return _osmoseCache.closed;
-  },
-
-
-  itemURL(item) {
-    return `https://osmose.openstreetmap.fr/en/error/${item.id}`;
-  }
-};
diff --git a/modules/services/streetside.js b/modules/services/streetside.js
deleted file mode 100644
index 105efe4bc2..0000000000
--- a/modules/services/streetside.js
+++ /dev/null
@@ -1,938 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { json as d3_json } from 'd3-fetch';
-import { select as d3_select } from 'd3-selection';
-import { timer as d3_timer } from 'd3-timer';
-import { Extent, Tiler, geoMetersToLat, geoMetersToLon, geomRotatePoints, geomPointInPolygon, vecLength } from '@rapid-sdk/math';
-import { utilArrayUnion, utilQsString, utilUniqueString } from '@rapid-sdk/util';
-import RBush from 'rbush';
-
-import { t, localizer } from '../core/localizer';
-import { jsonpRequest } from '../util/jsonp_request';
-import { utilRebind } from '../util';
-
-const pannellumViewerCSS = 'pannellum-streetside/pannellum.css';
-const pannellumViewerJS = 'pannellum-streetside/pannellum.js';
-const TILEZOOM = 16.5;
-const tiler = new Tiler().zoomRange(TILEZOOM).skipNullIsland(true);
-const dispatch = d3_dispatch('loadedImages', 'viewerChanged');
-
-let _hires = false;
-let _resolution = 512;    // higher numbers are slower - 512, 1024, 2048, 4096
-let _currScene = 0;
-let _streetsideCache;
-let _pannellumViewer;
-let _pannellumViewerPromise;
-let _sceneOptions = {
-  showFullscreenCtrl: false,
-  autoLoad: true,
-  compass: true,
-  yaw: 0,
-  hfov: 45,      // default field of view degrees
-  minHfov: 10,   // zoom in degrees:  20, 10, 5
-  maxHfov: 90,   // zoom out degrees
-  type: 'cubemap',
-  cubeMap: []
-};
-
-
-
-/**
- * localeTimeStamp().
- */
-function localeTimestamp(s) {
-  if (!s) return null;
-  const options = { day: 'numeric', month: 'short', year: 'numeric' };
-  const d = new Date(s);
-  if (isNaN(d.getTime())) return null;
-  return d.toLocaleString(localizer.localeCode(), options);
-}
-
-
-/**
- * loadTiles() wraps the process of generating tiles and then fetching image points for each tile.
- */
-function loadTiles(projection, margin) {
-  // Determine the needed tiles to cover the view
-  const needTiles = tiler.zoomRange(TILEZOOM).margin(margin).getTiles(projection).tiles;
-
-  // Abort inflight requests that are no longer needed
-  for (const [tileID, inflight] of _streetsideCache.inflight.entries()) {
-    const needed = needTiles.find(tile => tile.id === tileID);
-    if (!needed) {
-      inflight.controller.abort();
-    }
-  }
-
-  // Fetch files that are needed
-  for (const tile of needTiles) {
-    const tileID = tile.id;
-    if (_streetsideCache.loaded.has(tileID) || _streetsideCache.inflight.has(tileID)) continue;
-
-    // Promise.all([fetchMetadataAsync(tile), fetchBubblesAsync(tile)])
-    fetchBubblesAsync(tile)
-      .then(processResults)
-      .catch(err => {
-        if (err.name === 'AbortError') return;          // ok
-        if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
-      });
-  }
-
-
-  function processResults(results) {
-    // const metadata = results[0];
-    // _streetsideCache.loaded.add(results[1].tile.id);
-    // const bubbles = results[1].data;
-    _streetsideCache.loaded.add(results.tile.id);
-    const bubbles = results.data;
-    if (!bubbles || bubbles.error) return;
-
-    // [].shift() removes the first element, some statistics info, not a bubble point
-    bubbles.shift();
-
-    const boxes = bubbles.map(bubble => {
-      if (_streetsideCache.bubbles.has(bubble.id)) return null;  // skip duplicates
-
-      const loc = [bubble.lo, bubble.la];
-      const bubbleData = {
-        loc: loc,
-        id: bubble.id,
-        ca: bubble.he,
-        captured_at: bubble.cd,
-        captured_by: 'microsoft',
-        pr: bubble.pr,  // previous
-        ne: bubble.ne,  // next
-        isPano: true,
-        sequenceID: null
-      };
-
-      _streetsideCache.bubbles.set(bubble.id,  bubbleData);
-
-      // a sequence starts here
-      if (bubble.pr === undefined) {
-        _streetsideCache.leaders.push(bubble.id);
-      }
-
-      return {
-        minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1], data: bubbleData
-      };
-
-    }).filter(Boolean);
-
-    _streetsideCache.rtree.load(boxes);
-
-    connectSequences();
-    dispatch.call('loadedImages');
-  }
-}
-
-
-// call this sometimes to connect the bubbles into sequences
-function connectSequences() {
-  let keepLeaders = [];
-
-  for (let i = 0; i < _streetsideCache.leaders.length; i++) {
-    let bubble = _streetsideCache.bubbles.get(_streetsideCache.leaders[i]);
-    let seen = {};
-
-    // Try to make a sequence.. use the id of the leader bubble.
-    let sequence = { id: bubble.id, bubbles: [] };
-    let complete = false;
-
-    do {
-      sequence.bubbles.push(bubble);
-      seen[bubble.id] = true;
-
-      if (bubble.ne === undefined) {  // no next
-        complete = true;
-      } else {
-        bubble = _streetsideCache.bubbles.get(bubble.ne);  // advance to next
-      }
-    } while (bubble && !seen[bubble.id] && !complete);
-
-    if (complete) {
-      // assign bubbles to the sequence
-      for (let j = 0; j < sequence.bubbles.length; j++) {
-        sequence.bubbles[j].sequenceID = sequence.id;
-      }
-
-      // create a GeoJSON LineString
-      sequence.geojson = {
-        type: 'LineString',
-        properties: {
-          id: sequence.id,
-          captured_at: sequence.bubbles[0] ? sequence.bubbles[0].captured_at : null,
-          captured_by: sequence.bubbles[0] ? sequence.bubbles[0].captured_by : null
-        },
-        coordinates: sequence.bubbles.map(d => d.loc)
-      };
-
-      _streetsideCache.sequences.set(sequence.id, sequence);
-
-    } else {
-      keepLeaders.push(_streetsideCache.leaders[i]);
-    }
-  }
-
-  // couldn't complete these, save for later
-  _streetsideCache.leaders = keepLeaders;
-}
-
-
-/**
- * fetchMetadataAsync()
- * https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata
- */
-function fetchMetadataAsync(tile) {  // eslint-disable-line  no-unused-vars
-  // only fetch it once
-  if (_streetsideCache.metadataPromise) return _streetsideCache.metadataPromise;
-
-  const [lon, lat] = tile.wgs84Extent.center();
-  const metadataURLBase = 'https://dev.virtualearth.net/REST/v1/Imagery/MetaData/Streetside';
-  const metadataKey = 'AoG8TaQvkPo6o8SlpRVmBs7WJwO_NDQklVRcAfpn7P8oiEMYWNY59XHSJU81sP1Y';
-  const metadataURL = `${metadataURLBase}/${lat},${lon}?key=${metadataKey}`;
-
-  _streetsideCache.metadataPromise = d3_json(metadataURL)
-    .then(data => {
-      if (!data) throw new Error('no data');
-      return data;
-    });
-}
-
-
-/**
- * fetchBubblesAsync()
- * bubbles:   undocumented / unsupported API?
- */
-function fetchBubblesAsync(tile) {
-  const [w, s, e, n] = tile.wgs84Extent.rectangle();
-  const MAXRESULTS = 2000;
-
-  const bubbleURLBase = 'https://dev.virtualearth.net/mapcontrol/HumanScaleServices/GetBubbles.ashx?';
-  const bubbleKey = 'AuftgJsO0Xs8Ts4M1xZUQJQXJNsvmh3IV8DkNieCiy3tCwCUMq76-WpkrBtNAuEm';
-  const bubbleURL = bubbleURLBase + utilQsString({ n: n, s: s, e: e, w: w, c: MAXRESULTS, appkey: bubbleKey, jsCallback: '{callback}' });
-
-  const inflight = _streetsideCache.inflight.get(tile.id);
-  if (inflight) return inflight.promise;
-
-  // Wrap JSONP request in an abortable Promise
-  const controller = new AbortController();
-  const promise = new Promise((resolve, reject) => {
-    let onAbort;
-    const request = jsonpRequest(bubbleURL, data => {
-      if (onAbort) controller.signal.removeEventListener('abort', onAbort);
-      resolve({ data: data, tile: tile });
-    });
-
-    onAbort = () => {
-      controller.signal.removeEventListener('abort', onAbort);
-      request.abort();
-      reject(new DOMException('Aborted', 'AbortError'));
-    };
-    controller.signal.addEventListener('abort', onAbort);
-  })
-  .finally(() => {
-    _streetsideCache.inflight.delete(tile.id);
-  });
-
-  _streetsideCache.inflight.set(tile.id, { promise: promise, controller: controller });
-
-  return promise;
-}
-
-
-/**
- * loadImageAsync()
- */
-function loadImageAsync(imgInfo) {
-  return new Promise(resolve => {
-    const face = imgInfo.face;
-    const canvas = document.getElementById(`ideditor-canvas${face}`);
-    const ctx = canvas.getContext('2d');
-
-    const img = new Image();
-    img.onload = () => {
-      ctx.drawImage(img, imgInfo.x, imgInfo.y);
-      resolve({ imgInfo: imgInfo, status: 'ok' });
-    };
-    img.onerror = () => {
-      ctx.clearRect(0, 0, canvas.width, canvas.height);
-      resolve({ imgInfo: imgInfo, status: 'error' });
-    };
-    img.setAttribute('crossorigin', '');
-    img.src = imgInfo.url;
-  });
-}
-
-
-/**
- * loadFaceAsync()
- */
-function loadFaceAsync(imageGroup) {
-  return Promise.all(imageGroup.map(loadImageAsync))
-    .then(data => {
-      const face = data[0].imgInfo.face;
-      const canvas = document.getElementById(`ideditor-canvas${face}`);
-      const which = { '01': 0, '02': 1, '03': 2, '10': 3, '11': 4, '12': 5 };
-      _sceneOptions.cubeMap[which[face]] = canvas.toDataURL('image/jpeg', 1.0);
-      return { status: `face ${face} ok` };
-    });
-}
-
-
-/**
- * loadFacesAsync()
- */
-function loadFacesAsync(faceGroup) {
-  return Promise.all(faceGroup.map(loadFaceAsync))
-    .then(() => { return { status: 'loadFacesAsync done' }; });
-}
-
-
-function setupCanvas(selection) {
-  selection.selectAll('#ideditor-stitcher-canvases')
-    .remove();
-
-  // Add the Streetside working canvases. These are used for 'stitching', or combining,
-  // multiple images for each of the six faces, before passing to the Pannellum control as DataUrls
-  selection.selectAll('#ideditor-stitcher-canvases')
-    .data([0])
-    .enter()
-    .append('div')
-    .attr('id', 'ideditor-stitcher-canvases')
-    .attr('display', 'none')
-    .selectAll('canvas')
-    .data(['canvas01', 'canvas02', 'canvas03', 'canvas10', 'canvas11', 'canvas12'])
-    .enter()
-    .append('canvas')
-    .attr('id', d => `ideditor-${d}`)
-    .attr('width', _resolution)
-    .attr('height', _resolution);
-}
-
-
-function qkToXY(qk) {
-  let x = 0;
-  let y = 0;
-  let scale = 256;
-  for (let i = qk.length; i > 0; i--) {
-    const key = qk[i-1];
-    x += (+(key === '1' || key === '3')) * scale;
-    y += (+(key === '2' || key === '3')) * scale;
-    scale *= 2;
-  }
-  return [x, y];
-}
-
-
-function getQuadKeys() {
-  const dim = _resolution / 256;
-  let quadKeys;
-
-  if (dim === 16) {
-    quadKeys = [
-      '0000','0001','0010','0011','0100','0101','0110','0111',  '1000','1001','1010','1011','1100','1101','1110','1111',
-      '0002','0003','0012','0013','0102','0103','0112','0113',  '1002','1003','1012','1013','1102','1103','1112','1113',
-      '0020','0021','0030','0031','0120','0121','0130','0131',  '1020','1021','1030','1031','1120','1121','1130','1131',
-      '0022','0023','0032','0033','0122','0123','0132','0133',  '1022','1023','1032','1033','1122','1123','1132','1133',
-      '0200','0201','0210','0211','0300','0301','0310','0311',  '1200','1201','1210','1211','1300','1301','1310','1311',
-      '0202','0203','0212','0213','0302','0303','0312','0313',  '1202','1203','1212','1213','1302','1303','1312','1313',
-      '0220','0221','0230','0231','0320','0321','0330','0331',  '1220','1221','1230','1231','1320','1321','1330','1331',
-      '0222','0223','0232','0233','0322','0323','0332','0333',  '1222','1223','1232','1233','1322','1323','1332','1333',
-
-      '2000','2001','2010','2011','2100','2101','2110','2111',  '3000','3001','3010','3011','3100','3101','3110','3111',
-      '2002','2003','2012','2013','2102','2103','2112','2113',  '3002','3003','3012','3013','3102','3103','3112','3113',
-      '2020','2021','2030','2031','2120','2121','2130','2131',  '3020','3021','3030','3031','3120','3121','3130','3131',
-      '2022','2023','2032','2033','2122','2123','2132','2133',  '3022','3023','3032','3033','3122','3123','3132','3133',
-      '2200','2201','2210','2211','2300','2301','2310','2311',  '3200','3201','3210','3211','3300','3301','3310','3311',
-      '2202','2203','2212','2213','2302','2303','2312','2313',  '3202','3203','3212','3213','3302','3303','3312','3313',
-      '2220','2221','2230','2231','2320','2321','2330','2331',  '3220','3221','3230','3231','3320','3321','3330','3331',
-      '2222','2223','2232','2233','2322','2323','2332','2333',  '3222','3223','3232','3233','3322','3323','3332','3333'
-    ];
-
-  } else if (dim === 8) {
-    quadKeys = [
-      '000','001','010','011',  '100','101','110','111',
-      '002','003','012','013',  '102','103','112','113',
-      '020','021','030','031',  '120','121','130','131',
-      '022','023','032','033',  '122','123','132','133',
-
-      '200','201','210','211',  '300','301','310','311',
-      '202','203','212','213',  '302','303','312','313',
-      '220','221','230','231',  '320','321','330','331',
-      '222','223','232','233',  '322','323','332','333'
-    ];
-
-  } else if (dim === 4) {
-    quadKeys = [
-      '00','01',  '10','11',
-      '02','03',  '12','13',
-
-      '20','21',  '30','31',
-      '22','23',  '32','33'
-    ];
-
-  } else {  // dim === 2
-    quadKeys = [
-      '0', '1',
-      '2', '3'
-    ];
-  }
-
-  return quadKeys;
-}
-
-
-
-export default {
-  /**
-   * init() initialize streetside.
-   */
-  init: function() {
-    if (!_streetsideCache) {
-      this.reset();
-    }
-    this.event = utilRebind(this, dispatch, 'on');
-  },
-
-  /**
-   * reset() reset the cache.
-   */
-  reset: function() {
-    if (_streetsideCache) {
-      for (const inflight of _streetsideCache.inflight.values()) {
-        inflight.controller.abort();
-      }
-    }
-
-    _streetsideCache = {
-      inflight:  new Map(),   // Map(tileID -> { Promise, AbortController})
-      loaded:    new Set(),   // Set(tileID)
-      bubbles:   new Map(),   // Map(bubbleID -> bubble data)
-      sequences: new Map(),   // Map(sequenceID -> sequence data)
-      rtree:     new RBush(),
-      leaders:   [],
-      metadataPromsie:  null
-    };
-  },
-
-
-  /**
-   * bubbles()
-   */
-  bubbles: function(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const box = new Extent(projection.invert(min), projection.invert(max)).bbox();
-    return _streetsideCache.rtree.search(box).map(d => d.data);
-  },
-
-
-  cachedImage: function(bubbleID) {
-    return _streetsideCache.bubbles.get(bubbleID);
-  },
-
-
-  sequences: function(projection) {
-    const viewport = projection.dimensions();
-    const min = [viewport[0][0], viewport[1][1]];
-    const max = [viewport[1][0], viewport[0][1]];
-    const bbox = new Extent(projection.invert(min), projection.invert(max)).bbox();
-    let result = new Map();  // Map(sequenceID -> sequence geojson)
-
-    // Gather sequences for bubbles in viewport
-    for (const box of _streetsideCache.rtree.search(bbox)) {
-      const sequenceID = box.data.sequenceID;
-      if (!sequenceID) continue;  // no sequence for this bubble
-      if (!result.has(sequenceID)) {
-        result.set(sequenceID, _streetsideCache.sequences.get(sequenceID).geojson);
-      }
-    }
-    return [...result.values()];
-  },
-
-
-  /**
-   * loadBubbles()
-   * by default: request 2 nearby tiles so we can connect sequences.
-   */
-  loadBubbles: function(projection, margin = 2) {
-    loadTiles(projection, margin);
-  },
-
-
-  viewer: function() {
-    return _pannellumViewer;
-  },
-
-
-  initViewer: function() {
-    if (!window.pannellum) return;
-    if (_pannellumViewer) return;
-
-    _currScene++;
-    const sceneID = _currScene.toString();
-    const options = {
-      'default': { firstScene: sceneID },
-      scenes: {}
-    };
-    options.scenes[sceneID] = _sceneOptions;
-
-    _pannellumViewer = window.pannellum.viewer('ideditor-viewer-streetside', options);
-  },
-
-
-  loadViewerAsync: function(context) {
-    if (_pannellumViewerPromise) return _pannellumViewerPromise;
-
-    // create ms-wrapper, a photo wrapper class
-    let wrap = context.container().select('.photoviewer').selectAll('.ms-wrapper')
-      .data([0]);
-
-    // inject ms-wrapper into the photoviewer div
-    // (used by all to house each custom photo viewer)
-    let wrapEnter = wrap.enter()
-      .append('div')
-      .attr('class', 'photo-wrapper ms-wrapper')
-      .classed('hide', true);
-
-    const that = this;
-
-    // inject div to support streetside viewer (pannellum) and attribution line
-    wrapEnter
-      .append('div')
-      .attr('id', 'ideditor-viewer-streetside')
-      .on('pointerdown.streetside', () => {
-        d3_select(window)
-          .on('pointermove.streetside', () => {
-            dispatch.call('viewerChanged');
-          }, true);
-      })
-      .on('pointerup.streetside pointercancel.streetside', () => {
-        d3_select(window)
-          .on('pointermove.streetside', null);
-
-        // continue dispatching events for a few seconds, in case viewer has inertia.
-        let t = d3_timer(elapsed => {
-          dispatch.call('viewerChanged');
-          if (elapsed > 2000) {
-            t.stop();
-          }
-        });
-      })
-      .append('div')
-      .attr('class', 'photo-attribution fillD');
-
-    let controlsEnter = wrapEnter
-      .append('div')
-      .attr('class', 'photo-controls-wrap')
-      .append('div')
-      .attr('class', 'photo-controls');
-
-    controlsEnter
-      .append('button')
-      .on('click.back', () => step(-1))
-      .html('◄');
-
-    controlsEnter
-      .append('button')
-      .on('click.forward', () => step(1))
-      .html('►');
-
-
-    // create working canvas for stitching together images
-    wrap = wrap
-      .merge(wrapEnter)
-      .call(setupCanvas);
-
-    // Register viewer resize handler
-    context.ui().photoviewer.on('resize.streetside', () => {
-      if (_pannellumViewer) _pannellumViewer.resize();
-    });
-
-    _pannellumViewerPromise = new Promise((resolve, reject) => {
-      let loadedCount = 0;
-      function loaded() {
-        loadedCount += 1;
-        // wait until both files are loaded
-        if (loadedCount === 2) resolve();
-      }
-
-      const head = d3_select('head');
-
-      // load streetside pannellum viewer css
-      head.selectAll('#ideditor-streetside-viewercss')
-        .data([0])
-        .enter()
-        .append('link')
-        .attr('id', 'ideditor-streetside-viewercss')
-        .attr('rel', 'stylesheet')
-        .attr('crossorigin', 'anonymous')
-        .attr('href', context.asset(pannellumViewerCSS))
-        .on('load.serviceStreetside', loaded)
-        .on('error.serviceStreetside', reject);
-
-      // load streetside pannellum viewer js
-      head.selectAll('#ideditor-streetside-viewerjs')
-        .data([0])
-        .enter()
-        .append('script')
-        .attr('id', 'ideditor-streetside-viewerjs')
-        .attr('crossorigin', 'anonymous')
-        .attr('src', context.asset(pannellumViewerJS))
-        .on('load.serviceStreetside', loaded)
-        .on('error.serviceStreetside', reject);
-    })
-    .catch(err => {
-      if (err instanceof Error) console.error(err);   // eslint-disable-line no-console
-      _pannellumViewerPromise = null;
-    });
-
-    return _pannellumViewerPromise;
-
-    function step(stepBy) {
-      const viewer = context.container().select('.photoviewer');
-      const selected = viewer.empty() ? undefined : viewer.datum();
-      if (!selected) return;
-
-      let nextID = (stepBy === 1 ? selected.ne : selected.pr);
-      const yaw = _pannellumViewer.getYaw();
-      _sceneOptions.yaw = yaw;
-
-      const ca = selected.ca + yaw;
-      const origin = selected.loc;
-
-      // construct a search trapezoid pointing out from current bubble
-      const meters = 35;
-      const p1 = [
-        origin[0] + geoMetersToLon(meters / 5, origin[1]),
-        origin[1]
-      ];
-      const p2 = [
-        origin[0] + geoMetersToLon(meters / 2, origin[1]),
-        origin[1] + geoMetersToLat(meters)
-      ];
-      const p3 = [
-        origin[0] - geoMetersToLon(meters / 2, origin[1]),
-        origin[1] + geoMetersToLat(meters)
-      ];
-      const p4 = [
-        origin[0] - geoMetersToLon(meters / 5, origin[1]),
-        origin[1]
-      ];
-
-      let poly = [p1, p2, p3, p4, p1];
-
-      // rotate it to face forward/backward
-      const angle = (stepBy === 1 ? ca : ca + 180) * (Math.PI / 180);
-      poly = geomRotatePoints(poly, -angle, origin);
-
-      let extent = poly.reduce((extent, point) => {
-        // update extent in place
-        extent.min = [ Math.min(extent.min[0], point[0]), Math.min(extent.min[1], point[1]) ];
-        extent.max = [ Math.max(extent.max[0], point[0]), Math.max(extent.max[1], point[1]) ];
-        return extent;
-      }, new Extent());
-
-      // find nearest other bubble in the search polygon
-      let minDist = Infinity;
-      _streetsideCache.rtree.search(extent.bbox())
-        .forEach(d => {
-          if (d.data.id === selected.id) return;
-          if (!geomPointInPolygon(d.data.loc, poly)) return;
-
-          let dist = vecLength(d.data.loc, selected.loc);
-          const theta = selected.ca - d.data.ca;
-          const minTheta = Math.min(Math.abs(theta), 360 - Math.abs(theta));
-          if (minTheta > 20) {
-            dist += 5;  // penalize distance if camera angles don't match
-          }
-
-          if (dist < minDist) {
-            nextID = d.data.id;
-            minDist = dist;
-          }
-        });
-
-      const nextBubble = nextID && that.cachedImage(nextID);
-      if (!nextBubble) return;
-
-      context.map().centerEase(nextBubble.loc);
-      context.photos().selectPhoto('streetside', nextBubble.id);
-    }
-  },
-
-
-  /**
-   * showViewer()
-   */
-  showViewer: function(context) {
-    let wrap = context.container().select('.photoviewer').classed('hide', false);
-    const isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size();
-
-    if (isHidden) {
-      wrap
-        .selectAll('.photo-wrapper:not(.ms-wrapper)')
-        .classed('hide', true);
-
-      wrap
-        .selectAll('.photo-wrapper.ms-wrapper')
-        .classed('hide', false);
-    }
-
-    return this;
-  },
-
-
-  /**
-   * hideViewer()
-   */
-  hideViewer: function(context) {
-    context.photos().selectPhoto(null);
-
-    let viewer = context.container().select('.photoviewer');
-    if (!viewer.empty()) viewer.datum(null);
-
-    viewer
-      .classed('hide', true)
-      .selectAll('.photo-wrapper')
-      .classed('hide', true);
-
-    context.container().selectAll('.viewfield-group, .sequence, .icon-sign')
-      .classed('currentView', false);
-
-    return this.setStyles(context, null, true);
-  },
-
-
-  /**
-   * selectImage().
-   * note: call `context.photos().selectPhoto(layerID, photoID)` instead
-   * That will deal with the URL and call this function
-   */
-  selectImage: function(context, bubbleID) {
-    let that = this;
-    let d = this.cachedImage(bubbleID);
-
-    let viewer = context.container().select('.photoviewer');
-    if (!viewer.empty()) viewer.datum(d);
-
-    this.setStyles(context, null, true);
-
-    let wrap = context.container().select('.photoviewer .ms-wrapper');
-    let attribution = wrap.selectAll('.photo-attribution').html('');
-
-    wrap.selectAll('.pnlm-load-box')   // display "loading.."
-      .style('display', 'block')
-      .style('transform', 'translate(-50%, -50%)');
-
-    if (!d) return this;
-
-    _sceneOptions.northOffset = d.ca;
-
-    let line1 = attribution
-      .append('div')
-      .attr('class', 'attribution-row');
-
-    const hiresDomId = utilUniqueString('streetside-hires');
-
-    // Add hires checkbox
-    let label = line1
-      .append('label')
-      .attr('for', hiresDomId)
-      .attr('class', 'streetside-hires');
-
-    label
-      .append('input')
-      .attr('type', 'checkbox')
-      .attr('id', hiresDomId)
-      .property('checked', _hires)
-      .on('click', d3_event => {
-        d3_event.stopPropagation();
-
-        _hires = !_hires;
-        _resolution = _hires ? 1024 : 512;
-        wrap.call(setupCanvas);
-
-        const viewstate = {
-          yaw: _pannellumViewer.getYaw(),
-          pitch: _pannellumViewer.getPitch(),
-          hfov: _pannellumViewer.getHfov()
-        };
-
-        _sceneOptions = Object.assign(_sceneOptions, viewstate);
-        context.photos().selectPhoto('streetside', d.id);
-      });
-
-    label
-      .append('span')
-      .html(t.html('streetside.hires'));
-
-
-    let captureInfo = line1
-      .append('div')
-      .attr('class', 'attribution-capture-info');
-
-    // Add capture date
-    if (d.captured_by) {
-      const yyyy = (new Date()).getFullYear();
-
-      captureInfo
-        .append('a')
-        .attr('class', 'captured_by')
-        .attr('target', '_blank')
-        .attr('href', 'https://www.microsoft.com/en-us/maps/streetside')
-        .text(`© ${yyyy} Microsoft`);
-
-      captureInfo
-        .append('span')
-        .text('|');
-    }
-
-    if (d.captured_at) {
-      captureInfo
-        .append('span')
-        .attr('class', 'captured_at')
-        .text(localeTimestamp(d.captured_at));
-    }
-
-    // Add image links
-    let line2 = attribution
-      .append('div')
-      .attr('class', 'attribution-row');
-
-    line2
-      .append('a')
-      .attr('class', 'image-view-link')
-      .attr('target', '_blank')
-      .attr('href', 'https://www.bing.com/maps?cp=' + d.loc[1] + '~' + d.loc[0] +
-        '&lvl=17&dir=' + d.ca + '&style=x&v=2&sV=1')
-      .html(t.html('streetside.view_on_bing'));
-
-    line2
-      .append('a')
-      .attr('class', 'image-report-link')
-      .attr('target', '_blank')
-      .attr('href', 'https://www.bing.com/maps/privacyreport/streetsideprivacyreport?bubbleid=' +
-        encodeURIComponent(d.id) + '&focus=photo&lat=' + d.loc[1] + '&lng=' + d.loc[0] + '&z=17')
-      .html(t.html('streetside.report'));
-
-
-
-// const streetsideImagesApi = 'https://t.ssl.ak.tiles.virtualearth.net/tiles/';
-const streetsideImagesApi = 'http://ecn.t0.tiles.virtualearth.net/tiles/';
-
-    let bubbleIdQuadKey = d.id.toString(4);
-    const paddingNeeded = 16 - bubbleIdQuadKey.length;
-    for (let i = 0; i < paddingNeeded; i++) {
-      bubbleIdQuadKey = '0' + bubbleIdQuadKey;
-    }
-    const imgUrlPrefix = streetsideImagesApi + 'hs' + bubbleIdQuadKey;
-    // const imgUrlSuffix = '.jpg?g=6338&n=z';
-    const imgUrlSuffix = '?g=13305&n=z';
-
-    // Cubemap face code order matters here: front=01, right=02, back=03, left=10, up=11, down=12
-    const faceKeys = ['01','02','03','10','11','12'];
-
-    // Map images to cube faces
-    const quadKeys = getQuadKeys();
-    const faces = faceKeys.map(faceKey => {
-      return quadKeys.map(quadKey => {
-        const xy = qkToXY(quadKey);
-        return {
-          face: faceKey,
-          url: imgUrlPrefix + faceKey + quadKey + imgUrlSuffix,
-          x: xy[0],
-          y: xy[1]
-        };
-      });
-    });
-
-    loadFacesAsync(faces)
-      .then(() => {
-        if (!_pannellumViewer) {
-          that.initViewer();
-        } else {
-          // make a new scene
-          _currScene++;
-          let sceneID = _currScene.toString();
-          _pannellumViewer
-            .addScene(sceneID, _sceneOptions)
-            .loadScene(sceneID);
-
-          // remove previous scene
-          if (_currScene > 2) {
-            sceneID = (_currScene - 1).toString();
-            _pannellumViewer
-              .removeScene(sceneID);
-          }
-        }
-      });
-
-    return this;
-  },
-
-
-  // Updates the currently highlighted sequence and selected bubble.
-  // Reset is only necessary when interacting with the viewport because
-  // this implicitly changes the currently selected bubble/sequence
-  setStyles: function (context, hovered, reset) {
-    if (reset) {  // reset all layers
-      context.container().selectAll('.viewfield-group')
-        .classed('highlighted', false)
-        .classed('hovered', false)
-        .classed('currentView', false);
-
-      context.container().selectAll('.sequence')
-        .classed('highlighted', false)
-        .classed('currentView', false);
-    }
-
-    let hoveredBubbleID = hovered?.id;
-    let hoveredSequenceID = hovered?.sequenceID;
-    let hoveredSequence = hoveredSequenceID && _streetsideCache.sequences.get(hoveredSequenceID);
-    let hoveredBubbleIDs =  (hoveredSequence && hoveredSequence.bubbles.map(d => d.id)) || [];
-
-    let viewer = context.container().select('.photoviewer');
-    let selected = viewer.empty() ? undefined : viewer.datum();
-    let selectedBubbleID = selected?.id;
-    let selectedSequenceID = selected?.sequenceID;
-    let selectedSequence = selectedSequenceID && _streetsideCache.sequences.get(selectedSequenceID);
-    let selectedBubbleIDs = (selectedSequence && selectedSequence.bubbles.map(d => d.id)) || [];
-
-    // highlight sibling viewfields on either the selected or the hovered sequences
-    let highlightedBubbleIDs = utilArrayUnion(hoveredBubbleIDs, selectedBubbleIDs);
-
-    context.container().selectAll('.layer-streetside-images .viewfield-group')
-      .classed('highlighted', d => highlightedBubbleIDs.indexOf(d.id) !== -1)
-      .classed('hovered',     d => d.id === hoveredBubbleID)
-      .classed('currentView', d => d.id === selectedBubbleID);
-
-    context.container().selectAll('.layer-streetside-images .sequence')
-      .classed('highlighted', d => d.properties.id === hoveredSequenceID)
-      .classed('currentView', d => d.properties.id === selectedSequenceID);
-
-    // update viewfields if needed
-    context.container().selectAll('.layer-streetside-images .viewfield-group .viewfield')
-      .attr('d', viewfieldPath);
-
-    function viewfieldPath() {
-      let d = this.parentNode.__data__;
-      if (d.isPano && d.id !== selectedBubbleID) {
-        return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
-      } else {
-        return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
-      }
-    }
-
-    return this;
-  },
-
-
-  /**
-   * cache().
-   */
-  cache: function () {
-    return _streetsideCache;
-  }
-};
diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
deleted file mode 100644
index a1ef5723eb..0000000000
--- a/modules/services/taginfo.js
+++ /dev/null
@@ -1,382 +0,0 @@
-import { json as d3_json } from 'd3-fetch';
-import { utilObjectOmit, utilQsString } from '@rapid-sdk/util';
-import _debounce from 'lodash-es/debounce';
-
-import { localizer } from '../core/localizer';
-
-
-var apibase = 'https://taginfo.openstreetmap.org/api/4/';
-var _inflight = {};
-var _popularKeys = {};
-var _taginfoCache = {};
-
-var tag_sorts = {
-    point: 'count_nodes',
-    vertex: 'count_nodes',
-    area: 'count_ways',
-    line: 'count_ways'
-};
-var tag_sort_members = {
-    point: 'count_node_members',
-    vertex: 'count_node_members',
-    area: 'count_way_members',
-    line: 'count_way_members',
-    relation: 'count_relation_members'
-};
-var tag_filters = {
-    point: 'nodes',
-    vertex: 'nodes',
-    area: 'ways',
-    line: 'ways'
-};
-var tag_members_fractions = {
-    point: 'count_node_members_fraction',
-    vertex: 'count_node_members_fraction',
-    area: 'count_way_members_fraction',
-    line: 'count_way_members_fraction',
-    relation: 'count_relation_members_fraction'
-};
-
-
-function sets(params, n, o) {
-    if (params.geometry && o[params.geometry]) {
-        params[n] = o[params.geometry];
-    }
-    return params;
-}
-
-
-function setFilter(params) {
-    return sets(params, 'filter', tag_filters);
-}
-
-
-function setSort(params) {
-    return sets(params, 'sortname', tag_sorts);
-}
-
-
-function setSortMembers(params) {
-    return sets(params, 'sortname', tag_sort_members);
-}
-
-
-function clean(params) {
-    return utilObjectOmit(params, ['geometry', 'debounce']);
-}
-
-
-function filterKeys(type) {
-    var count_type = type ? 'count_' + type : 'count_all';
-    return function(d) {
-        return parseFloat(d[count_type]) > 2500 || d.in_wiki;
-    };
-}
-
-
-function filterMultikeys(prefix) {
-    return function(d) {
-        // d.key begins with prefix, and d.key contains no additional ':'s
-        var re = new RegExp('^' + prefix + '(.*)$');
-        var matches = d.key.match(re) || [];
-        return (matches.length === 2 && matches[1].indexOf(':') === -1);
-    };
-}
-
-
-function filterValues(allowUpperCase) {
-    return function(d) {
-        if (d.value.match(/[;,]/) !== null) return false;  // exclude some punctuation
-        if (!allowUpperCase && d.value.match(/[A-Z*]/) !== null) return false;  // exclude uppercase letters
-        return parseFloat(d.fraction) > 0.0;
-    };
-}
-
-
-function filterRoles(geometry) {
-    return function(d) {
-        if (d.role === '') return false; // exclude empty role
-        if (d.role.match(/[A-Z*;,]/) !== null) return false;  // exclude uppercase letters and some punctuation
-        return parseFloat(d[tag_members_fractions[geometry]]) > 0.0;
-    };
-}
-
-
-function valKey(d) {
-    return {
-        value: d.key,
-        title: d.key
-    };
-}
-
-
-function valKeyDescription(d) {
-    var obj = {
-        value: d.value,
-        title: d.description || d.value
-    };
-    if (d.count) {
-        obj.count = d.count;
-    }
-    return obj;
-}
-
-
-function roleKey(d) {
-    return {
-        value: d.role,
-        title: d.role
-    };
-}
-
-
-// sort keys with ':' lower than keys without ':'
-function sortKeys(a, b) {
-    return (a.key.indexOf(':') === -1 && b.key.indexOf(':') !== -1) ? -1
-        : (a.key.indexOf(':') !== -1 && b.key.indexOf(':') === -1) ? 1
-        : 0;
-}
-
-
-var debouncedRequest = _debounce(request, 300, { leading: false });
-
-function request(url, params, exactMatch, callback, loaded) {
-    if (_inflight[url]) return;
-
-    if (checkCache(url, params, exactMatch, callback)) return;
-
-    var controller = new AbortController();
-    _inflight[url] = controller;
-
-    d3_json(url, { signal: controller.signal })
-        .then(function(result) {
-            delete _inflight[url];
-            if (loaded) loaded(null, result);
-        })
-        .catch(function(err) {
-            delete _inflight[url];
-            if (err.name === 'AbortError') return;
-            if (loaded) loaded(err.message);
-        });
-}
-
-
-function checkCache(url, params, exactMatch, callback) {
-    var rp = params.rp || 25;
-    var testQuery = params.query || '';
-    var testUrl = url;
-
-    do {
-        var hit = _taginfoCache[testUrl];
-
-        // exact match, or shorter match yielding fewer than max results (rp)
-        if (hit && (url === testUrl || hit.length < rp)) {
-            callback(null, hit);
-            return true;
-        }
-
-        // don't try to shorten the query
-        if (exactMatch || !testQuery.length) return false;
-
-        // do shorten the query to see if we already have a cached result
-        // that has returned fewer than max results (rp)
-        testQuery = testQuery.slice(0, -1);
-        testUrl = url.replace(/&query=(.*?)&/, '&query=' + testQuery + '&');
-    } while (testQuery.length >= 0);
-
-    return false;
-}
-
-
-export default {
-
-    init: function() {
-        _inflight = {};
-        _taginfoCache = {};
-        _popularKeys = {
-            // manually exclude some keys – #5377, #7485
-            postal_code: true,
-            full_name: true,
-            loc_name: true,
-            reg_name: true,
-            short_name: true,
-            sorting_name: true,
-            artist_name: true,
-            nat_name: true,
-            long_name: true,
-            'bridge:name': true
-        };
-
-        // Fetch popular keys.  We'll exclude these from `values`
-        // lookups because they stress taginfo, and they aren't likely
-        // to yield meaningful autocomplete results.. see #3955
-        var params = {
-            rp: 100,
-            sortname: 'values_all',
-            sortorder: 'desc',
-            page: 1,
-            debounce: false,
-            lang: localizer.languageCode()
-        };
-        this.keys(params, function(err, data) {
-            if (err) return;
-            data.forEach(function(d) {
-                if (d.value === 'opening_hours') return;  // exception
-                _popularKeys[d.value] = true;
-            });
-        });
-    },
-
-
-    reset: function() {
-        Object.values(_inflight).forEach(function(controller) { controller.abort(); });
-        _inflight = {};
-    },
-
-
-    keys: function(params, callback) {
-        var doRequest = params.debounce ? debouncedRequest : request;
-        params = clean(setSort(params));
-        params = Object.assign({
-            rp: 10,
-            sortname: 'count_all',
-            sortorder: 'desc',
-            page: 1,
-            lang: localizer.languageCode()
-        }, params);
-
-        var url = apibase + 'keys/all?' + utilQsString(params);
-        doRequest(url, params, false, callback, function(err, d) {
-            if (err) {
-                callback(err);
-            } else {
-                var f = filterKeys(params.filter);
-                var result = d.data.filter(f).sort(sortKeys).map(valKey);
-                _taginfoCache[url] = result;
-                callback(null, result);
-            }
-        });
-    },
-
-
-    multikeys: function(params, callback) {
-        var doRequest = params.debounce ? debouncedRequest : request;
-        params = clean(setSort(params));
-        params = Object.assign({
-            rp: 25,
-            sortname: 'count_all',
-            sortorder: 'desc',
-            page: 1,
-            lang: localizer.languageCode()
-        }, params);
-
-        var prefix = params.query;
-        var url = apibase + 'keys/all?' + utilQsString(params);
-        doRequest(url, params, true, callback, function(err, d) {
-            if (err) {
-                callback(err);
-            } else {
-                var f = filterMultikeys(prefix);
-                var result = d.data.filter(f).map(valKey);
-                _taginfoCache[url] = result;
-                callback(null, result);
-            }
-        });
-    },
-
-
-    values: function(params, callback) {
-        // Exclude popular keys from values lookups.. see #3955
-        var key = params.key;
-        if (key && _popularKeys[key]) {
-            callback(null, []);
-            return;
-        }
-
-        var doRequest = params.debounce ? debouncedRequest : request;
-        params = clean(setSort(setFilter(params)));
-        params = Object.assign({
-            rp: 25,
-            sortname: 'count_all',
-            sortorder: 'desc',
-            page: 1,
-            lang: localizer.languageCode()
-        }, params);
-
-        var url = apibase + 'key/values?' + utilQsString(params);
-        doRequest(url, params, false, callback, function(err, d) {
-            if (err) {
-                callback(err);
-            } else {
-                // In most cases we prefer taginfo value results with lowercase letters.
-                // A few OSM keys expect values to contain uppercase values (see #3377).
-                // This is not an exhaustive list (e.g. `name` also has uppercase values)
-                // but these are the fields where taginfo value lookup is most useful.
-                var re = /network|taxon|genus|species|brand|grape_variety|royal_cypher|listed_status|booth|rating|stars|:output|_hours|_times|_ref|manufacturer|country|target|brewery/;
-                var allowUpperCase = re.test(params.key);
-                var f = filterValues(allowUpperCase);
-
-                var result = d.data.filter(f).map(valKeyDescription);
-                _taginfoCache[url] = result;
-                callback(null, result);
-            }
-        });
-    },
-
-
-    roles: function(params, callback) {
-        var doRequest = params.debounce ? debouncedRequest : request;
-        var geometry = params.geometry;
-        params = clean(setSortMembers(params));
-        params = Object.assign({
-            rp: 25,
-            sortname: 'count_all_members',
-            sortorder: 'desc',
-            page: 1,
-            lang: localizer.languageCode()
-        }, params);
-
-        var url = apibase + 'relation/roles?' + utilQsString(params);
-        doRequest(url, params, true, callback, function(err, d) {
-            if (err) {
-                callback(err);
-            } else {
-                var f = filterRoles(geometry);
-                var result = d.data.filter(f).map(roleKey);
-                _taginfoCache[url] = result;
-                callback(null, result);
-            }
-        });
-    },
-
-
-    docs: function(params, callback) {
-        var doRequest = params.debounce ? debouncedRequest : request;
-        params = clean(setSort(params));
-
-        var path = 'key/wiki_pages?';
-        if (params.value) {
-            path = 'tag/wiki_pages?';
-        } else if (params.rtype) {
-            path = 'relation/wiki_pages?';
-        }
-
-        var url = apibase + path + utilQsString(params);
-        doRequest(url, params, true, callback, function(err, d) {
-            if (err) {
-                callback(err);
-            } else {
-                _taginfoCache[url] = d.data;
-                callback(null, d.data);
-            }
-        });
-    },
-
-
-    apibase: function(_) {
-        if (!arguments.length) return apibase;
-        apibase = _;
-        return this;
-    }
-
-};
diff --git a/modules/services/vector_tile.js b/modules/services/vector_tile.js
deleted file mode 100644
index b2aca9669e..0000000000
--- a/modules/services/vector_tile.js
+++ /dev/null
@@ -1,225 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { Tiler } from '@rapid-sdk/math';
-import { utilHashcode } from '@rapid-sdk/util';
-import deepEqual from 'fast-deep-equal';
-import turf_bboxClip from '@turf/bbox-clip';
-import stringify from 'fast-json-stable-stringify';
-import polygonClipping from 'polygon-clipping';
-import Protobuf from 'pbf';
-import vt from '@mapbox/vector-tile';
-
-import { utilRebind } from '../util';
-
-
-var tiler = new Tiler().tileSize(512).margin(1);
-var dispatch = d3_dispatch('loadedData');
-var _vtCache;
-
-
-function abortRequest(controller) {
-    controller.abort();
-}
-
-
-function vtToGeoJSON(data, tile, mergeCache) {
-    var vectorTile = new vt.VectorTile(new Protobuf(data));
-    var layers = Object.keys(vectorTile.layers);
-    if (!Array.isArray(layers)) { layers = [layers]; }
-
-    var features = [];
-    layers.forEach(function(layerID) {
-        var layer = vectorTile.layers[layerID];
-        if (layer) {
-            for (var i = 0; i < layer.length; i++) {
-                var feature = layer.feature(i).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]);
-                var geometry = feature.geometry;
-
-                // Treat all Polygons as MultiPolygons
-                if (geometry.type === 'Polygon') {
-                    geometry.type = 'MultiPolygon';
-                    geometry.coordinates = [geometry.coordinates];
-                }
-
-                var isClipped = false;
-
-                // Clip to tile bounds
-                if (geometry.type === 'MultiPolygon') {
-                    var featureClip = turf_bboxClip(feature, tile.wgs84Extent.rectangle());
-                    if (!deepEqual(feature.geometry, featureClip.geometry)) {
-                        // feature = featureClip;
-                        isClipped = true;
-                    }
-                    if (!feature.geometry.coordinates.length) continue;   // not actually on this tile
-                    if (!feature.geometry.coordinates[0].length) continue;   // not actually on this tile
-                }
-
-                // Generate some unique IDs and add some metadata
-                var featurehash = utilHashcode(stringify(feature));
-                var propertyhash = utilHashcode(stringify(feature.properties || {}));
-                feature.__layerID__ = layerID.replace(/[^_a-zA-Z0-9\-]/g, '_');
-                feature.__featurehash__ = featurehash;
-                feature.__propertyhash__ = propertyhash;
-                feature.v = 0;
-                features.push(feature);
-
-                // Clipped Polygons at same zoom with identical properties can get merged
-                if (isClipped && geometry.type === 'MultiPolygon') {
-                    var merged = mergeCache[propertyhash];
-                    if (merged && merged.length) {
-                        var other = merged[0];
-                        var coords = polygonClipping.union(
-                            feature.geometry.coordinates,
-                            other.geometry.coordinates
-                        );
-                        if (!coords || !coords.length) {
-                            continue;  // something failed in polygon union
-                        }
-                        feature.v++;
-                        merged.push(feature);
-                        for (var j = 0; j < merged.length; j++) {      // all these features get...
-                            merged[j].geometry.coordinates = coords;   // same coords
-                            merged[j].__featurehash__ = featurehash;   // same hash, so deduplication works
-                        }
-                    } else {
-                        mergeCache[propertyhash] = [feature];
-                    }
-                }
-            }
-        }
-    });
-
-    return features;
-}
-
-
-function loadTile(source, tile) {
-    if (source.loaded[tile.id] || source.inflight[tile.id]) return;
-    var url = source.template
-        .replace('{x}', tile.xyz[0])
-        .replace('{y}', tile.xyz[1])
-        // TMS-flipped y coordinate
-        .replace(/\{[t-]y\}/, Math.pow(2, tile.xyz[2]) - tile.xyz[1] - 1)
-        .replace(/\{z(oom)?\}/, tile.xyz[2])
-        .replace(/\{switch:([^}]+)\}/, function(s, r) {
-            var subdomains = r.split(',');
-            return subdomains[(tile.xyz[0] + tile.xyz[1]) % subdomains.length];
-        });
-
-
-    var controller = new AbortController();
-    source.inflight[tile.id] = controller;
-
-    fetch(url, { signal: controller.signal })
-        .then(function(response) {
-            if (!response.ok) {
-                throw new Error(response.status + ' ' + response.statusText);
-            }
-            source.loaded[tile.id] = [];
-            delete source.inflight[tile.id];
-            return response.arrayBuffer();
-        })
-        .then(function(data) {
-            if (!data) {
-                throw new Error('No Data');
-            }
-
-            var z = tile.xyz[2];
-            if (!source.canMerge[z]) {
-                source.canMerge[z] = {};  // initialize mergeCache
-            }
-
-            source.loaded[tile.id] = vtToGeoJSON(data, tile, source.canMerge[z]);
-            dispatch.call('loadedData');
-        })
-        .catch(function() {
-            source.loaded[tile.id] = [];
-            delete source.inflight[tile.id];
-        });
-}
-
-
-export default {
-
-    init: function() {
-        if (!_vtCache) {
-            this.reset();
-        }
-
-        this.event = utilRebind(this, dispatch, 'on');
-    },
-
-
-    reset: function() {
-        for (var sourceID in _vtCache) {
-            var source = _vtCache[sourceID];
-            if (source && source.inflight) {
-                Object.values(source.inflight).forEach(abortRequest);
-            }
-        }
-
-        _vtCache = {};
-    },
-
-
-    addSource: function(sourceID, template) {
-        _vtCache[sourceID] = { template: template, inflight: {}, loaded: {}, canMerge: {} };
-        return _vtCache[sourceID];
-    },
-
-
-    data: function(sourceID, projection) {
-        var source = _vtCache[sourceID];
-        if (!source) return [];
-
-        var tiles = tiler.getTiles(projection).tiles;
-        var seen = {};
-        var results = [];
-
-        for (var i = 0; i < tiles.length; i++) {
-            var features = source.loaded[tiles[i].id];
-            if (!features || !features.length) continue;
-
-            for (var j = 0; j < features.length; j++) {
-                var feature = features[j];
-                var hash = feature.__featurehash__;
-                if (seen[hash]) continue;
-                seen[hash] = true;
-
-                // return a shallow copy, because the hash may change
-                // later if this feature gets merged with another
-                results.push(Object.assign({}, feature));  // shallow copy
-            }
-        }
-
-        return results;
-    },
-
-
-    loadTiles: function(sourceID, template, projection) {
-        var source = _vtCache[sourceID];
-        if (!source) {
-            source = this.addSource(sourceID, template);
-        }
-
-        var tiles = tiler.getTiles(projection).tiles;
-
-        // abort inflight requests that are no longer needed
-        Object.keys(source.inflight).forEach(function(k) {
-            var wanted = tiles.find(function(tile) { return k === tile.id; });
-            if (!wanted) {
-                abortRequest(source.inflight[k]);
-                delete source.inflight[k];
-            }
-        });
-
-        tiles.forEach(function(tile) {
-            loadTile(source, tile);
-        });
-    },
-
-
-    cache: function() {
-        return _vtCache;
-    }
-
-};
diff --git a/modules/services/wikidata.js b/modules/services/wikidata.js
deleted file mode 100644
index 569accbbd9..0000000000
--- a/modules/services/wikidata.js
+++ /dev/null
@@ -1,223 +0,0 @@
-import { json as d3_json } from 'd3-fetch';
-import { utilQsString } from '@rapid-sdk/util';
-
-import { localizer } from '../core/localizer';
-
-
-var apibase = 'https://www.wikidata.org/w/api.php?';
-var _wikidataCache = {};
-
-
-export default {
-
-    init: function() {},
-
-    reset: function() {
-        _wikidataCache = {};
-    },
-
-
-    // Search for Wikidata items matching the query
-    itemsForSearchQuery: function(query, callback) {
-        if (!query) {
-            if (callback) callback('No query', {});
-            return;
-        }
-
-        var lang = this.languagesToQuery()[0];
-
-        var url = apibase + utilQsString({
-            action: 'wbsearchentities',
-            format: 'json',
-            formatversion: 2,
-            search: query,
-            type: 'item',
-            // the language to search
-            language: lang,
-            // the language for the label and description in the result
-            uselang: lang,
-            limit: 10,
-            origin: '*'
-        });
-
-        d3_json(url)
-            .then(function(result) {
-                if (result && result.error) {
-                    throw new Error(result.error);
-                }
-                if (callback) callback(null, result.search || {});
-            })
-            .catch(function(err) {
-                if (callback) callback(err.message, {});
-            });
-    },
-
-
-    // Given a Wikipedia language and article title,
-    // return an array of corresponding Wikidata entities.
-    itemsByTitle: function(lang, title, callback) {
-        if (!title) {
-            if (callback) callback('No title', {});
-            return;
-        }
-
-        lang = lang || 'en';
-        var url = apibase + utilQsString({
-            action: 'wbgetentities',
-            format: 'json',
-            formatversion: 2,
-            sites: lang.replace(/-/g, '_') + 'wiki',
-            titles: title,
-            languages: 'en', // shrink response by filtering to one language
-            origin: '*'
-        });
-
-        d3_json(url)
-            .then(function(result) {
-                if (result && result.error) {
-                    throw new Error(result.error);
-                }
-                if (callback) callback(null, result.entities || {});
-            })
-            .catch(function(err) {
-                if (callback) callback(err.message, {});
-            });
-    },
-
-
-    languagesToQuery: function() {
-        return localizer.localeCodes().map(function(code) {
-            return code.toLowerCase();
-        }).filter(function(code) {
-            // HACK: en-us isn't a wikidata language. We should really be filtering by
-            // the languages known to be supported by wikidata.
-            return code !== 'en-us';
-        });
-    },
-
-
-    entityByQID: function(qid, callback) {
-        if (!qid) {
-            callback('No qid', {});
-            return;
-        }
-        if (_wikidataCache[qid]) {
-            if (callback) callback(null, _wikidataCache[qid]);
-            return;
-        }
-
-        var langs = this.languagesToQuery();
-        var url = apibase + utilQsString({
-            action: 'wbgetentities',
-            format: 'json',
-            formatversion: 2,
-            ids: qid,
-            props: 'labels|descriptions|claims|sitelinks',
-            sitefilter: langs.map(function(d) { return d + 'wiki'; }).join('|'),
-            languages: langs.join('|'),
-            languagefallback: 1,
-            origin: '*'
-        });
-
-        d3_json(url)
-            .then(function(result) {
-                if (result && result.error) {
-                    throw new Error(result.error);
-                }
-                if (callback) callback(null, result.entities[qid] || {});
-            })
-            .catch(function(err) {
-                if (callback) callback(err.message, {});
-            });
-    },
-
-
-    // Pass `params` object of the form:
-    // {
-    //   qid: 'string'      // brand wikidata  (e.g. 'Q37158')
-    // }
-    //
-    // Get an result object used to display tag documentation
-    // {
-    //   title:        'string',
-    //   description:  'string',
-    //   editURL:      'string',
-    //   imageURL:     'string',
-    //   wiki:         { title: 'string', text: 'string', url: 'string' }
-    // }
-    //
-    getDocs: function(params, callback) {
-        var langs = this.languagesToQuery();
-        this.entityByQID(params.qid, function(err, entity) {
-            if (err || !entity) {
-                callback(err || 'No entity');
-                return;
-            }
-
-            var i;
-            var description;
-            for (i in langs) {
-                let code = langs[i];
-                if (entity.descriptions[code] && entity.descriptions[code].language === code) {
-                    description = entity.descriptions[code];
-                    break;
-                }
-            }
-            if (!description && Object.values(entity.descriptions).length) description = Object.values(entity.descriptions)[0];
-
-            // prepare result
-            var result = {
-                title: entity.id,
-                description: description ? description.value : '',
-                descriptionLocaleCode: description ? description.language : '',
-                editURL: 'https://www.wikidata.org/wiki/' + entity.id
-            };
-
-            // add image
-            if (entity.claims) {
-                var imageroot = 'https://commons.wikimedia.org/w/index.php';
-                var props = ['P154','P18'];  // logo image, image
-                var prop, image;
-                for (i = 0; i < props.length; i++) {
-                    prop = entity.claims[props[i]];
-                    if (prop && Object.keys(prop).length > 0) {
-                        image = prop[Object.keys(prop)[0]].mainsnak.datavalue.value;
-                        if (image) {
-                            result.imageURL = imageroot + '?' + utilQsString({
-                                title: 'Special:Redirect/file/' + image,
-                                width: 400
-                            });
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (entity.sitelinks) {
-                var englishLocale = localizer.languageCode().toLowerCase() === 'en';
-
-                // must be one of these that we requested..
-                for (i = 0; i < langs.length; i++) {   // check each, in order of preference
-                    var w = langs[i] + 'wiki';
-                    if (entity.sitelinks[w]) {
-                        var title = entity.sitelinks[w].title;
-                        var tKey = 'inspector.wiki_reference';
-                        if (!englishLocale && langs[i] === 'en') {   // user's locale isn't English but
-                            tKey = 'inspector.wiki_en_reference';    // we are sending them to enwiki anyway..
-                        }
-
-                        result.wiki = {
-                            title: title,
-                            text: tKey,
-                            url: 'https://' + langs[i] + '.wikipedia.org/wiki/' + title.replace(/ /g, '_')
-                        };
-                        break;
-                    }
-                }
-            }
-
-            callback(null, result);
-        });
-    }
-
-};
diff --git a/modules/services/wikipedia.js b/modules/services/wikipedia.js
deleted file mode 100644
index 7a713cb6a2..0000000000
--- a/modules/services/wikipedia.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import { json as d3_json } from 'd3-fetch';
-import { utilQsString } from '@rapid-sdk/util';
-
-
-var endpoint = 'https://en.wikipedia.org/w/api.php?';
-
-export default {
-
-    init: function() {},
-    reset: function() {},
-
-
-    search: function(lang, query, callback) {
-        if (!query) {
-            if (callback) callback('No Query', []);
-            return;
-        }
-
-        lang = lang || 'en';
-        var url = endpoint.replace('en', lang) +
-            utilQsString({
-                action: 'query',
-                list: 'search',
-                srlimit: '10',
-                srinfo: 'suggestion',
-                format: 'json',
-                origin: '*',
-                srsearch: query
-            });
-
-        d3_json(url)
-            .then(function(result) {
-                if (result && result.error) {
-                    throw new Error(result.error);
-                } else if (!result || !result.query || !result.query.search) {
-                    throw new Error('No Results');
-                }
-                if (callback) {
-                    var titles = result.query.search.map(function(d) { return d.title; });
-                    callback(null, titles);
-                }
-            })
-            .catch(function(err) {
-                if (callback) callback(err, []);
-            });
-    },
-
-
-    suggestions: function(lang, query, callback) {
-        if (!query) {
-            if (callback) callback('', []);
-            return;
-        }
-
-        lang = lang || 'en';
-        var url = endpoint.replace('en', lang) +
-            utilQsString({
-                action: 'opensearch',
-                namespace: 0,
-                suggest: '',
-                format: 'json',
-                origin: '*',
-                search: query
-            });
-
-        d3_json(url)
-            .then(function(result) {
-                if (result && result.error) {
-                    throw new Error(result.error);
-                } else if (!result || result.length < 2) {
-                    throw new Error('No Results');
-                }
-                if (callback) callback(null, result[1] || []);
-            })
-            .catch(function(err) {
-                if (callback) callback(err.message, []);
-            });
-    },
-
-
-    translations: function(lang, title, callback) {
-        if (!title) {
-            if (callback) callback('No Title');
-            return;
-        }
-
-        var url = endpoint.replace('en', lang) +
-            utilQsString({
-                action: 'query',
-                prop: 'langlinks',
-                format: 'json',
-                origin: '*',
-                lllimit: 500,
-                titles: title
-            });
-
-        d3_json(url)
-            .then(function(result) {
-                if (result && result.error) {
-                    throw new Error(result.error);
-                } else if (!result || !result.query || !result.query.pages) {
-                    throw new Error('No Results');
-                }
-                if (callback) {
-                    var list = result.query.pages[Object.keys(result.query.pages)[0]];
-                    var translations = {};
-                    if (list && list.langlinks) {
-                        list.langlinks.forEach(function(d) { translations[d.lang] = d['*']; });
-                    }
-                    callback(null, translations);
-                }
-            })
-            .catch(function(err) {
-                if (callback) callback(err.message);
-            });
-    }
-
-};
diff --git a/modules/ui/UiDefs.js b/modules/ui/UiDefs.js
index 32e5668921..fd1089cd66 100644
--- a/modules/ui/UiDefs.js
+++ b/modules/ui/UiDefs.js
@@ -81,7 +81,7 @@ export class UiDefs {
     // Notify Pixi about the icons so they can be used by WebGL - see Rapid#925
     // Note: We believe that by the time `_spritesheetLoaded` is called,
     // Pixi's textureManager should be set up, throw if we're wrong about this.
-    const textureManager = this.context.map().renderer?.textures;
+    const textureManager = this.context.mapSystem().renderer?.textures;
     if (!textureManager) {
       throw new Error(`TextureManager not ready to pack icons for ${spritesheetID}`);
     }
diff --git a/modules/ui/UiField.js b/modules/ui/UiField.js
new file mode 100644
index 0000000000..ba4c316bf5
--- /dev/null
+++ b/modules/ui/UiField.js
@@ -0,0 +1,427 @@
+import { dispatch as d3_dispatch } from 'd3-dispatch';
+import { select as d3_select } from 'd3-selection';
+import { utilUniqueString } from '@rapid-sdk/util';
+
+import { uiIcon } from './icon';
+import { uiTooltip } from './tooltip';
+// import { uiFieldHelp } from './field_help';
+import { uiFields } from './fields';
+import { uiTagReference } from './tag_reference';
+import { utilRebind, utilTotalExtent } from '../util';
+
+
+/**
+ * UiField
+ * Creates a new field, wraps the actual _internal implementation of that field
+ */
+export class UiField {
+
+  /**
+   * @constructor
+   * @param  `context`  Global shared application context
+   */
+  constructor(context, presetField, entityIDs = [], options = {}) {
+    this.context = context;
+    this.presetField = presetField;
+    this.entityIDs = entityIDs;
+
+    this.options = Object.assign({
+      show: true,
+      wrap: true,
+      remove: true,
+      revert: true,
+      info: true
+    }, options);
+
+//    // Don't show the remove and revert buttons if any of the entity IDs are FB features
+//    // with source=digitalglobe or source=maxar
+//    const someFbRoadsSelected = entityIDs ? entityIDs.some(function(entity) {
+//      return entity.__fbid__ && (entity.tags.source === 'maxar' || entity.tags.source === 'digitalglobe');
+//    }) : false;
+//    if (someFbRoadsSelected) {
+//      this.options.remove = false;
+//      this.options.revert = false;
+//    }
+
+    // copy some commonly used stuff from the presetField
+    this.id = presetField.id;
+    this.type = presetField.type;
+    this.title = presetField.title();
+    this.label = presetField.label();
+    this.terms = presetField.terms();
+    this.placeholder = presetField.placeholder();
+    this.default = presetField.default;
+    this.key = presetField.key;
+    this.keys = presetField.keys;
+    this.t = presetField.t;
+    this.tHtml = presetField.tHtml;
+    this.hasTextForStringID = presetField.hasTextForStringID;
+    this.uid = utilUniqueString(`form-field-${presetField.safeid}`);
+
+    this._show = this.options.show;
+    this._internal = null;
+    this._state = '';
+    this._tags = {};
+
+    this.entityExtent = null;
+    if (entityIDs?.length) {
+      this.entityExtent = utilTotalExtent(entityIDs, context.graph());
+    }
+
+    this._locked = false;
+    this._lockedTip = uiTooltip(context)
+      .title(context.tHtml('inspector.lock.suggestion', { label: this.label }))
+      .placement('bottom');
+
+
+    this.dispatch = d3_dispatch('change', 'revert');
+    utilRebind(this, this.dispatch, 'on');
+
+    // Ensure methods used as callbacks always have `this` bound correctly.
+    // (This is also necessary when using `d3-selection.call`)
+    this.isAllowed = this.isAllowed.bind(this);
+    this.isModified = this.isModified.bind(this);
+    this.isShown = this.isShown.bind(this);
+    this.remove = this.remove.bind(this);
+    this.render = this.render.bind(this);
+    this.revert = this.revert.bind(this);
+    this.tagsContainFieldKey = this.tagsContainFieldKey.bind(this);
+
+    // Create the field internals now if we know it will be shown
+    if (this._show) {
+      this._createField();
+    }
+  }
+
+
+  // Creates the field.. This is done lazily,
+  // once we know that the field will be shown.
+  _createField() {
+    if (this._internal) return;
+
+    this._internal = uiFields[this.type](this.context, this)
+      .on('change', (tagChange, onInput) => {
+        this.dispatch.call('change', this, tagChange, onInput);
+      });
+
+    // If this field cares about the entities, pass them along
+    if (typeof this._internal.entityIDs === 'function') {
+      this._internal.entityIDs(this.entityIDs);
+    }
+  }
+
+
+  isModified() {
+    if (!this.entityIDs?.length) return false;
+
+    return this.entityIDs.some(entityID => {
+      const graph = this.context.graph();
+      const original = graph.base.entities.get(entityID);
+      const latest = graph.entity(entityID);
+      return this.keys.some(key => {
+        return original ? latest.tags[key] !== original.tags[key] : latest.tags[key];
+      });
+    });
+  }
+
+
+  tagsContainFieldKey() {
+    return this.keys.some(key => {
+      if (this.type === 'multiCombo') {
+        for (const tagKey in this._tags) {
+          if (tagKey.indexOf(key) === 0) {
+            return true;
+          }
+        }
+        return false;
+      } else {
+        return this._tags[key] !== undefined;
+      }
+    });
+  }
+
+
+  revert(d3_event) {
+    d3_event.stopPropagation();
+    d3_event.preventDefault();
+    if (!this.entityIDs?.length || this._locked) return;
+
+    this.dispatch.call('revert', this, this.keys);
+  }
+
+
+  remove(d3_event) {
+    d3_event.stopPropagation();
+    d3_event.preventDefault();
+    if (this._locked) return;
+
+    let tagChange = {};
+    this.keys.forEach(k => tagChange[k] = undefined);
+    this.dispatch.call('change', this, tagChange);
+  }
+
+
+
+  /**
+   * render
+   * @param  `selection`  A d3-selection to a parent element that the field should render itself into
+   */
+  render(selection) {
+    const l10n = this.context.localizationSystem();
+
+    let container = selection.selectAll('.form-field')
+      .data([this]);
+
+    // Enter
+    let enter = container.enter()
+      .append('div')
+      .attr('class', `form-field form-field-${this.safeid}`)
+      .classed('nowrap', !this.options.wrap);
+
+    if (this.options.wrap) {
+      let labelEnter = enter
+        .append('label')
+        .attr('class', 'field-label')
+        .attr('for', this.uid);
+
+      let textEnter = labelEnter
+        .append('span')
+        .attr('class', 'label-text');
+
+      textEnter
+        .append('span')
+        .attr('class', 'label-textvalue')
+        .html(this.label);
+
+      textEnter
+        .append('span')
+        .attr('class', 'label-textannotation');
+
+      if (this.options.remove) {
+        labelEnter
+          .append('button')
+          .attr('class', 'remove-icon')
+          .attr('title', l10n.t('icons.remove'))
+          .call(uiIcon('#rapid-operation-delete'));
+      }
+
+      if (this.options.revert) {
+        labelEnter
+          .append('button')
+          .attr('class', 'modified-icon')
+          .attr('title', l10n.t('icons.undo'))
+          .call(uiIcon(l10n.isRTL() ? '#rapid-icon-redo' : '#rapid-icon-undo'));
+      }
+    }
+
+
+    // Update
+    container = container
+      .merge(enter);
+
+    container.select('.field-label > .remove-icon')  // propagate bound data
+      .on('click', this.remove);
+
+    container.select('.field-label > .modified-icon')  // propagate bound data
+      .on('click', this.revert);
+
+// kind of a convoluted way to do it.. selection.each over one thing that is just `this`? :-/
+    container
+      .each((d, i, nodes) => {
+        let selection = d3_select(nodes[i]);
+
+        if (!this._internal) {
+          this._createField();
+        }
+
+//        // instantiate field help
+//        let help;
+//        if (this.options.wrap && this.type === 'restrictions') {
+//           help = uiFieldHelp(this.context, 'restrictions');
+//        }
+
+        // instantiate tag reference
+        let reference;
+        if (this.options.wrap && this.options.info) {
+          let referenceKey = this.key || '';
+          if (this.type === 'multiCombo') {   // lookup key without the trailing ':'
+            referenceKey = referenceKey.replace(/:$/, '');
+          }
+
+          reference = uiTagReference(this.context, this.reference || { key: referenceKey });
+          if (this._state === 'hover') {
+            reference.showing(false);
+          }
+        }
+
+        selection
+          .call(this._internal);
+
+//        // add field help components
+//        if (help) {
+//          selection
+//            .call(help.body)
+//            .select('.field-label')
+//            .call(help.button);
+//        }
+
+        // add tag reference components
+        if (reference) {
+          selection
+            .call(reference.body)
+            .select('.field-label')
+            .call(reference.button);
+        }
+
+        this._internal.tags(this._tags);
+      });
+
+
+    container
+      .classed('locked', this._locked)
+      .classed('modified', this.isModified())
+      .classed('present', this.tagsContainFieldKey());
+
+    // show a tip and lock icon if the field is locked
+    let annotation = container.selectAll('.field-label .label-textannotation');
+    let icon = annotation.selectAll('.icon')
+      .data(this._locked ? [0]: []);
+
+    icon.exit()
+      .remove();
+
+    icon.enter()
+      .append('svg')
+      .attr('class', 'icon')
+      .append('use')
+      .attr('xlink:href', '#fas-lock');
+
+    container.call(this._locked ? this._lockedTip : this._lockedTip.destroy);
+  }
+
+
+
+  // old style getter/setters
+
+  state(val) {
+    if (val === undefined) return this._state;
+    this._state = val;
+    return this;
+  }
+
+
+  tags(val) {
+    if (val === undefined) return this._tags;
+    this._tags = val;
+
+    // always show a field if it has a value to display
+    if (this.tagsContainFieldKey() && !this._show) {
+      this._show = true;
+      if (!this._internal) {
+        this._createField();
+      }
+    }
+
+    return this;
+  }
+
+
+  locked(val) {
+    if (val === undefined) return this._locked;
+    this._locked = val;
+    return this;
+  }
+
+
+  show() {
+    this._show = true;
+    if (!this._internal) {
+      this._createField();
+    }
+    if (this.default && this.key && this._tags[this.key] !== this.default) {
+      let tagChange = {};
+      tagChange[this.key] = this.default;
+      this.dispatch.call('change', this, tagChange);
+    }
+  }
+
+
+  // A shown field has a visible UI, a non-shown field is in the 'Add field' dropdown
+  isShown() {
+    return this._show;
+  }
+
+
+  /**
+   * isAllowed
+   * An allowed field can appear in the UI or in the 'Add field' dropdown.
+   * A non-allowed field is hidden from the user altogether
+   * Some reasons why a field may be hidden:
+   *   - the user has selected multiple things and they don't all apply to the field
+   *   - the field is not available in the location where the user is editing
+   *
+   * @return    `true` if the field can be shown, `false` if the field should be hidden
+   */
+  isAllowed() {
+    const context = this.context;
+    const presetField = this.presetField;
+    const locationSystem = context.locationSystem();
+
+    // Most of the time we have entityIDs to consider, but if not, just return `true`.
+    // For example: the fields on the upload dialog that set the changeset tags.
+    if (!this.entityIDs?.length) return true;
+
+    // Does this field support multiselection?
+    if (this.entityIDs.length > 1 && uiFields[this.type].supportsMultiselection === false) {
+      return false;
+    }
+
+    // Does this field work with all the geometries of the entities selected?
+    if (presetField.geometry && !this.entityIDs.every(entityID => {
+      return presetField.matchGeometry(context.graph().geometry(entityID));
+    })) {
+      return false;
+    }
+
+    // Is this field allowed in this location?
+    if (this.entityExtent && presetField.locationSetID) {
+      const validHere = locationSystem.locationSetsAt(this.entityExtent.center());
+      if (!validHere[presetField.locationSetID]) return false;
+    }
+
+    // Does this field require another tag to be set first?
+    // (ignore tagging prerequisites if the field already has a value)
+    const prerequisiteTag = presetField.prerequisiteTag;
+    if (prerequisiteTag && !this.tagsContainFieldKey()) {
+      const isPrerequisiteSatisfied = this.entityIDs.every(entityID => {
+        const entity = context.graph().entity(entityID);
+        if (prerequisiteTag.key) {
+          const value = entity.tags[prerequisiteTag.key];
+          if (!value) return false;
+
+          if (prerequisiteTag.valueNot) {
+            return prerequisiteTag.valueNot !== value;
+          }
+          if (prerequisiteTag.value) {
+            return prerequisiteTag.value === value;
+          }
+        } else if (prerequisiteTag.keyNot) {
+          if (entity.tags[prerequisiteTag.keyNot]) return false;
+        }
+        return true;
+      });
+
+      if (!isPrerequisiteSatisfied) return false;
+    }
+
+    return true;
+  }
+
+
+  focus() {
+    if (this._internal) {
+      this._internal.focus();
+    }
+  }
+
+}
diff --git a/modules/ui/account.js b/modules/ui/account.js
index 8cc5ebce61..4beb07b8ea 100644
--- a/modules/ui/account.js
+++ b/modules/ui/account.js
@@ -1,9 +1,8 @@
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 
 
 export function uiAccount(context) {
-  const osm = context.connection();
+  const osm = context.services.get('osm');
 
 
   function updateUserDetails(selection) {
@@ -50,7 +49,7 @@ export function uiAccount(context) {
       loginLogout
         .classed('hide', false)
         .select('a')
-        .text(t('logout'))
+        .text(context.t('logout'))
         .on('click', e => {
           e.preventDefault();
           osm.logout();
@@ -66,7 +65,7 @@ export function uiAccount(context) {
       loginLogout
         .classed('hide', false)
         .select('a')
-        .text(t('login'))
+        .text(context.t('login'))
         .on('click', e => {
           e.preventDefault();
           osm.authenticate();
@@ -81,7 +80,7 @@ export function uiAccount(context) {
   function tryLogout()  {
     if (!osm) return;
 
-    const url = osm.getUrlRoot() + '/logout?referer=%2Flogin';
+    const url = osm.urlroot + '/logout?referer=%2Flogin';
     // Create a 600x550 popup window in the center of the screen
     const w = 600;
     const h = 550;
@@ -111,7 +110,7 @@ export function uiAccount(context) {
       .append('a')
       .attr('href', '#');
 
-    osm.on('change.account', () => updateUserDetails(selection));
+    osm.on('authchange', () => updateUserDetails(selection));
     updateUserDetails(selection);
   };
 
diff --git a/modules/ui/attribution.js b/modules/ui/attribution.js
index 06bb067329..b6ff711cc2 100644
--- a/modules/ui/attribution.js
+++ b/modules/ui/attribution.js
@@ -1,9 +1,9 @@
 import _throttle from 'lodash-es/throttle';
 import { select as d3_select } from 'd3-selection';
-import { t } from '../core/localizer';
 
 
 export function uiAttribution(context) {
+  const imagerySystem = context.imagerySystem();
   let _selection = d3_select(null);
 
 
@@ -41,7 +41,7 @@ export function uiAttribution(context) {
             .attr('target', '_blank');
         }
 
-        const terms_text = t(`imagery.${d.idtx}.attribution.text`, { default: d.terms_text || d.id || d.name });
+        const terms_text = context.t(`imagery.${d.idtx}.attribution.text`, { default: d.terms_text || d.id || d.name });
 
         if (d.icon && !d.overlay) {
           attribution
@@ -60,7 +60,7 @@ export function uiAttribution(context) {
 
     let copyright = attributions.selectAll('.copyright-notice')
       .data(d => {
-        let notice = d.copyrightNotices(context.map().zoom(), context.map().extent());
+        let notice = d.copyrightNotices(context.mapSystem().zoom(), context.mapSystem().extent());
         return notice ? [notice] : [];
       });
 
@@ -78,12 +78,12 @@ export function uiAttribution(context) {
 
 
   function update() {
-    let baselayer = context.imagery().baseLayerSource();
+    let baselayer = imagerySystem.baseLayerSource();
     _selection
       .call(render, (baselayer ? [baselayer] : []), 'base-layer-attribution');
 
-    const z = context.map().zoom();
-    let overlays = context.imagery().overlayLayerSources() || [];
+    const z = context.mapSystem().zoom();
+    let overlays = imagerySystem.overlayLayerSources() || [];
     _selection
       .call(render, overlays.filter(s => s.validZoom(z)), 'overlay-layer-attribution');
   }
@@ -92,10 +92,8 @@ export function uiAttribution(context) {
   return function(selection) {
     _selection = selection;
 
-    context.imagery()
-      .on('change.attribution', update);
-
-    context.map().on('draw', _throttle(update, 400, { leading: false }));
+    imagerySystem.on('imagerychange', update);
+    context.mapSystem().on('draw', _throttle(update, 400, { leading: false }));
 
     update();
   };
diff --git a/modules/ui/changeset_editor.js b/modules/ui/changeset_editor.js
index 31207ecbe5..4e2ecda4ac 100644
--- a/modules/ui/changeset_editor.js
+++ b/modules/ui/changeset_editor.js
@@ -1,11 +1,9 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { utilArrayUniqBy } from '@rapid-sdk/util';
 
-import { presetManager } from '../presets';
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 import { uiCombobox} from './combobox';
-import { uiField } from './field';
+import { UiField } from './UiField';
 import { uiFormFields } from './form_fields';
 import { utilRebind, utilTriggerEvent } from '../util';
 
@@ -14,7 +12,7 @@ export function uiChangesetEditor(context) {
     var dispatch = d3_dispatch('change');
     var formFields = uiFormFields(context);
     var commentCombo = uiCombobox(context, 'comment').caseSensitive(true);
-    var _fieldsArr;
+    var _uifields;
     var _tags;
     var _changesetID;
 
@@ -27,17 +25,17 @@ export function uiChangesetEditor(context) {
     function render(selection) {
         var initial = false;
 
-        if (!_fieldsArr) {
+        if (!_uifields) {
             initial = true;
-            var presets = presetManager;
+            var presetSysetem = context.presetSystem();
 
-            _fieldsArr = [
-                uiField(context, presets.field('comment'), null, { show: true, revert: false }),
-                uiField(context, presets.field('source'), null, { show: false, revert: false }),
-                uiField(context, presets.field('hashtags'), null, { show: false, revert: false }),
+            _uifields = [
+                new UiField(context, presetSysetem.field('comment'), null, { show: true, revert: false }),
+                new UiField(context, presetSysetem.field('source'), null, { show: false, revert: false }),
+                new UiField(context, presetSysetem.field('hashtags'), null, { show: false, revert: false }),
             ];
 
-            _fieldsArr.forEach(function(field) {
+            _uifields.forEach(function(field) {
                 field
                     .on('change', function(t, onInput) {
                         dispatch.call('change', field, undefined, t, onInput);
@@ -45,14 +43,14 @@ export function uiChangesetEditor(context) {
             });
         }
 
-        _fieldsArr.forEach(function(field) {
+        _uifields.forEach(function(field) {
             field
                 .tags(_tags);
         });
 
 
         selection
-            .call(formFields.fieldsArr(_fieldsArr));
+            .call(formFields.fieldsArr(_uifields));
 
 
         if (initial) {
@@ -68,7 +66,7 @@ export function uiChangesetEditor(context) {
             // and checked for hashtags, even if retrieved from localstorage
             utilTriggerEvent(commentField, 'blur');
 
-            var osm = context.connection();
+            var osm = context.services.get('osm');
             if (osm) {
                 osm.userChangesets(function (err, changesets) {
                     if (err) return;
@@ -106,9 +104,9 @@ export function uiChangesetEditor(context) {
             .append('a')
             .attr('target', '_blank')
             .call(uiIcon('#rapid-icon-alert', 'inline'))
-            .attr('href', t('commit.google_warning_link'))
+            .attr('href', context.t('commit.google_warning_link'))
             .append('span')
-            .html(t.html('commit.google_warning'));
+            .text(context.t('commit.google_warning'));
 
         commentEnter
             .transition()
@@ -120,7 +118,7 @@ export function uiChangesetEditor(context) {
     changesetEditor.tags = function(_) {
         if (!arguments.length) return _tags;
         _tags = _;
-        // Don't reset _fieldsArr here.
+        // Don't reset _uifields here.
         return changesetEditor;
     };
 
@@ -129,7 +127,7 @@ export function uiChangesetEditor(context) {
         if (!arguments.length) return _changesetID;
         if (_changesetID === _) return changesetEditor;
         _changesetID = _;
-        _fieldsArr = null;
+        _uifields = null;
         return changesetEditor;
     };
 
diff --git a/modules/ui/cmd.js b/modules/ui/cmd.js
index 6dce478948..00b44c1670 100644
--- a/modules/ui/cmd.js
+++ b/modules/ui/cmd.js
@@ -1,10 +1,9 @@
-import { t } from '../core/localizer';
 import { utilDetect } from '../util/detect';
 
 
 // Translate a MacOS key command into the appropriate Windows/Linux equivalent.
 // For example, ⌘Z -> Ctrl+Z
-export let uiCmd = function (code) {
+export let uiCmd = function(code) {
   const detected = utilDetect();
 
   if (detected.os === 'mac') {
@@ -37,9 +36,10 @@ export let uiCmd = function (code) {
 
 
 // return a display-focused string for a given keyboard code
-uiCmd.display = function(code) {
+uiCmd.display = function(context, code) {
   if (code.length !== 1) return code;
 
+  const t = context.t;
   const detected = utilDetect();
   const mac = (detected.os === 'mac');
   const replacements = {
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 46755352b2..cade98cace 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -3,11 +3,8 @@ import { select as d3_select } from 'd3-selection';
 import { utilArrayGroupBy, utilUniqueString } from '@rapid-sdk/util';
 import deepEqual from 'fast-deep-equal';
 
-import { prefs } from '../core/preferences';
-import { t, localizer } from '../core/localizer';
 import { osmChangeset } from '../osm';
 import { uiIcon } from './icon';
-import { services } from '../services';
 import { uiTooltip } from './tooltip';
 import { uiChangesetEditor } from './changeset_editor';
 import { uiSectionChanges } from './sections/changes';
@@ -16,617 +13,621 @@ import { uiSectionRawTagEditor } from './sections/raw_tag_editor';
 import { utilDetect, utilRebind } from '../util';
 
 
-var readOnlyTags = [
-    /^changesets_count$/,
-    /^created_by$/,
-    /^ideditor:/,
-    /^imagery_used$/,
-    /^host$/,
-    /^locale$/,
-    /^warnings:/,
-    /^resolved:/,
-    /^closed:note$/,
-    /^closed:keepright$/,
-    /^closed:improveosm:/,
-    /^closed:osmose:/
+const readOnlyTags = [
+  /^changesets_count$/,
+  /^created_by$/,
+  /^ideditor:/,
+  /^imagery_used$/,
+  /^host$/,
+  /^locale$/,
+  /^warnings:/,
+  /^resolved:/,
+  /^closed:note$/,
+  /^closed:keepright$/,
+  /^closed:improveosm:/,
+  /^closed:osmose:/
 ];
 
-// treat most punctuation (except -, _, +, &) as hashtag delimiters - #4398
+// treat most punctuation (except -, _, +, &) as hashtag delimiters - iD#4398
 // from https://stackoverflow.com/a/25575009
-var hashtagRegex = /(#[^\u2000-\u206F\u2E00-\u2E7F\s\\'!"#$%()*,.\/:;<=>?@\[\]^`{|}~]+)/g;
+const hashtagRegex = /(#[^\u2000-\u206F\u2E00-\u2E7F\s\\'!"#$%()*,.\/:;<=>?@\[\]^`{|}~]+)/g;
 
 
 export function uiCommit(context) {
-    var dispatch = d3_dispatch('cancel');
-    var _userDetails;
-    var _selection;
-
-    var changesetEditor = uiChangesetEditor(context)
-        .on('change', changeTags);
-    var rawTagEditor = uiSectionRawTagEditor('changeset-tag-editor', context)
-        .on('change', changeTags)
-        .readOnlyTags(readOnlyTags);
-    var commitChanges = uiSectionChanges(context);
-    var commitWarnings = uiCommitWarnings(context);
-
-
-    function commit(selection) {
-        _selection = selection;
-
-        // Initialize changeset if one does not exist yet.
-        if (!context.changeset) initChangeset();
-
-        updateSessionChangesetTags();
-        selection.call(render);
+  const uploader = context.uploaderSystem();
+  const dispatch = d3_dispatch('cancel');
+  let _userDetails;
+  let _selection;
+
+  const changesetEditor = uiChangesetEditor(context)
+    .on('change', changeTags);
+  const rawTagEditor = uiSectionRawTagEditor(context, 'changeset-tag-editor')
+    .on('change', changeTags)
+    .readOnlyTags(readOnlyTags);
+  const commitChanges = uiSectionChanges(context);
+  const commitWarnings = uiCommitWarnings(context);
+
+
+  function commit(selection) {
+    _selection = selection;
+
+    // Initialize changeset if one does not exist yet.
+    if (!uploader.changeset) initChangeset();
+
+    updateSessionChangesetTags();
+    selection.call(render);
+  }
+
+
+  //
+  // Creates an initial changeset
+  //
+  function initChangeset() {
+    const prefs = context.storageSystem();
+    const localeCode = context.localizationSystem().localeCode();
+
+    // Expire stored comment, hashtags, source after cutoff datetime - iD#3947 iD#4899
+    const commentDate = +prefs.getItem('commentDate') || 0;
+    const currDate = Date.now();
+    const cutoff = 2 * 86400 * 1000;   // 2 days
+    if (commentDate > currDate || currDate - commentDate > cutoff) {
+      prefs.removeItem('comment');
+      prefs.removeItem('hashtags');
+      prefs.removeItem('source');
     }
 
+    // load in explicitly-set values, if any
+    if (context.defaultChangesetComment) {
+      prefs.setItem('comment', context.defaultChangesetComment);
+      prefs.setItem('commentDate', Date.now());
+    }
+    if (context.defaultChangesetSource) {
+      prefs.setItem('source', context.defaultChangesetSource);
+      prefs.setItem('commentDate', Date.now());
+    }
+    if (context.defaultChangesetHashtags) {
+      prefs.setItem('hashtags', context.defaultChangesetHashtags);
+      prefs.setItem('commentDate', Date.now());
+    }
 
-    //
-    // Creates an initial changeset
-    //
-    function initChangeset() {
-        // expire stored comment, hashtags, source after cutoff datetime - #3947 #4899
-        var commentDate = +prefs('commentDate') || 0;
-        var currDate = Date.now();
-        var cutoff = 2 * 86400 * 1000;   // 2 days
-        if (commentDate > currDate || currDate - commentDate > cutoff) {
-            prefs('comment', null);
-            prefs('hashtags', null);
-            prefs('source', null);
-        }
-
-        // load in explicitly-set values, if any
-        if (context.defaultChangesetComment()) {
-            prefs('comment', context.defaultChangesetComment());
-            prefs('commentDate', Date.now());
-        }
-        if (context.defaultChangesetSource()) {
-            prefs('source', context.defaultChangesetSource());
-            prefs('commentDate', Date.now());
-        }
-        if (context.defaultChangesetHashtags()) {
-            prefs('hashtags', context.defaultChangesetHashtags());
-            prefs('commentDate', Date.now());
-        }
+    const detected = utilDetect();
+    let tags = {
+      comment: prefs.getItem('comment') || '',
+      created_by: context.cleanTagValue('Rapid ' + context.version),
+      host: context.cleanTagValue(detected.host),
+      locale: context.cleanTagValue(localeCode)
+    };
 
-        var detected = utilDetect();
-        var tags = {
-            comment: prefs('comment') || '',
-            created_by: context.cleanTagValue('Rapid ' + context.version),
-            host: context.cleanTagValue(detected.host),
-            locale: context.cleanTagValue(localizer.localeCode())
-        };
-
-        // call findHashtags initially - this will remove stored
-        // hashtags if any hashtags are found in the comment - #4304
-        findHashtags(tags, true);
-
-        var hashtags = prefs('hashtags');
-        if (hashtags) {
-            tags.hashtags = hashtags;
-        }
+    // Call findHashtags initially - this will remove stored
+    // hashtags if any hashtags are found in the comment - iD#4304
+    findHashtags(tags, true);
 
-        var source = prefs('source');
-        if (source) {
-            tags.source = source;
-        }
+    let hashtags = prefs.getItem('hashtags');
+    if (hashtags) {
+      tags.hashtags = hashtags;
+    }
 
-        context.changeset = new osmChangeset({ tags: tags });
+    let source = prefs.getItem('source');
+    if (source) {
+      tags.source = source;
     }
 
+    uploader.changeset = new osmChangeset({ tags: tags });
+  }
+
+
+  //
+  // Calculates tags based on the user's editing session
+  //
+  function updateSessionChangesetTags() {
+    const osm = context.services.get('osm');
+    if (!osm) return;
+
+    let tags = Object.assign({}, uploader.changeset.tags);   // shallow copy
+    let sources = new Set((tags.source || '').split(';'));
+
+    // Sync up the the used photo sources with `sources`
+    let usedPhotos = new Set(context.editSystem().photosUsed());
+    let allPhotos = ['streetside', 'mapillary', 'mapillary-map-features', 'mapillary-signs', 'kartaview'];
+    allPhotos.forEach(function(val) { sources.delete(val); });   // reset all
+    if (usedPhotos.size) {
+      sources.add('streetlevel imagery');
+      usedPhotos.forEach(function(val) { sources.add(val); });
+    } else {
+      sources.delete('streetlevel imagery');
+    }
 
-    //
-    // Calculates tags based on the user's editing session
-    //
-    function updateSessionChangesetTags() {
-        var osm = context.connection();
-        if (!osm) return;
+    // Sync up the used Rapid sources with `sources`
+    let usedRapid = context.rapidSystem().sources;
+    let allRapid = ['mapwithai', 'esri'];
+    allRapid.forEach(function(val) { sources.delete(val); });   // reset all
+    usedRapid.forEach(function(val) { sources.add(val); });
+
+    // Update `source` tag
+    let setSource = context.cleanTagValue(Array.from(sources).filter(Boolean).join(';'));
+    if (setSource) {
+      tags.source = setSource;
+    } else {
+      delete tags.source;
+    }
 
-        var tags = Object.assign({}, context.changeset.tags);   // shallow copy
-        var sources = new Set((tags.source || '').split(';'));
+    // Update `imagery_used` tag
+    let imageries = new Set(context.editSystem().imageryUsed());
+    let setImagery = context.cleanTagValue(Array.from(imageries).filter(Boolean).join(';'));
+    tags.imagery_used = setImagery || 'None';
 
-        // Sync up the the used photo sources with `sources`
-        var usedPhotos = new Set(context.history().photoOverlaysUsed());
-        var allPhotos = ['streetside', 'mapillary', 'mapillary-map-features', 'mapillary-signs', 'kartaview'];
-        allPhotos.forEach(function(val) { sources.delete(val); });   // reset all
-        if (usedPhotos.size) {
-            sources.add('streetlevel imagery');
-            usedPhotos.forEach(function(val) { sources.add(val); });
-        } else {
-            sources.delete('streetlevel imagery');
-        }
+    // Update tags for closed issues and notes
+    const osmClosed = osm.getClosedIDs();
+    if (osmClosed.length) {
+      tags['closed:note'] = context.cleanTagValue(osmClosed.join(';'));
+    }
+    const keepright = context.services.get('keepRight');
+    if (keepright) {
+      const krClosed = keepright.getClosedIDs();
+      if (krClosed.length) {
+        tags['closed:keepright'] = context.cleanTagValue(krClosed.join(';'));
+      }
+    }
+    const improveosm = context.services.get('improveOSM');
+    if (improveosm) {
+      const iOsmClosed = improveosm.getClosedCounts();
+      for (let itemType in iOsmClosed) {
+        tags[`closed:improveosm:${itemType}`] = context.cleanTagValue(iOsmClosed[itemType].toString());
+      }
+    }
+    const osmose = context.services.get('osmose');
+    if (osmose) {
+      const osmoseClosed = osmose.getClosedCounts();
+      for (let itemType in osmoseClosed) {
+        tags[`closed:osmose:${itemType}`] = context.cleanTagValue(osmoseClosed[itemType].toString());
+      }
+    }
 
-        // Sync up the used Rapid sources with `sources`
-        var usedRapid = context.rapidContext().sources;
-        var allRapid = ['mapwithai', 'esri'];
-        allRapid.forEach(function(val) { sources.delete(val); });   // reset all
-        usedRapid.forEach(function(val) { sources.add(val); });
+    // Remove existing issue counts
+    for (let key in tags) {
+      if (key.match(/(^warnings:)|(^resolved:)/)) {
+        delete tags[key];
+      }
+    }
 
-        // Update `source` tag
-        var setSource = context.cleanTagValue(Array.from(sources).filter(Boolean).join(';'));
-        if (setSource) {
-            tags.source = setSource;
+    function addIssueCounts(issues, prefix) {
+      let issuesByType = utilArrayGroupBy(issues, 'type');
+      for (let issueType in issuesByType) {
+        let issuesOfType = issuesByType[issueType];
+        if (issuesOfType[0].subtype) {
+          let issuesBySubtype = utilArrayGroupBy(issuesOfType, 'subtype');
+          for (let issueSubtype in issuesBySubtype) {
+            let issuesOfSubtype = issuesBySubtype[issueSubtype];
+            tags[prefix + ':' + issueType + ':' + issueSubtype] = context.cleanTagValue(issuesOfSubtype.length.toString());
+          }
         } else {
-            delete tags.source;
+          tags[prefix + ':' + issueType] = context.cleanTagValue(issuesOfType.length.toString());
         }
-
-        // Update `imagery_used` tag
-        var imageries = new Set(context.history().imageryUsed());
-        var setImagery = context.cleanTagValue(Array.from(imageries).filter(Boolean).join(';'));
-        tags.imagery_used = setImagery || 'None';
-
-        // Update tags for closed issues and notes
-        var osmClosed = osm.getClosedIDs();
-        var itemType;
-        if (osmClosed.length) {
-            tags['closed:note'] = context.cleanTagValue(osmClosed.join(';'));
-        }
-        if (services.keepRight) {
-            var krClosed = services.keepRight.getClosedIDs();
-            if (krClosed.length) {
-                tags['closed:keepright'] = context.cleanTagValue(krClosed.join(';'));
-            }
-        }
-        if (services.improveOSM) {
-            var iOsmClosed = services.improveOSM.getClosedCounts();
-            for (itemType in iOsmClosed) {
-                tags['closed:improveosm:' + itemType] = context.cleanTagValue(iOsmClosed[itemType].toString());
-            }
-        }
-        if (services.osmose) {
-            var osmoseClosed = services.osmose.getClosedCounts();
-            for (itemType in osmoseClosed) {
-                tags['closed:osmose:' + itemType] = context.cleanTagValue(osmoseClosed[itemType].toString());
-            }
-        }
-
-        // remove existing issue counts
-        for (var key in tags) {
-            if (key.match(/(^warnings:)|(^resolved:)/)) {
-                delete tags[key];
-            }
-        }
-
-        function addIssueCounts(issues, prefix) {
-            var issuesByType = utilArrayGroupBy(issues, 'type');
-            for (var issueType in issuesByType) {
-                var issuesOfType = issuesByType[issueType];
-                if (issuesOfType[0].subtype) {
-                    var issuesBySubtype = utilArrayGroupBy(issuesOfType, 'subtype');
-                    for (var issueSubtype in issuesBySubtype) {
-                        var issuesOfSubtype = issuesBySubtype[issueSubtype];
-                        tags[prefix + ':' + issueType + ':' + issueSubtype] = context.cleanTagValue(issuesOfSubtype.length.toString());
-                    }
-                } else {
-                    tags[prefix + ':' + issueType] = context.cleanTagValue(issuesOfType.length.toString());
-                }
-            }
-        }
-
-        // add counts of warnings generated by the user's edits
-        var warnings = context.validator()
-            .getIssuesBySeverity({ what: 'edited', where: 'all', includeIgnored: true, includeDisabledRules: true })
-            .warning
-            .filter(function(issue) { return issue.type !== 'help_request'; });    // exclude 'fixme' and similar - #8603
-
-        addIssueCounts(warnings, 'warnings');
-
-        // add counts of issues resolved by the user's edits
-        var resolvedIssues = context.validator().getResolvedIssues();
-        addIssueCounts(resolvedIssues, 'resolved');
-
-        context.changeset = context.changeset.update({ tags: tags });
+      }
     }
 
+    // Add counts of warnings generated by the user's edits
+    const warnings = context.validationSystem()
+      .getIssuesBySeverity({ what: 'edited', where: 'all', includeIgnored: true, includeDisabledRules: true })
+      .warning
+      .filter(issue => issue.type !== 'help_request');    // exclude 'fixme' and similar - iD#8603
 
-    //
-    //
-    function render(selection) {
-        var osm = context.connection();
-        if (!osm) return;
+    addIssueCounts(warnings, 'warnings');
 
-        var header = selection.selectAll('.header')
-            .data([0]);
+    // add counts of issues resolved by the user's edits
+    const resolvedIssues = context.validationSystem().getResolvedIssues();
+    addIssueCounts(resolvedIssues, 'resolved');
 
-        var headerTitle = header.enter()
-            .append('div')
-            .attr('class', 'header fillL');
+    uploader.changeset = uploader.changeset.update({ tags: tags });
+  }
 
-        headerTitle
-            .append('div')
-            .append('h3')
-            .html(t.html('commit.title'));
 
-        headerTitle
-            .append('button')
-            .attr('class', 'close')
-            .on('click', function() {
-                dispatch.call('cancel', this);
-            })
-            .call(uiIcon('#rapid-icon-close'));
+  //
+  //
+  function render(selection) {
+    const osm = context.services.get('osm');
+    if (!osm) return;
 
-        var body = selection.selectAll('.body')
-            .data([0]);
+    let header = selection.selectAll('.header')
+      .data([0]);
 
-        body = body.enter()
-            .append('div')
-            .attr('class', 'body')
-            .merge(body);
+    let headerTitle = header.enter()
+      .append('div')
+      .attr('class', 'header fillL');
 
+    headerTitle
+      .append('div')
+      .append('h3')
+      .html(context.tHtml('commit.title'));
 
-        // Changeset Section
-        var changesetSection = body.selectAll('.changeset-editor')
-            .data([0]);
+    headerTitle
+      .append('button')
+      .attr('class', 'close')
+      .on('click', function() {
+        dispatch.call('cancel', this);
+      })
+      .call(uiIcon('#rapid-icon-close'));
 
-        changesetSection = changesetSection.enter()
-            .append('div')
-            .attr('class', 'modal-section changeset-editor')
-            .merge(changesetSection);
+    let body = selection.selectAll('.body')
+      .data([0]);
 
-        changesetSection
-            .call(changesetEditor
-                .changesetID(context.changeset.id)
-                .tags(context.changeset.tags)
-            );
+    body = body.enter()
+      .append('div')
+      .attr('class', 'body')
+      .merge(body);
 
 
-        // Warnings
-        body.call(commitWarnings);
+    // Changeset Section
+    let changesetSection = body.selectAll('.changeset-editor')
+      .data([0]);
 
+    changesetSection = changesetSection.enter()
+      .append('div')
+      .attr('class', 'modal-section changeset-editor')
+      .merge(changesetSection);
 
-        // Upload Explanation
-        var saveSection = body.selectAll('.save-section')
-            .data([0]);
+    changesetSection
+      .call(changesetEditor
+        .changesetID(uploader.changeset.id)
+        .tags(uploader.changeset.tags)
+      );
 
-        saveSection = saveSection.enter()
-            .append('div')
-            .attr('class','modal-section save-section fillL')
-            .merge(saveSection);
 
-        var prose = saveSection.selectAll('.commit-info')
-            .data([0]);
+    // Warnings
+    body.call(commitWarnings);
 
-        if (prose.enter().size()) {   // first time, make sure to update user details in prose
-            _userDetails = null;
-        }
 
-        prose = prose.enter()
-            .append('p')
-            .attr('class', 'commit-info')
-            .html(t.html('commit.upload_explanation'))
-            .merge(prose);
+    // Upload Explanation
+    let saveSection = body.selectAll('.save-section')
+      .data([0]);
 
-        // always check if this has changed, but only update prose.html()
-        // if needed, because it can trigger a style recalculation
-        osm.userDetails(function(err, user) {
-            if (err) return;
+    saveSection = saveSection.enter()
+      .append('div')
+      .attr('class','modal-section save-section fillL')
+      .merge(saveSection);
 
-            if (_userDetails === user) return;  // no change
-            _userDetails = user;
+    let prose = saveSection.selectAll('.commit-info')
+      .data([0]);
 
-            var userLink = d3_select(document.createElement('div'));
+    if (prose.enter().size()) {   // first time, make sure to update user details in prose
+      _userDetails = null;
+    }
 
-            if (user.image_url) {
-                userLink
-                    .append('img')
-                    .attr('src', user.image_url)
-                    .attr('class', 'icon pre-text user-icon');
-            }
+    prose = prose.enter()
+      .append('p')
+      .attr('class', 'commit-info')
+      .html(context.tHtml('commit.upload_explanation'))
+      .merge(prose);
 
-            userLink
-                .append('a')
-                .attr('class', 'user-info')
-                .html(user.display_name)
-                .attr('href', osm.userURL(user.display_name))
-                .attr('target', '_blank');
+    // Always check if this has changed, but only update prose.html()
+    // if needed, because it can trigger a style recalculation
+    osm.userDetails(function(err, user) {
+      if (err) return;
 
-            prose
-                .html(t.html('commit.upload_explanation_with_user', { user: userLink.html() }));
-        });
+      if (_userDetails === user) return;  // no change
+      _userDetails = user;
 
+      let userLink = d3_select(document.createElement('div'));
 
-        // Request Review
-        var requestReview = saveSection.selectAll('.request-review')
-            .data([0]);
+      if (user.image_url) {
+        userLink
+          .append('img')
+          .attr('src', user.image_url)
+          .attr('class', 'icon pre-text user-icon');
+      }
 
-        // Enter
-        var requestReviewEnter = requestReview.enter()
-            .append('div')
-            .attr('class', 'request-review');
+      userLink
+        .append('a')
+        .attr('class', 'user-info')
+        .html(user.display_name)
+        .attr('href', osm.userURL(user.display_name))
+        .attr('target', '_blank');
 
-        var requestReviewDomId = utilUniqueString('commit-input-request-review');
+      prose
+        .html(context.tHtml('commit.upload_explanation_with_user', { user: userLink.html() }));
+    });
 
-        var labelEnter = requestReviewEnter
-            .append('label')
-            .attr('for', requestReviewDomId);
 
-        if (!labelEnter.empty()) {
-            labelEnter
-                .call(uiTooltip().title(t.html('commit.request_review_info')).placement('top'));
-        }
+    // Request Review
+    let requestReview = saveSection.selectAll('.request-review')
+      .data([0]);
 
-        labelEnter
-            .append('input')
-            .attr('type', 'checkbox')
-            .attr('id', requestReviewDomId);
+    // Enter
+    let requestReviewEnter = requestReview.enter()
+      .append('div')
+      .attr('class', 'request-review');
 
-        labelEnter
-            .append('span')
-            .html(t.html('commit.request_review'));
+    let requestReviewDomId = utilUniqueString('commit-input-request-review');
 
-        // Update
-        requestReview = requestReview
-            .merge(requestReviewEnter);
+    let labelEnter = requestReviewEnter
+      .append('label')
+      .attr('for', requestReviewDomId);
 
-        var requestReviewInput = requestReview.selectAll('input')
-            .property('checked', isReviewRequested(context.changeset.tags))
-            .on('change', toggleRequestReview);
+    if (!labelEnter.empty()) {
+      labelEnter
+        .call(uiTooltip(context).title(context.tHtml('commit.request_review_info')).placement('top'));
+    }
 
+    labelEnter
+      .append('input')
+      .attr('type', 'checkbox')
+      .attr('id', requestReviewDomId);
 
-        // Buttons
-        var buttonSection = saveSection.selectAll('.buttons')
-            .data([0]);
+    labelEnter
+      .append('span')
+      .html(context.tHtml('commit.request_review'));
 
-        // enter
-        var buttonEnter = buttonSection.enter()
-            .append('div')
-            .attr('class', 'buttons fillL');
+    // Update
+    requestReview = requestReview
+      .merge(requestReviewEnter);
 
-        buttonEnter
-            .append('button')
-            .attr('class', 'secondary-action button cancel-button')
-            .append('span')
-            .attr('class', 'label')
-            .html(t.html('commit.cancel'));
+    let requestReviewInput = requestReview.selectAll('input')
+      .property('checked', isReviewRequested(uploader.changeset.tags))
+      .on('change', toggleRequestReview);
 
-        var uploadButton = buttonEnter
-            .append('button')
-            .attr('class', 'action button save-button');
 
-        uploadButton.append('span')
-            .attr('class', 'label')
-            .html(t.html('commit.save'));
+    // Buttons
+    let buttonSection = saveSection.selectAll('.buttons')
+      .data([0]);
 
-        var uploadBlockerTooltipText = getUploadBlockerMessage();
+    // enter
+    let buttonEnter = buttonSection.enter()
+      .append('div')
+      .attr('class', 'buttons fillL');
 
-        // update
-        buttonSection = buttonSection
-            .merge(buttonEnter);
+    buttonEnter
+      .append('button')
+      .attr('class', 'secondary-action button cancel-button')
+      .append('span')
+      .attr('class', 'label')
+      .html(context.tHtml('commit.cancel'));
 
-        buttonSection.selectAll('.cancel-button')
-            .on('click.cancel', function() {
-                dispatch.call('cancel', this);
-            });
+    let uploadButton = buttonEnter
+      .append('button')
+      .attr('class', 'action button save-button');
 
-        buttonSection.selectAll('.save-button')
-            .classed('disabled', uploadBlockerTooltipText !== null)
-            .on('click.save', function() {
-                if (!d3_select(this).classed('disabled')) {
-                    this.blur();    // avoid keeping focus on the button - #4641
+    uploadButton.append('span')
+      .attr('class', 'label')
+      .html(context.tHtml('commit.save'));
 
-                    for (var key in context.changeset.tags) {
-                        // remove any empty keys before upload
-                        if (!key) delete context.changeset.tags[key];
-                    }
+    let uploadBlockerTooltipText = getUploadBlockerMessage();
 
-                    context.uploader().save(context.changeset);
-                }
-            });
+    // update
+    buttonSection = buttonSection
+      .merge(buttonEnter);
 
-        // remove any existing tooltip
-        uiTooltip().destroyAny(buttonSection.selectAll('.save-button'));
+    buttonSection.selectAll('.cancel-button')
+      .on('click.cancel', function() {
+        dispatch.call('cancel', this);
+      });
 
-        if (uploadBlockerTooltipText) {
-            buttonSection.selectAll('.save-button')
-                .call(uiTooltip().title(uploadBlockerTooltipText).placement('top'));
-        }
+    buttonSection.selectAll('.save-button')
+      .classed('disabled', uploadBlockerTooltipText !== null)
+      .on('click.save', function() {
+        if (!d3_select(this).classed('disabled')) {
+          this.blur();    // avoid keeping focus on the button - iD#4641
 
-        // Raw Tag Editor
-        var tagSection = body.selectAll('.tag-section.raw-tag-editor')
-            .data([0]);
+          for (let key in uploader.changeset.tags) {
+            // remove any empty keys before upload
+            if (!key) delete uploader.changeset.tags[key];
+          }
 
-        tagSection = tagSection.enter()
-            .append('div')
-            .attr('class', 'modal-section tag-section raw-tag-editor')
-            .merge(tagSection);
+          context.uploader().save();
+        }
+      });
 
-        tagSection
-            .call(rawTagEditor
-                .tags(Object.assign({}, context.changeset.tags))   // shallow copy
-                .render
-            );
+    // remove any existing tooltip
+    uiTooltip(context).destroyAny(buttonSection.selectAll('.save-button'));
 
-        var changesSection = body.selectAll('.commit-changes-section')
-            .data([0]);
+    if (uploadBlockerTooltipText) {
+      buttonSection.selectAll('.save-button')
+        .call(uiTooltip(context).title(uploadBlockerTooltipText).placement('top'));
+    }
 
-        changesSection = changesSection.enter()
-            .append('div')
-            .attr('class', 'modal-section commit-changes-section')
-            .merge(changesSection);
+    // Raw Tag Editor
+    let tagSection = body.selectAll('.tag-section.raw-tag-editor')
+      .data([0]);
 
-        // Change summary
-        changesSection.call(commitChanges.render);
+    tagSection = tagSection.enter()
+      .append('div')
+      .attr('class', 'modal-section tag-section raw-tag-editor')
+      .merge(tagSection);
 
+    tagSection
+      .call(rawTagEditor
+        .tags(Object.assign({}, uploader.changeset.tags))   // shallow copy
+        .render
+      );
 
-        function toggleRequestReview() {
-            var rr = requestReviewInput.property('checked');
-            updateChangeset({ review_requested: (rr ? 'yes' : undefined) });
+    let changesSection = body.selectAll('.commit-changes-section')
+      .data([0]);
 
-            tagSection
-                .call(rawTagEditor
-                    .tags(Object.assign({}, context.changeset.tags))   // shallow copy
-                    .render
-                );
-        }
-    }
+    changesSection = changesSection.enter()
+      .append('div')
+      .attr('class', 'modal-section commit-changes-section')
+      .merge(changesSection);
 
+    // Change summary
+    changesSection.call(commitChanges.render);
 
-    function getUploadBlockerMessage() {
-        var errors = context.validator()
-            .getIssuesBySeverity({ what: 'edited', where: 'all' }).error;
 
-        if (errors.length) {
-            return t('commit.outstanding_errors_message', { count: errors.length });
+    function toggleRequestReview() {
+      const rr = requestReviewInput.property('checked');
+      updateChangeset({ review_requested: (rr ? 'yes' : undefined) });
 
-        } else {
-            var hasChangesetComment = context.changeset && context.changeset.tags.comment && context.changeset.tags.comment.trim().length;
-            if (!hasChangesetComment) {
-                return t('commit.comment_needed_message');
-            }
-        }
-        return null;
+      tagSection
+        .call(rawTagEditor
+          .tags(Object.assign({}, uploader.changeset.tags))   // shallow copy
+          .render
+        );
     }
+  }
 
 
-    function changeTags(_, changed, onInput) {
-        if (changed.hasOwnProperty('comment')) {
-            if (changed.comment === undefined) {
-                changed.comment = '';
-            }
-            if (!onInput) {
-                prefs('comment', changed.comment);
-                prefs('commentDate', Date.now());
-            }
-        }
-        if (changed.hasOwnProperty('source')) {
-            if (changed.source === undefined) {
-                prefs('source', null);
-            } else if (!onInput) {
-                prefs('source', changed.source);
-                prefs('commentDate', Date.now());
-            }
-        }
-        // no need to update `prefs` for `hashtags` here since it's done in `updateChangeset`
+  function getUploadBlockerMessage() {
+    const errors = context.validationSystem()
+      .getIssuesBySeverity({ what: 'edited', where: 'all' }).error;
 
-        updateChangeset(changed, onInput);
+    if (errors.length) {
+      return context.t('commit.outstanding_errors_message', { count: errors.length });
 
-        if (_selection) {
-            _selection.call(render);
-        }
+    } else {
+      const comment = uploader.changeset?.tags?.comment ?? '';
+      if (!comment.trim().length) {
+        return context.t('commit.comment_needed_message');
+      }
+    }
+    return null;
+  }
+
+
+  function changeTags(_, changed, onInput) {
+    const prefs = context.storageSystem();
+    if (changed.hasOwnProperty('comment')) {
+      if (changed.comment === undefined) {
+        changed.comment = '';
+      }
+      if (!onInput) {
+        prefs.setItem('comment', changed.comment);
+        prefs.setItem('commentDate', Date.now());
+      }
     }
+    if (changed.hasOwnProperty('source')) {
+      if (changed.source === undefined) {
+        prefs.removeItem('source');
+      } else if (!onInput) {
+        prefs.setItem('source', changed.source);
+        prefs.setItem('commentDate', Date.now());
+      }
+    }
+    // no need to update `prefs` for `hashtags` here since it's done in `updateChangeset`
 
+    updateChangeset(changed, onInput);
 
-    function findHashtags(tags, commentOnly) {
-        var detectedHashtags = commentHashtags();
+    if (_selection) {
+      _selection.call(render);
+    }
+  }
 
-        if (detectedHashtags.length) {
-            // always remove stored hashtags if there are hashtags in the comment - #4304
-            prefs('hashtags', null);
-        }
-        if (!detectedHashtags.length || !commentOnly) {
-            detectedHashtags = detectedHashtags.concat(hashtagHashtags());
-        }
 
-        var allLowerCase = new Set();
-        return detectedHashtags.filter(function(hashtag) {
-            // Compare tags as lowercase strings, but keep original case tags
-            var lowerCase = hashtag.toLowerCase();
-            if (!allLowerCase.has(lowerCase)) {
-                allLowerCase.add(lowerCase);
-                return true;
-            }
-            return false;
-        });
-
-        // Extract hashtags from `comment`
-        function commentHashtags() {
-            var matches = (tags.comment || '')
-                .replace(/http\S*/g, '')  // drop anything that looks like a URL - #4289
-                .match(hashtagRegex);
-
-            return matches || [];
-        }
+  function findHashtags(tags, commentOnly) {
+    const prefs = context.storageSystem();
+    let detectedHashtags = commentHashtags();
 
-        // Extract and clean hashtags from `hashtags`
-        function hashtagHashtags() {
-            var matches = (tags.hashtags || '')
-                .split(/[,;\s]+/)
-                .map(function (s) {
-                    if (s[0] !== '#') { s = '#' + s; }    // prepend '#'
-                    var matched = s.match(hashtagRegex);
-                    return matched && matched[0];
-                }).filter(Boolean);                       // exclude falsy
-
-            return matches || [];
-        }
+    if (detectedHashtags.length) {
+      // always remove stored hashtags if there are hashtags in the comment - iD#4304
+      prefs.removeItem('hashtags');
+    }
+    if (!detectedHashtags.length || !commentOnly) {
+      detectedHashtags = detectedHashtags.concat(hashtagHashtags());
     }
 
-
-    function isReviewRequested(tags) {
-        var rr = tags.review_requested;
-        if (rr === undefined) return false;
-        rr = rr.trim().toLowerCase();
-        return !(rr === '' || rr === 'no');
+    let allLowerCase = new Set();
+    return detectedHashtags.filter(hashtag => {
+      // Compare tags as lowercase strings, but keep original case tags
+      const lowerCase = hashtag.toLowerCase();
+      if (!allLowerCase.has(lowerCase)) {
+        allLowerCase.add(lowerCase);
+        return true;
+      }
+      return false;
+    });
+
+    // Extract hashtags from `comment`
+    function commentHashtags() {
+      let matches = (tags.comment || '')
+        .replace(/http\S*/g, '')  // drop anything that looks like a URL - iD#4289
+        .match(hashtagRegex);
+
+      return matches || [];
     }
 
+    // Extract and clean hashtags from `hashtags`
+    function hashtagHashtags() {
+      let matches = (tags.hashtags || '')
+        .split(/[,;\s]+/)
+        .map(function (s) {
+          if (s[0] !== '#') { s = '#' + s; }    // prepend '#'
+          let matched = s.match(hashtagRegex);
+          return matched && matched[0];
+        }).filter(Boolean);                       // exclude falsy
+
+      return matches || [];
+    }
+  }
+
+
+  function isReviewRequested(tags) {
+    let rr = tags.review_requested;
+    if (rr === undefined) return false;
+    rr = rr.trim().toLowerCase();
+    return !(rr === '' || rr === 'no');
+  }
+
+
+  function updateChangeset(changed, onInput) {
+    const prefs = context.storageSystem();
+    let tags = Object.assign({}, uploader.changeset.tags);   // shallow copy
+
+    Object.keys(changed).forEach(function(k) {
+      let v = changed[k];
+      k = context.cleanTagKey(k);
+      if (readOnlyTags.indexOf(k) !== -1) return;
+
+      if (v === undefined) {
+        delete tags[k];
+      } else if (onInput) {
+        tags[k] = v;
+      } else {
+        tags[k] = context.cleanTagValue(v);
+      }
+    });
+
+    if (!onInput) {
+      // when changing the comment, override hashtags with any found in comment.
+      const commentOnly = changed.hasOwnProperty('comment') && (changed.comment !== '');
+      const arr = findHashtags(tags, commentOnly);
+      if (arr.length) {
+        tags.hashtags = context.cleanTagValue(arr.join(';'));
+        prefs.setItem('hashtags', tags.hashtags);
+      } else {
+        delete tags.hashtags;
+        prefs.removeItem('hashtags');
+      }
+    }
 
-    function updateChangeset(changed, onInput) {
-        var tags = Object.assign({}, context.changeset.tags);   // shallow copy
-
-        Object.keys(changed).forEach(function(k) {
-            var v = changed[k];
-            k = context.cleanTagKey(k);
-            if (readOnlyTags.indexOf(k) !== -1) return;
-
-            if (v === undefined) {
-                delete tags[k];
-            } else if (onInput) {
-                tags[k] = v;
-            } else {
-                tags[k] = context.cleanTagValue(v);
-            }
-        });
-
-        if (!onInput) {
-            // when changing the comment, override hashtags with any found in comment.
-            var commentOnly = changed.hasOwnProperty('comment') && (changed.comment !== '');
-            var arr = findHashtags(tags, commentOnly);
-            if (arr.length) {
-                tags.hashtags = context.cleanTagValue(arr.join(';'));
-                prefs('hashtags', tags.hashtags);
-            } else {
-                delete tags.hashtags;
-                prefs('hashtags', null);
-            }
+    // always update userdetails, just in case user reauthenticates as someone else
+    if (_userDetails && _userDetails.changesets_count !== undefined) {
+      let changesetsCount = parseInt(_userDetails.changesets_count, 10) + 1;  // iD#4283
+      tags.changesets_count = String(changesetsCount);
+
+      // first 100 edits - new user
+      if (changesetsCount <= 100) {
+        let s;
+        s = prefs.getItem('walkthrough_completed');
+        if (s) {
+          tags['ideditor:walkthrough_completed'] = s;
         }
 
-        // always update userdetails, just in case user reauthenticates as someone else
-        if (_userDetails && _userDetails.changesets_count !== undefined) {
-            var changesetsCount = parseInt(_userDetails.changesets_count, 10) + 1;  // #4283
-            tags.changesets_count = String(changesetsCount);
-
-            // first 100 edits - new user
-            if (changesetsCount <= 100) {
-                var s;
-                s = prefs('walkthrough_completed');
-                if (s) {
-                    tags['ideditor:walkthrough_completed'] = s;
-                }
-
-                s = prefs('walkthrough_progress');
-                if (s) {
-                    tags['ideditor:walkthrough_progress'] = s;
-                }
-
-                s = prefs('walkthrough_started');
-                if (s) {
-                    tags['ideditor:walkthrough_started'] = s;
-                }
-            }
-        } else {
-            delete tags.changesets_count;
+        s = prefs.getItem('walkthrough_progress');
+        if (s) {
+          tags['ideditor:walkthrough_progress'] = s;
         }
 
-        if (!deepEqual(context.changeset.tags, tags)) {
-            context.changeset = context.changeset.update({ tags: tags });
+        s = prefs.getItem('walkthrough_started');
+        if (s) {
+          tags['ideditor:walkthrough_started'] = s;
         }
+      }
+    } else {
+      delete tags.changesets_count;
     }
 
-
-    commit.reset = function() {
-        context.changeset = null;
-    };
+    if (!deepEqual(uploader.changeset.tags, tags)) {
+      uploader.changeset = uploader.changeset.update({ tags: tags });
+    }
+  }
 
 
-    return utilRebind(commit, dispatch, 'on');
+  return utilRebind(commit, dispatch, 'on');
 }
diff --git a/modules/ui/commit_warnings.js b/modules/ui/commit_warnings.js
index 8582bc1391..e779cd455f 100644
--- a/modules/ui/commit_warnings.js
+++ b/modules/ui/commit_warnings.js
@@ -1,101 +1,95 @@
 import { utilEntityOrMemberSelector } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 import { uiTooltip } from './tooltip';
 
 
 export function uiCommitWarnings(context) {
 
-    function commitWarnings(selection) {
-        var issuesBySeverity = context.validator()
-            .getIssuesBySeverity({ what: 'edited', where: 'all', includeDisabledRules: true });
-
-        for (var severity in issuesBySeverity) {
-            var issues = issuesBySeverity[severity];
-
-            if (severity !== 'error') {      // exclude 'fixme' and similar - #8603
-                issues = issues.filter(function(issue) { return issue.type !== 'help_request'; });
-            }
-
-            var section = severity + '-section';
-            var issueItem = severity + '-item';
-
-            var container = selection.selectAll('.' + section)
-                .data(issues.length ? [0] : []);
-
-            container.exit()
-                .remove();
-
-            var containerEnter = container.enter()
-                .append('div')
-                .attr('class', 'modal-section ' + section + ' fillL2');
-
-            containerEnter
-                .append('h3')
-                .html(severity === 'warning' ? t.html('commit.warnings') : t.html('commit.errors'));
-
-            containerEnter
-                .append('ul')
-                .attr('class', 'changeset-list');
-
-            container = containerEnter
-                .merge(container);
-
-
-            var items = container.select('ul').selectAll('li')
-                .data(issues, function(d) { return d.key; });
-
-            items.exit()
-                .remove();
-
-            var itemsEnter = items.enter()
-                .append('li')
-                .attr('class', issueItem);
-
-            var buttons = itemsEnter
-                .append('button')
-                .on('mouseover', function(d3_event, d) {
-                    if (d.entityIds) {
-                        context.surface().selectAll(
-                            utilEntityOrMemberSelector(
-                                d.entityIds,
-                                context.graph()
-                            )
-                        ).classed('hover', true);
-                    }
-                })
-                .on('mouseout', function() {
-                    context.surface().selectAll('.hover')
-                        .classed('hover', false);
-                })
-                .on('click', function(d3_event, d) {
-                    context.validator().focusIssue(d);
-                });
-
-            buttons
-                .call(uiIcon('#rapid-icon-alert', 'pre-text'));
-
-            buttons
-                .append('strong')
-                .attr('class', 'issue-message');
-
-            buttons.filter(function(d) { return d.tooltip; })
-                .call(uiTooltip()
-                    .title(function(d) { return d.tooltip; })
-                    .placement('top')
-                );
-
-            items = itemsEnter
-                .merge(items);
-
-            items.selectAll('.issue-message')
-                .html(function(d) {
-                    return d.message(context);
-                });
-        }
+  function commitWarnings(selection) {
+    const issuesBySeverity = context.validationSystem()
+      .getIssuesBySeverity({ what: 'edited', where: 'all', includeDisabledRules: true });
+
+    for (let severity in issuesBySeverity) {
+      let issues = issuesBySeverity[severity];
+
+      if (severity !== 'error') {      // exclude 'fixme' and similar - iD#8603
+        issues = issues.filter(issue => issue.type !== 'help_request');
+      }
+
+      const section = `${severity}-section`;
+      const issueClass = `${severity}-item`;
+
+      let container = selection.selectAll('.' + section)
+        .data(issues.length ? [0] : []);
+
+      container.exit()
+        .remove();
+
+      let containerEnter = container.enter()
+        .append('div')
+        .attr('class', 'modal-section ' + section + ' fillL2');
+
+      containerEnter
+        .append('h3')
+        .html(severity === 'warning' ? context.tHtml('commit.warnings') : context.tHtml('commit.errors'));
+
+      containerEnter
+        .append('ul')
+        .attr('class', 'changeset-list');
+
+      container = containerEnter
+        .merge(container);
+
+
+      let items = container.select('ul').selectAll('li')
+        .data(issues, d => d.key);
+
+      items.exit()
+        .remove();
+
+      let itemsEnter = items.enter()
+        .append('li')
+        .attr('class', issueClass);
+
+      let buttons = itemsEnter
+        .append('button')
+        .on('mouseover', (d3_event, d) => {
+          if (d.entityIds) {
+            context.surface().selectAll(utilEntityOrMemberSelector(d.entityIds, context.graph() ) )
+              .classed('hover', true);
+          }
+        })
+        .on('mouseout', () => {
+          context.surface().selectAll('.hover')
+            .classed('hover', false);
+        })
+        .on('click', (d3_event, d) => {
+          context.validationSystem().focusIssue(d);
+        });
+
+      buttons
+        .call(uiIcon('#rapid-icon-alert', 'pre-text'));
+
+      buttons
+        .append('strong')
+        .attr('class', 'issue-message');
+
+      buttons
+        .filter(d => d.tooltip)
+        .call(uiTooltip(context)
+          .title(d => d.tooltip)
+          .placement('top')
+        );
+
+      items = itemsEnter
+        .merge(items);
+
+      items.selectAll('.issue-message')
+        .html(d => d.message(context));
     }
+  }
 
 
-    return commitWarnings;
+  return commitWarnings;
 }
diff --git a/modules/ui/confirm.js b/modules/ui/confirm.js
index 7857719e23..7466eddb3c 100644
--- a/modules/ui/confirm.js
+++ b/modules/ui/confirm.js
@@ -1,39 +1,36 @@
-import { t } from '../core/localizer';
 import { uiModal } from './modal';
 
 
-export function uiConfirm(selection) {
-    var modalSelection = uiModal(selection);
+export function uiConfirm(context, selection) {
+  let modalSelection = uiModal(selection);
 
-    modalSelection.select('.modal')
-        .classed('modal-alert', true);
+  modalSelection.select('.modal')
+    .classed('modal-alert', true);
 
-    var section = modalSelection.select('.content');
+  let section = modalSelection.select('.content');
 
-    section.append('div')
-        .attr('class', 'modal-section header');
+  section.append('div')
+    .attr('class', 'modal-section header');
 
-    section.append('div')
-        .attr('class', 'modal-section message-text');
+  section.append('div')
+    .attr('class', 'modal-section message-text');
 
-    var buttons = section.append('div')
-        .attr('class', 'modal-section buttons cf');
+  let buttons = section.append('div')
+    .attr('class', 'modal-section buttons cf');
 
 
-    modalSelection.okButton = function() {
-        buttons
-            .append('button')
-            .attr('class', 'button ok-button action')
-            .on('click.confirm', function() {
-                modalSelection.remove();
-            })
-            .html(t.html('confirm.okay'))
-            .node()
-            .focus();
+  modalSelection.okButton = function() {
+    buttons
+      .append('button')
+      .attr('class', 'button ok-button action')
+      .on('click.confirm', () => modalSelection.remove())
+      .text(context.t('confirm.okay'))
+      .node()
+      .focus();
 
-        return modalSelection;
-    };
+    return modalSelection;
+  };
 
 
-    return modalSelection;
+  return modalSelection;
 }
diff --git a/modules/ui/conflicts.js b/modules/ui/conflicts.js
index 56a5027a50..76cbbbfb25 100644
--- a/modules/ui/conflicts.js
+++ b/modules/ui/conflicts.js
@@ -3,7 +3,6 @@ import { select as d3_select } from 'd3-selection';
 import { Extent } from '@rapid-sdk/math';
 import { utilEntityOrMemberSelector } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { JXON } from '../util/jxon';
 import { osmChangeset } from '../osm';
 import { uiIcon } from './icon';
@@ -56,7 +55,7 @@ export function uiConflicts(context) {
 
         headerEnter
             .append('h3')
-            .html(t.html('save.conflict.header'));
+            .html(context.tHtml('save.conflict.header'));
 
         var bodyEnter = selection.selectAll('.body')
             .data([0])
@@ -67,7 +66,7 @@ export function uiConflicts(context) {
         var conflictsHelpEnter = bodyEnter
             .append('div')
             .attr('class', 'conflicts-help')
-            .html(t.html('save.conflict.help'));
+            .html(context.tHtml('save.conflict.help'));
 
 
         // Download changes link
@@ -100,7 +99,7 @@ export function uiConflicts(context) {
         linkEnter
             .call(uiIcon('#rapid-icon-load', 'inline'))
             .append('span')
-            .html(t.html('save.conflict.download_changes'));
+            .html(context.tHtml('save.conflict.download_changes'));
 
 
         bodyEnter
@@ -113,7 +112,7 @@ export function uiConflicts(context) {
             .attr('class', 'conflicts-done')
             .attr('opacity', 0)
             .style('display', 'none')
-            .html(t.html('save.conflict.done'));
+            .html(context.tHtml('save.conflict.done'));
 
         var buttonsEnter = bodyEnter
             .append('div')
@@ -123,13 +122,13 @@ export function uiConflicts(context) {
             .append('button')
             .attr('disabled', _conflictList.length > 1)
             .attr('class', 'action conflicts-button col6')
-            .html(t.html('save.title'))
+            .html(context.tHtml('save.title'))
             .on('click.try_again', tryAgain);
 
         buttonsEnter
             .append('button')
             .attr('class', 'secondary-action conflicts-button col6')
-            .html(t.html('confirm.cancel'))
+            .html(context.tHtml('confirm.cancel'))
             .on('click.cancel', cancel);
     }
 
@@ -167,7 +166,7 @@ export function uiConflicts(context) {
         conflictEnter
             .append('h4')
             .attr('class', 'conflict-count')
-            .html(t.html('save.conflict.count', { num: index + 1, total: _conflictList.length }));
+            .html(context.tHtml('save.conflict.count', { num: index + 1, total: _conflictList.length }));
 
         conflictEnter
             .append('a')
@@ -205,7 +204,7 @@ export function uiConflicts(context) {
             .data(['previous', 'next'])
             .enter()
             .append('button')
-            .html(function(d) { return t.html('save.conflict.' + d); })
+            .html(function(d) { return context.tHtml('save.conflict.' + d); })
             .attr('class', 'conflict-nav-button action col6')
             .attr('disabled', function(d, i) {
                 return (i === 0 && index === 0) ||
@@ -300,9 +299,9 @@ export function uiConflicts(context) {
         var entity = context.graph().hasEntity(id);
         if (entity) {
             if (extent) {
-                context.map().trimmedExtent(extent);
+                context.mapSystem().trimmedExtent(extent);
             } else {
-                context.map().zoomToEase(entity);
+                context.mapSystem().zoomToEase(entity);
             }
             context.surface().selectAll(utilEntityOrMemberSelector([entity.id], context.graph()))
                 .classed('hover', true);
diff --git a/modules/ui/contributors.js b/modules/ui/contributors.js
index e927bcfd1e..08f453578e 100644
--- a/modules/ui/contributors.js
+++ b/modules/ui/contributors.js
@@ -1,13 +1,12 @@
-import _debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
+import debounce from 'lodash-es/debounce';
 
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 
 
 export function uiContributors(context) {
-    var osm = context.connection();
-    var debouncedUpdate = _debounce(function() { update(); }, 1000);
+    var osm = context.services.get('osm');
+    var debouncedUpdate = debounce(function() { update(); }, 1000);
     var limit = 4;
     var hidden = false;
     var wrap = d3_select(null);
@@ -16,15 +15,15 @@ export function uiContributors(context) {
     function update() {
         if (!osm) return;
 
-        var users = {},
-            entities = context.history().intersects(context.map().extent());
+        let users = {};
+        let entities = context.editSystem().intersects(context.mapSystem().extent());
 
         entities.forEach(function(entity) {
             if (entity && entity.user) users[entity.user] = true;
         });
 
-        var u = Object.keys(users),
-            subset = u.slice(0, u.length > limit ? limit - 1 : limit);
+        let u = Object.keys(users);
+        let subset = u.slice(0, u.length > limit ? limit - 1 : limit);
 
         wrap.html('')
             .call(uiIcon('#rapid-icon-nearby', 'pre-text light'));
@@ -48,16 +47,16 @@ export function uiContributors(context) {
             count.append('a')
                 .attr('target', '_blank')
                 .attr('href', function() {
-                    return osm.changesetsURL(context.map().center(), context.map().zoom());
+                    return osm.changesetsURL(context.mapSystem().center(), context.mapSystem().zoom());
                 })
                 .html(othersNum);
 
             wrap.append('span')
-                .html(t.html('contributors.truncated_list', { n: othersNum, users: userList.html(), count: count.html() }));
+                .html(context.tHtml('contributors.truncated_list', { n: othersNum, users: userList.html(), count: count.html() }));
 
         } else {
             wrap.append('span')
-                .html(t.html('contributors.list', { users: userList.html() }));
+                .html(context.tHtml('contributors.list', { users: userList.html() }));
         }
 
         if (!u.length) {
@@ -80,6 +79,6 @@ export function uiContributors(context) {
         update();
 
         osm.on('loaded.contributors', debouncedUpdate);
-        context.map().on('draw', debouncedUpdate);
+        context.mapSystem().on('draw', debouncedUpdate);
     };
 }
diff --git a/modules/ui/data_editor.js b/modules/ui/data_editor.js
index 3794198e48..211c0672eb 100644
--- a/modules/ui/data_editor.js
+++ b/modules/ui/data_editor.js
@@ -1,4 +1,3 @@
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 
 import { uiDataHeader } from './data_header';
@@ -6,78 +5,75 @@ import { uiSectionRawTagEditor } from './sections/raw_tag_editor';
 
 
 export function uiDataEditor(context) {
-    var dataHeader = uiDataHeader();
-    var rawTagEditor = uiSectionRawTagEditor('custom-data-tag-editor', context)
-        .expandedByDefault(true)
-        .readOnlyTags([/./]);
-    var _datum;
-
-
-    function dataEditor(selection) {
-
-        var header = selection.selectAll('.header')
-            .data([0]);
-
-        var headerEnter = header.enter()
-            .append('div')
-            .attr('class', 'header fillL');
-
-        headerEnter
-            .append('button')
-            .attr('class', 'close')
-            .on('click', function() {
-                context.enter('browse');
-            })
-            .call(uiIcon('#rapid-icon-close'));
-
-        headerEnter
-            .append('h3')
-            .html(t.html('map_data.title'));
-
-
-        var body = selection.selectAll('.body')
-            .data([0]);
-
-        body = body.enter()
-            .append('div')
-            .attr('class', 'body')
-            .merge(body);
-
-        var editor = body.selectAll('.data-editor')
-            .data([0]);
-
-        // enter/update
-        editor.enter()
-            .append('div')
-            .attr('class', 'modal-section data-editor')
-            .merge(editor)
-            .call(dataHeader.datum(_datum));
-
-        var rte = body.selectAll('.raw-tag-editor')
-            .data([0]);
-
-        // enter/update
-        rte.enter()
-            .append('div')
-            .attr('class', 'raw-tag-editor data-editor')
-            .merge(rte)
-            .call(rawTagEditor
-                .tags((_datum && _datum.properties) || {})
-                .state('hover')
-                .render
-            )
-            .selectAll('textarea.tag-text')
-            .attr('readonly', true)
-            .classed('readonly', true);
-    }
-
-
-    dataEditor.datum = function(val) {
-        if (!arguments.length) return _datum;
-        _datum = val;
-        return this;
-    };
-
-
-    return dataEditor;
+  let dataHeader = uiDataHeader(context);
+  let rawTagEditor = uiSectionRawTagEditor(context, 'custom-data-tag-editor')
+    .expandedByDefault(true)
+    .readOnlyTags([/./]);
+  let _datum;
+
+
+  function dataEditor(selection) {
+    let header = selection.selectAll('.header')
+      .data([0]);
+
+    let headerEnter = header.enter()
+      .append('div')
+      .attr('class', 'header fillL');
+
+    headerEnter
+      .append('button')
+      .attr('class', 'close')
+      .on('click', () => context.enter('browse'))
+      .call(uiIcon('#rapid-icon-close'));
+
+    headerEnter
+      .append('h3')
+      .html(context.tHtml('map_data.title'));
+
+
+    let body = selection.selectAll('.body')
+      .data([0]);
+
+    body = body.enter()
+      .append('div')
+      .attr('class', 'body')
+      .merge(body);
+
+    let editor = body.selectAll('.data-editor')
+      .data([0]);
+
+    // enter/update
+    editor.enter()
+      .append('div')
+      .attr('class', 'modal-section data-editor')
+      .merge(editor)
+      .call(dataHeader.datum(_datum));
+
+    let rte = body.selectAll('.raw-tag-editor')
+      .data([0]);
+
+    // enter/update
+    rte.enter()
+      .append('div')
+      .attr('class', 'raw-tag-editor data-editor')
+      .merge(rte)
+      .call(rawTagEditor
+        .tags((_datum && _datum.properties) || {})
+        .state('hover')
+        .render
+      )
+      .selectAll('textarea.tag-text')
+      .attr('readonly', true)
+      .classed('readonly', true);
+  }
+
+
+  dataEditor.datum = function(val) {
+    if (!arguments.length) return _datum;
+    _datum = val;
+    return this;
+  };
+
+
+  return dataEditor;
 }
diff --git a/modules/ui/data_header.js b/modules/ui/data_header.js
index 1836a18bca..62c769babc 100644
--- a/modules/ui/data_header.js
+++ b/modules/ui/data_header.js
@@ -1,46 +1,41 @@
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 
 
-export function uiDataHeader() {
-    var _datum;
+export function uiDataHeader(context) {
+  let _datum;
 
+  function dataHeader(selection) {
+    let header = selection.selectAll('.data-header')
+      .data((_datum ? [_datum] : []), d => d.__featurehash__ );
 
-    function dataHeader(selection) {
-        var header = selection.selectAll('.data-header')
-            .data(
-                (_datum ? [_datum] : []),
-                function(d) { return d.__featurehash__; }
-            );
+    header.exit()
+      .remove();
 
-        header.exit()
-            .remove();
+    let headerEnter = header.enter()
+      .append('div')
+      .attr('class', 'data-header');
 
-        var headerEnter = header.enter()
-            .append('div')
-            .attr('class', 'data-header');
+    let iconEnter = headerEnter
+      .append('div')
+      .attr('class', 'data-header-icon');
 
-        var iconEnter = headerEnter
-            .append('div')
-            .attr('class', 'data-header-icon');
+    iconEnter
+      .append('div')
+      .call(uiIcon('#rapid-icon-data', 'note-fill'));
 
-        iconEnter
-            .append('div')
-            .call(uiIcon('#rapid-icon-data', 'note-fill'));
+    headerEnter
+      .append('div')
+      .attr('class', 'data-header-label')
+      .html(context.tHtml('map_data.layers.custom.title'));
+  }
 
-        headerEnter
-            .append('div')
-            .attr('class', 'data-header-label')
-            .html(t.html('map_data.layers.custom.title'));
-    }
 
+  dataHeader.datum = function(val) {
+      if (!arguments.length) return _datum;
+      _datum = val;
+      return this;
+  };
 
-    dataHeader.datum = function(val) {
-        if (!arguments.length) return _datum;
-        _datum = val;
-        return this;
-    };
 
-
-    return dataHeader;
+  return dataHeader;
 }
diff --git a/modules/ui/disclosure.js b/modules/ui/disclosure.js
index 14f32c53f5..d0f1375bcb 100644
--- a/modules/ui/disclosure.js
+++ b/modules/ui/disclosure.js
@@ -1,7 +1,5 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
-import { localizer } from '../core/localizer';
-import { prefs } from '../core/preferences';
 import { uiIcon } from './icon';
 import { utilFunctor } from '../util';
 import { utilRebind } from '../util/rebind';
@@ -9,6 +7,7 @@ import { uiToggle } from './toggle';
 
 
 export function uiDisclosure(context, key, expandedDefault) {
+  const prefs = context.storageSystem();
   const dispatch = d3_dispatch('toggled');
   let _expanded;
   let _label = utilFunctor('');
@@ -19,7 +18,7 @@ export function uiDisclosure(context, key, expandedDefault) {
   let disclosure = function(selection) {
     if (_expanded === undefined || _expanded === null) {
       // loading _expanded here allows it to be reset by calling `disclosure.expanded(null)`
-      const preference = prefs(`disclosure.${key}.expanded`);
+      const preference = prefs.getItem(`disclosure.${key}.expanded`);
       _expanded = preference === null ? !!expandedDefault : (preference === 'true');
     }
 
@@ -31,7 +30,7 @@ export function uiDisclosure(context, key, expandedDefault) {
       .append('a')
       .attr('href', '#')
       .attr('class', `hide-toggle hide-toggle-${key}`)
-      .call(uiIcon('', 'pre-text', 'hide-toggle-icon'));
+      .call(uiIcon('', 'pre-text hide-toggle-icon'));
 
     hideToggleEnter
       .append('span')
@@ -48,10 +47,10 @@ export function uiDisclosure(context, key, expandedDefault) {
     hideToggle.selectAll('.hide-toggle-text')
       .html(_label());
 
-    hideToggle.selectAll('.hide-toggle-icon')
-      .attr('xlink:href', _expanded ? '#rapid-icon-down'
-        : (localizer.textDirection() === 'rtl') ? '#rapid-icon-backward' : '#rapid-icon-forward'
-      );
+    const isRTL = context.localizationSystem().isRTL();
+    const icon = _expanded ? 'down' : isRTL ? 'backward' : 'forward';
+    hideToggle.selectAll('.hide-toggle-icon > use')
+      .attr('xlink:href', `#rapid-icon-${icon}`);
 
 
     let wrap = selection.selectAll('.disclosure-wrap')
@@ -75,16 +74,15 @@ export function uiDisclosure(context, key, expandedDefault) {
       _expanded = !_expanded;
 
       if (_updatePreference) {
-        prefs(`disclosure.${key}.expanded`, _expanded);
+        prefs.setItem(`disclosure.${key}.expanded`, _expanded);
       }
 
       hideToggle
         .classed('expanded', _expanded);
 
-      hideToggle.selectAll('.hide-toggle-icon')
-        .attr('xlink:href', _expanded ? '#rapid-icon-down'
-          : (localizer.textDirection() === 'rtl') ? '#rapid-icon-backward' : '#rapid-icon-forward'
-        );
+      const icon = _expanded ? 'down' : isRTL ? 'backward' : 'forward';
+      hideToggle.selectAll('.hide-toggle-icon > use')
+        .attr('xlink:href', `#rapid-icon-${icon}`);
 
       wrap
         .call(uiToggle(_expanded));
diff --git a/modules/ui/edit_menu.js b/modules/ui/edit_menu.js
index 203b6821f7..9f710fe743 100644
--- a/modules/ui/edit_menu.js
+++ b/modules/ui/edit_menu.js
@@ -2,7 +2,6 @@ import { select as d3_select } from 'd3-selection';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import { vecAdd } from '@rapid-sdk/math';
-import { localizer } from '../core/localizer';
 import { uiTooltip } from './tooltip';
 import { utilRebind } from '../util/rebind';
 import { utilHighlightEntities } from '../util/util';
@@ -95,7 +94,7 @@ export function uiEditMenu(context) {
       });
 
     buttonsEnter.each((d, i, nodes) => {
-      let tooltip = uiTooltip()
+      let tooltip = uiTooltip(context)
         .heading(d.title)
         .title(d.tooltip())
         .keys([d.keys[0]]);
@@ -121,7 +120,7 @@ export function uiEditMenu(context) {
       .classed('disabled', d => d.disabled());
 
     _updatePosition();
-    context.map().on('move', _updatePosition);
+    context.mapSystem().on('move', _updatePosition);
 
 
     // `pointerup` is always called before `click`
@@ -219,25 +218,36 @@ export function uiEditMenu(context) {
 
 
     function displayOnLeft(viewport) {
-      if (localizer.textDirection() === 'ltr') {
-        if ((anchor[0] + MENU_SIDE_MARGIN + _menuWidth) > (viewport.width - VIEW_SIDE_MARGIN)) {
-          return true;   // right menu would be too close to the right viewport edge, go left
-        } else {
-          return false;  // prefer right menu
-        }
-
-      } else { // rtl
+      const isRTL = context.localizationSystem().isRTL();
+      if (isRTL) {  // right to left
         if ((anchor[0] - MENU_SIDE_MARGIN - _menuWidth) < VIEW_SIDE_MARGIN) {
           return false;  // left menu would be too close to the left viewport edge, go right
         } else {
           return true;   // prefer left menu
         }
+      } else {  // left to right
+        if ((anchor[0] + MENU_SIDE_MARGIN + _menuWidth) > (viewport.width - VIEW_SIDE_MARGIN)) {
+          return true;   // right menu would be too close to the right viewport edge, go left
+        } else {
+          return false;  // prefer right menu
+        }
       }
     }
 
 
     function tooltipPosition(viewport, menuLeft) {
-      if (localizer.textDirection() === 'ltr') {
+      const isRTL = context.localizationSystem().isRTL();
+      if (isRTL) {  // right to left
+        if (!menuLeft) {
+          return 'right';
+        }
+        if ((anchor[0] - MENU_SIDE_MARGIN - _menuWidth - TOOLTIP_WIDTH) < VIEW_SIDE_MARGIN) {
+          // left tooltips would be too close to the left viewport edge, go right
+          return 'right';
+        }
+        return 'left';
+
+      } else {  // left to right
         if (menuLeft) {
           // if there's not room for a right-side menu then there definitely
           // isn't room for right-side tooltips
@@ -248,16 +258,6 @@ export function uiEditMenu(context) {
           return 'left';
         }
         return 'right';
-
-      } else { // rtl
-        if (!menuLeft) {
-          return 'right';
-        }
-        if ((anchor[0] - MENU_SIDE_MARGIN - _menuWidth - TOOLTIP_WIDTH) < VIEW_SIDE_MARGIN) {
-          // left tooltips would be too close to the left viewport edge, go right
-          return 'right';
-        }
-        return 'left';
       }
     }
 
@@ -269,7 +269,7 @@ export function uiEditMenu(context) {
    * This removes the menu and unbinds the event handlers
    */
   editMenu.close = function () {
-     context.map().off('move', _updatePosition);
+     context.mapSystem().off('move', _updatePosition);
 
     _menu.remove();
     _tooltips = [];
diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index d217e46bc9..04940db050 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -2,8 +2,6 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { utilArrayIdentical, utilCleanTags } from '@rapid-sdk/util';
 import deepEqual from 'fast-deep-equal';
 
-import { presetManager } from '../presets';
-import { t, localizer } from '../core/localizer';
 import { actionChangeTags } from '../actions/change_tags';
 import { uiIcon } from './icon';
 import { utilRebind } from '../util';
@@ -118,6 +116,7 @@ export function uiEntityEditor(context) {
 
     function entityEditor(selection) {
         var combinedTags = getCombinedTags(_entityIDs, context.graph());
+        const isRTL = context.localizationSystem().isRTL();
 
         // Header
         var header = selection.selectAll('.header')
@@ -131,7 +130,7 @@ export function uiEntityEditor(context) {
         headerEnter
             .append('button')
             .attr('class', 'preset-reset preset-choose')
-            .call(uiIcon((localizer.textDirection() === 'rtl') ? '#rapid-icon-forward' : '#rapid-icon-backward'));
+            .call(uiIcon(isRTL ? '#rapid-icon-forward' : '#rapid-icon-backward'));
 
         headerEnter
             .append('button')
@@ -147,7 +146,7 @@ export function uiEntityEditor(context) {
             .merge(headerEnter);
 
         header.selectAll('h3')
-            .html(_entityIDs.length === 1 ? t.html('inspector.edit') : t.html('rapid_multiselect'));
+            .html(_entityIDs.length === 1 ? context.tHtml('inspector.edit') : context.tHtml('rapid_multiselect'));
 
         header.selectAll('.preset-reset')
             .on('click', function() {
@@ -175,7 +174,7 @@ export function uiEntityEditor(context) {
                 }),
                 uiSectionEntityIssues(context),
                 uiSectionPresetFields(context).on('change', changeTags).on('revert', revertTags),
-                uiSectionRawTagEditor('raw-tag-editor', context).on('change', changeTags),
+                uiSectionRawTagEditor(context, 'raw-tag-editor').on('change', changeTags),
                 uiSectionRawMemberEditor(context),
                 uiSectionRawMembershipEditor(context)
             ];
@@ -197,10 +196,10 @@ export function uiEntityEditor(context) {
             body.call(section.render);
         });
 
-        context.history()
-            .on('change.entity-editor', historyChanged);
+        context.editSystem()
+            .on('change', _onChange);
 
-        function historyChanged(difference) {
+        function _onChange(difference) {
             if (selection.selectAll('.entity-editor').empty()) return;
             if (_state === 'hide') return;
             var significant = !difference ||
@@ -233,7 +232,7 @@ export function uiEntityEditor(context) {
 
 
     // Tag changes that fire on input can all get coalesced into a single
-    // history operation when the user leaves the field.  #2342
+    // history operation when the user leaves the field.  iD#2342
     // Use explicit entityIDs in case the selection changes before the event is fired.
     function changeTags(entityIDs, changed, onInput) {
 
@@ -272,7 +271,7 @@ export function uiEntityEditor(context) {
                 return graph;
             };
 
-            var annotation = t('operations.change_tags.annotation');
+            var annotation = context.t('operations.change_tags.annotation');
 
             if (_coalesceChanges) {
                 context.overwrite(combinedAction, annotation);
@@ -284,7 +283,7 @@ export function uiEntityEditor(context) {
 
         // if leaving field (blur event), rerun validation
         if (!onInput) {
-            context.validator().validate();
+            context.validationSystem().validate();
         }
     }
 
@@ -328,7 +327,7 @@ export function uiEntityEditor(context) {
                 return graph;
             };
 
-            var annotation = t('operations.change_tags.annotation');
+            var annotation = context.t('operations.change_tags.annotation');
 
             if (_coalesceChanges) {
                 context.overwrite(combinedAction, annotation);
@@ -338,7 +337,7 @@ export function uiEntityEditor(context) {
             }
         }
 
-        context.validator().validate();
+        context.validationSystem().validate();
     }
 
 
@@ -383,6 +382,7 @@ export function uiEntityEditor(context) {
 
 
     function loadActivePresets(isForNewSelection) {
+        var presetSystem = context.presetSystem();
         var graph = context.graph();
 
         var counts = {};
@@ -391,7 +391,7 @@ export function uiEntityEditor(context) {
             var entity = graph.hasEntity(_entityIDs[i]);
             if (!entity) return;
 
-            var match = presetManager.match(entity, graph);
+            var match = presetSystem.match(entity, graph);
 
             if (!counts[match.id]) counts[match.id] = 0;
             counts[match.id] += 1;
@@ -400,7 +400,7 @@ export function uiEntityEditor(context) {
         var matches = Object.keys(counts).sort(function(p1, p2) {
             return counts[p2] - counts[p1];
         }).map(function(pID) {
-            return presetManager.item(pID);
+            return presetSystem.item(pID);
         });
 
         if (!isForNewSelection) {
diff --git a/modules/ui/feature_info.js b/modules/ui/feature_info.js
index 5a745c326d..a0bc389b71 100644
--- a/modules/ui/feature_info.js
+++ b/modules/ui/feature_info.js
@@ -1,51 +1,50 @@
-import { t } from '../core/localizer';
 import { uiTooltip } from './tooltip';
 
+
 export function uiFeatureInfo(context) {
-    function update(selection) {
-        var features = context.features();
-        var stats = features.stats();
-        var count = 0;
-        var hiddenList = features.hidden().map(function(k) {
-            if (stats[k]) {
-                count += stats[k];
-                return t('inspector.title_count', { title: t.html('feature.' + k + '.description'), count: stats[k] });
-            }
-            return null;
-        }).filter(Boolean);
-
-        selection.html('');
-
-        if (hiddenList.length) {
-            var tooltipBehavior = uiTooltip()
-                .placement('top')
-                .title(function() {
-                    return hiddenList.join('<br/>');
-                });
-
-            selection.append('a')
-                .attr('class', 'chip')
-                .attr('href', '#')
-                .html(t.html('feature_info.hidden_warning', { count: count }))
-                .call(tooltipBehavior)
-                .on('click', function(d3_event) {
-                    tooltipBehavior.hide();
-                    d3_event.preventDefault();
-                    // open the Map Data pane
-                    context.ui().togglePanes(context.container().select('.map-panes .map-data-pane'));
-                });
-        }
-
-        selection
-            .classed('hide', !hiddenList.length);
+  const filterSystem = context.filterSystem();
+
+  function update(selection) {
+    const stats = filterSystem.stats();
+    const hidden = filterSystem.hidden();
+    let count = 0;
+
+    const hiddenList = Array.from(hidden).map(k => {
+      if (stats[k]) {
+        count += stats[k];
+        return context.t('inspector.title_count', { title: context.tHtml(`feature.${k}.description`), count: stats[k] });
+      } else {
+        return null;
+      }
+    }).filter(Boolean);
+
+    selection.html('');
+
+    if (hiddenList.length) {
+      const tooltipBehavior = uiTooltip(context)
+        .placement('top')
+        .title(() => hiddenList.join('<br/>'));
+
+      selection.append('a')
+        .attr('class', 'chip')
+        .attr('href', '#')
+        .html(context.tHtml('feature_info.hidden_warning', { count: count }))
+        .call(tooltipBehavior)
+        .on('click', (d3_event) => {
+          tooltipBehavior.hide();
+          d3_event.preventDefault();
+          // open the Map Data pane
+          context.ui().togglePanes(context.container().select('.map-panes .map-data-pane'));
+        });
     }
 
+    selection
+      .classed('hide', !hiddenList.length);
+  }
 
-    return function(selection) {
-        update(selection);
 
-        context.features().on('change.feature_info', function() {
-            update(selection);
-        });
-    };
+  return function(selection) {
+    update(selection);
+    filterSystem.on('filterchange', () => update(selection));
+  };
 }
diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js
index c8e206e46a..fe1180decf 100644
--- a/modules/ui/feature_list.js
+++ b/modules/ui/feature_list.js
@@ -2,372 +2,357 @@ import { select as d3_select } from 'd3-selection';
 import { Extent, geoSphericalDistance } from '@rapid-sdk/math';
 import * as sexagesimal from '@mapbox/sexagesimal';
 
-import { presetManager } from '../presets';
-import { t } from '../core/localizer';
-import { dmsCoordinatePair } from '../util/units';
-import { Graph } from '../core/Graph';
-import { modeSelect } from '../modes/select';
+import { Graph } from '../core/lib';
 import { osmEntity } from '../osm/entity';
-import { services } from '../services';
 import { uiIcon } from './icon';
 import { uiCmd } from './cmd';
 
-import {
-    utilDisplayName,
-    utilDisplayType,
-    utilHighlightEntities,
-    utilNoAuto
-} from '../util';
+import { utilHighlightEntities, utilNoAuto } from '../util';
 
 
 export function uiFeatureList(context) {
-    var _geocodeResults;
+  const nominatim = context.services.get('nominatim');
+  const presetSystem = context.presetSystem();
+  const l10n = context.localizationSystem();
+  let _geocodeResults;
 
 
-    function featureList(selection) {
-        var header = selection
-            .append('div')
-            .attr('class', 'header fillL');
+  function featureList(selection) {
+    let header = selection
+      .append('div')
+      .attr('class', 'header fillL');
 
-        header
-            .append('h3')
-            .html(t.html('inspector.feature_list'));
+    header
+      .append('h3')
+      .html(l10n.tHtml('inspector.feature_list'));
 
-        var searchWrap = selection
-            .append('div')
-            .attr('class', 'search-header');
+    let searchWrap = selection
+      .append('div')
+      .attr('class', 'search-header');
 
-        searchWrap
-            .call(uiIcon('#rapid-icon-search', 'pre-text'));
+    searchWrap
+      .call(uiIcon('#rapid-icon-search', 'pre-text'));
 
-        var search = searchWrap
-            .append('input')
-            .attr('placeholder', t('inspector.search'))
-            .attr('type', 'search')
-            .call(utilNoAuto)
-            .on('keypress', keypress)
-            .on('keydown', keydown)
-            .on('input', inputevent);
+    let search = searchWrap
+      .append('input')
+      .attr('placeholder', l10n.t('inspector.search'))
+      .attr('type', 'search')
+      .call(utilNoAuto)
+      .on('keypress', keypress)
+      .on('keydown', keydown)
+      .on('input', inputevent);
 
-        var listWrap = selection
-            .append('div')
-            .attr('class', 'inspector-body');
+    let listWrap = selection
+      .append('div')
+      .attr('class', 'inspector-body');
 
-        var list = listWrap
-            .append('div')
-            .attr('class', 'feature-list');
+    let list = listWrap
+      .append('div')
+      .attr('class', 'feature-list');
 
-        context
-            .on('exit.feature-list', clearSearch);
-//        context.map()
-//            .on('drawn.feature-list', mapDrawn);
+    context
+      .on('modechange', clearSearch);
+//    context.mapSystem()
+//     .on('drawn.feature-list', mapDrawn);
 
-        context.keybinding()
-            .on(uiCmd('⌘F'), focusSearch);
+    context.keybinding()
+      .on(uiCmd('⌘F'), focusSearch);
 
 
-        function focusSearch(d3_event) {
-            var mode = context.mode() && context.mode().id;
-            if (mode !== 'browse') return;
+    function focusSearch(d3_event) {
+      let mode = context.mode() && context.mode().id;
+      if (mode !== 'browse') return;
 
-            d3_event.preventDefault();
-            search.node().focus();
-        }
-
-
-        function keydown(d3_event) {
-            if (d3_event.keyCode === 27) {  // escape
-                search.node().blur();
-            }
-        }
-
-
-        function keypress(d3_event) {
-            var q = search.property('value'),
-                items = list.selectAll('.feature-list-item');
-            if (d3_event.keyCode === 13 && // ↩ Return
-                q.length &&
-                items.size()) {
-                click(d3_event, items.datum());
-            }
-        }
+      d3_event.preventDefault();
+      search.node().focus();
+    }
 
 
-        function inputevent() {
-            _geocodeResults = undefined;
-            drawList();
-        }
+    function keydown(d3_event) {
+      if (d3_event.keyCode === 27) {  // escape
+        search.node().blur();
+      }
+    }
 
 
-        function clearSearch() {
-            search.property('value', '');
-            drawList();
-        }
+    function keypress(d3_event) {
+      const q = search.property('value');
+      const items = list.selectAll('.feature-list-item');
+      if (d3_event.keyCode === 13 && q.length && items.size()) {  // ↩ Return
+        click(d3_event, items.datum());
+      }
+    }
 
 
-        function mapDrawn(e) {
-            if (e.full) {
-                drawList();
-            }
-        }
+    function inputevent() {
+      _geocodeResults = undefined;
+      drawList();
+    }
 
 
-        function features() {
-            var result = [];
-            var graph = context.graph();
-            var visibleCenter = context.map().extent().center();
-            var q = search.property('value').toLowerCase();
-
-            if (!q) return result;
-
-            var locationMatch = sexagesimal.pair(q.toUpperCase()) || q.match(/^(-?\d+\.?\d*)\s+(-?\d+\.?\d*)$/);
-
-            if (locationMatch) {
-                var loc = [parseFloat(locationMatch[0]), parseFloat(locationMatch[1])];
-                result.push({
-                    id: -1,
-                    geometry: 'point',
-                    type: t('inspector.location'),
-                    name: dmsCoordinatePair([loc[1], loc[0]]),
-                    location: loc
-                });
-            }
-
-            // A location search takes priority over an ID search
-            var idMatch = !locationMatch && q.match(/(?:^|\W)(node|way|relation|[nwr])\W?0*([1-9]\d*)(?:\W|$)/i);
-
-            if (idMatch) {
-                var elemType = idMatch[1].charAt(0);
-                var elemId = idMatch[2];
-                result.push({
-                    id: elemType + elemId,
-                    geometry: elemType === 'n' ? 'point' : elemType === 'w' ? 'line' : 'relation',
-                    type: elemType === 'n' ? t('inspector.node') : elemType === 'w' ? t('inspector.way') : t('inspector.relation'),
-                    name: elemId
-                });
-            }
-
-            // search both local and base graphs
-            // Gather affected ids
-            const base = graph.base.entities;
-            const local = graph.local.entities;
-            const ids = new Set([...base.keys(), ...local.keys()]);
-
-            // var allEntities = graph.entities;
-            var localResults = [];
-            for (var id of ids) {
-                if (local.has(id) && local.get(id) === undefined) continue;  // deleted locally
-                const entity = graph.hasEntity(id);
-                if (!entity) continue;
-
-                var name = utilDisplayName(entity) || '';
-                if (name.toLowerCase().indexOf(q) < 0) continue;
-
-                var matched = presetManager.match(entity, graph);
-                var type = (matched && matched.name()) || utilDisplayType(entity.id);
-                var extent = entity.extent(graph);
-                var distance = extent ? geoSphericalDistance(visibleCenter, extent.center()) : 0;
-
-                localResults.push({
-                    id: entity.id,
-                    entity: entity,
-                    geometry: entity.geometry(graph),
-                    type: type,
-                    name: name,
-                    distance: distance
-                });
-
-                if (localResults.length > 100) break;
-            }
-            localResults = localResults.sort(function byDistance(a, b) {
-                return a.distance - b.distance;
-            });
-            result = result.concat(localResults);
-
-            (_geocodeResults || []).forEach(function(d) {
-                if (d.osm_type && d.osm_id) {    // some results may be missing these - #1890
-
-                    // Make a temporary osmEntity so we can preset match
-                    // and better localize the search result - #4725
-                    var id = osmEntity.id.fromOSM(d.osm_type, d.osm_id);
-                    var tags = {};
-                    tags[d.class] = d.type;
-
-                    var attrs = { id: id, type: d.osm_type, tags: tags };
-                    if (d.osm_type === 'way') {   // for ways, add some fake closed nodes
-                        attrs.nodes = ['a','a'];  // so that geometry area is possible
-                    }
-
-                    var tempEntity = osmEntity(attrs);
-                    var tempGraph = new Graph([tempEntity]);
-                    var matched = presetManager.match(tempEntity, tempGraph);
-                    var type = (matched && matched.name()) || utilDisplayType(id);
-
-                    result.push({
-                        id: tempEntity.id,
-                        geometry: tempEntity.geometry(tempGraph),
-                        type: type,
-                        name: d.display_name,
-                        extent: new Extent(
-                            [parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0])],
-                            [parseFloat(d.boundingbox[2]), parseFloat(d.boundingbox[1])]
-                        )
-                    });
-                }
-            });
-
-            if (q.match(/^[0-9]+$/)) {
-                // if query is just a number, possibly an OSM ID without a prefix
-                result.push({
-                    id: 'n' + q,
-                    geometry: 'point',
-                    type: t('inspector.node'),
-                    name: q
-                });
-                result.push({
-                    id: 'w' + q,
-                    geometry: 'line',
-                    type: t('inspector.way'),
-                    name: q
-                });
-                result.push({
-                    id: 'r' + q,
-                    geometry: 'relation',
-                    type: t('inspector.relation'),
-                    name: q
-                });
-            }
-
-            return result;
-        }
+    function clearSearch() {
+      search.property('value', '');
+      drawList();
+    }
 
 
-        function drawList() {
-            var value = search.property('value');
-            var results = features();
-
-            list.classed('filtered', value.length);
-
-            var resultsIndicator = list.selectAll('.no-results-item')
-                .data([0])
-                .enter()
-                .append('button')
-                .property('disabled', true)
-                .attr('class', 'no-results-item')
-                .call(uiIcon('#rapid-icon-alert', 'pre-text'));
-
-            resultsIndicator.append('span')
-                .attr('class', 'entity-name');
-
-            list.selectAll('.no-results-item .entity-name')
-                .html(t.html('geocoder.no_results_worldwide'));
-
-            if (services.geocoder) {
-              list.selectAll('.geocode-item')
-                  .data([0])
-                  .enter()
-                  .append('button')
-                  .attr('class', 'geocode-item secondary-action')
-                  .on('click', geocoderSearch)
-                  .append('div')
-                  .attr('class', 'label')
-                  .append('span')
-                  .attr('class', 'entity-name')
-                  .html(t.html('geocoder.search'));
-            }
-
-            list.selectAll('.no-results-item')
-                .style('display', (value.length && !results.length) ? 'block' : 'none');
-
-            list.selectAll('.geocode-item')
-                .style('display', (value && _geocodeResults === undefined) ? 'block' : 'none');
-
-            list.selectAll('.feature-list-item')
-                .data([-1])
-                .remove();
-
-            var items = list.selectAll('.feature-list-item')
-                .data(results, function(d) { return d.id; });
-
-            var enter = items.enter()
-                .insert('button', '.geocode-item')
-                .attr('class', 'feature-list-item')
-                .on('mouseover', mouseover)
-                .on('mouseout', mouseout)
-                .on('click', click);
-
-            var label = enter
-                .append('div')
-                .attr('class', 'label');
-
-            label
-                .each(function(d) {
-                    d3_select(this)
-                        .call(uiIcon('#rapid-icon-' + d.geometry, 'pre-text'));
-                });
-
-            label
-                .append('span')
-                .attr('class', 'entity-type')
-                .html(function(d) { return d.type; });
-
-            label
-                .append('span')
-                .attr('class', 'entity-name')
-                .html(function(d) { return d.name; });
-
-            enter
-                .style('opacity', 0)
-                .transition()
-                .style('opacity', 1);
-
-            items.order();
-
-            items.exit()
-                .remove();
+//    function mapDrawn(e) {
+//      if (e.full) {
+//        drawList();
+//      }
+//    }
+
+
+    function features() {
+      const graph = context.graph();
+      const centerLoc = context.mapSystem().centerLoc();
+      const q = search.property('value').toLowerCase();
+      let result = [];
+
+      if (!q) return result;
+
+      // User typed something that looks like a coordinate pair
+      const locationMatch = sexagesimal.pair(q.toUpperCase()) || q.match(/^(-?\d+\.?\d*)\s+(-?\d+\.?\d*)$/);
+      if (locationMatch) {
+        const loc = [ parseFloat(locationMatch[0]), parseFloat(locationMatch[1]) ];
+        result.push({
+          id: -1,
+          geometry: 'point',
+          type: l10n.t('inspector.location'),
+          name: l10n.dmsCoordinatePair([loc[1], loc[0]]),
+          location: loc
+        });
+      }
+
+      // User typed something that looks like an OSM entity id (node/way/relation)
+      const idMatch = !locationMatch && q.match(/(?:^|\W)(node|way|relation|[nwr])\W?0*([1-9]\d*)(?:\W|$)/i);
+      if (idMatch) {
+        const entityType = idMatch[1].charAt(0);
+        const entityID = idMatch[2];
+        result.push({
+          id: entityType + entityID,
+          geometry: entityType === 'n' ? 'point' : entityType === 'w' ? 'line' : 'relation',
+          type: l10n.displayType(entityType),
+          name: entityID
+        });
+      }
+
+      // Search for what the user typed in the local and base graphs
+      // Gather affected ids
+      const base = graph.base.entities;
+      const local = graph.local.entities;
+      const ids = new Set([...base.keys(), ...local.keys()]);
+
+      let localResults = [];
+      for (let id of ids) {
+        if (local.has(id) && local.get(id) === undefined) continue;  // deleted locally
+        const entity = graph.hasEntity(id);
+        if (!entity) continue;
+
+        const name = l10n.displayName(entity) || '';
+        if (name.toLowerCase().indexOf(q) < 0) continue;
+
+        const matched = presetSystem.match(entity, graph);
+        const type = (matched && matched.name()) || l10n.displayType(entity.id);
+        const extent = entity.extent(graph);
+        const distance = extent ? geoSphericalDistance(centerLoc, extent.center()) : 0;
+
+        localResults.push({
+          id: entity.id,
+          entity: entity,
+          geometry: entity.geometry(graph),
+          type: type,
+          name: name,
+          distance: distance
+        });
+
+        if (localResults.length > 100) break;
+      }
+
+      localResults = localResults.sort((a, b) => a.distance - b.distance);
+      result = result.concat(localResults);
+
+
+      // Search for what the user typed in geocode results
+      for (const d of (_geocodeResults || [])) {
+        if (!d.osm_type || !d.osm_id) continue;    // some results may be missing these - iD#1890
+
+        // Make a temporary osmEntity so we can preset match and better localize the search result - iD#4725
+        const id = osmEntity.id.fromOSM(d.osm_type, d.osm_id);
+        let tags = {};
+        tags[d.class] = d.type;
+
+        let attrs = { id: id, type: d.osm_type, tags: tags };
+        if (d.osm_type === 'way') {   // for ways, add some fake closed nodes
+          attrs.nodes = ['a','a'];    // so that geometry area is possible
         }
 
+        const tempEntity = osmEntity(attrs);
+        const tempGraph = new Graph([tempEntity]);
+        const preset = presetSystem.match(tempEntity, tempGraph);
+        const type = (preset && preset.name()) || l10n.displayType(id);
+
+        result.push({
+          id: tempEntity.id,
+          geometry: tempEntity.geometry(tempGraph),
+          type: type,
+          name: d.display_name,
+          extent: new Extent(
+            [ parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0]) ],
+            [ parseFloat(d.boundingbox[2]), parseFloat(d.boundingbox[1]) ]
+          )
+        });
+      }
+
+      // If the user just typed a number, offer them some OSM IDs
+      if (q.match(/^[0-9]+$/)) {
+        result.push({
+          id: 'n' + q,
+          geometry: 'point',
+          type: l10n.t('inspector.node'),
+          name: q
+        });
+        result.push({
+          id: 'w' + q,
+          geometry: 'line',
+          type: l10n.t('inspector.way'),
+          name: q
+        });
+        result.push({
+          id: 'r' + q,
+          geometry: 'relation',
+          type: l10n.t('inspector.relation'),
+          name: q
+        });
+      }
+
+      return result;
+    }
 
-        function mouseover(d3_event, d) {
-            if (d.id === -1) return;
 
-            utilHighlightEntities([d.id], true, context);
-        }
+    function drawList() {
+      const value = search.property('value');
+      const results = features();
+
+      list.classed('filtered', value.length);
+
+      let resultsIndicator = list.selectAll('.no-results-item')
+        .data([0])
+        .enter()
+        .append('button')
+        .property('disabled', true)
+        .attr('class', 'no-results-item')
+        .call(uiIcon('#rapid-icon-alert', 'pre-text'));
+
+      resultsIndicator.append('span')
+        .attr('class', 'entity-name');
+
+      list.selectAll('.no-results-item .entity-name')
+        .html(l10n.tHtml('geocoder.no_results_worldwide'));
+
+      if (nominatim) {
+        list.selectAll('.geocode-item')
+          .data([0])
+          .enter()
+          .append('button')
+          .attr('class', 'geocode-item secondary-action')
+          .on('click', nominatimSearch)
+          .append('div')
+          .attr('class', 'label')
+          .append('span')
+          .attr('class', 'entity-name')
+          .html(l10n.tHtml('geocoder.search'));
+      }
+
+      list.selectAll('.no-results-item')
+        .style('display', (value.length && !results.length) ? 'block' : 'none');
+
+      list.selectAll('.geocode-item')
+        .style('display', (value && _geocodeResults === undefined) ? 'block' : 'none');
+
+      list.selectAll('.feature-list-item')
+        .data([-1])
+        .remove();
+
+      let items = list.selectAll('.feature-list-item')
+        .data(results, d => d.id);
+
+      let enter = items.enter()
+        .insert('button', '.geocode-item')
+        .attr('class', 'feature-list-item')
+        .on('mouseover', mouseover)
+        .on('mouseout', mouseout)
+        .on('click', click);
+
+      let label = enter
+        .append('div')
+        .attr('class', 'label');
+
+      label
+        .each((d, i, nodes) => {
+          d3_select(nodes[i])
+            .call(uiIcon(`#rapid-icon-${d.geometry}`, 'pre-text'));
+        });
+
+      label
+        .append('span')
+        .attr('class', 'entity-type')
+        .html(d => d.type);
+
+      label
+        .append('span')
+        .attr('class', 'entity-name')
+        .html(d => d.name);
+
+      enter
+        .style('opacity', 0)
+        .transition()
+        .style('opacity', 1);
+
+      items.order();
+
+      items.exit()
+        .remove();
+    }
 
 
-        function mouseout(d3_event, d) {
-            if (d.id === -1) return;
+    function mouseover(d3_event, d) {
+      if (d.id === -1) return;
+      utilHighlightEntities([d.id], true, context);
+    }
 
-            utilHighlightEntities([d.id], false, context);
-        }
 
+    function mouseout(d3_event, d) {
+      if (d.id === -1) return;
+      utilHighlightEntities([d.id], false, context);
+    }
 
-        function click(d3_event, d) {
-            d3_event.preventDefault();
 
-            if (d.location) {
-                context.map().centerZoomEase([d.location[1], d.location[0]], 19);
+    function click(d3_event, d) {
+      d3_event.preventDefault();
 
-            } else if (d.entity) {
-                utilHighlightEntities([d.id], false, context);
-                context.map().zoomToEase(d.entity);
-                context.enter(modeSelect(context, [d.entity.id]));
+      if (d.location) {
+        context.mapSystem().centerZoomEase([d.location[1], d.location[0]], 19);
 
-            } else {
-                // download, zoom to, and select the entity with the given ID
-                context.zoomToEntity(d.id);
-            }
-        }
+      } else if (d.entity) {
+        utilHighlightEntities([d.id], false, context);
+        context.mapSystem().zoomToEase(d.entity);
+        context.enter('select-osm', { selectedIDs: [d.entity.id] });
+      } else {
+        // download, zoom to, and select the entity with the given ID
+        context.zoomToEntity(d.id);
+      }
+    }
 
 
-        function geocoderSearch() {
-            services.geocoder.search(search.property('value'), function (err, resp) {
-                _geocodeResults = resp || [];
-                drawList();
-            });
-        }
+    function nominatimSearch() {
+      nominatim.search(search.property('value'), (err, results) => {
+        _geocodeResults = results || [];
+        drawList();
+      });
     }
+  }
 
 
-    return featureList;
+  return featureList;
 }
diff --git a/modules/ui/field.js b/modules/ui/field.js
deleted file mode 100644
index 57997eb192..0000000000
--- a/modules/ui/field.js
+++ /dev/null
@@ -1,363 +0,0 @@
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { select as d3_select } from 'd3-selection';
-import { utilUniqueString } from '@rapid-sdk/util';
-
-import { t, localizer } from '../core/localizer';
-import { locationManager } from '../core/LocationManager';
-import { uiIcon } from './icon';
-import { uiTooltip } from './tooltip';
-// import { uiFieldHelp } from './field_help';
-import { uiFields } from './fields';
-import { uiTagReference } from './tag_reference';
-import { utilRebind, utilTotalExtent } from '../util';
-
-
-export function uiField(context, presetField, entityIDs, options) {
-    options = Object.assign({
-        show: true,
-        wrap: true,
-        remove: true,
-        revert: true,
-        info: true
-    }, options);
-
-    // Don't show the remove and revert buttons if any of the entity IDs are FB features
-    // with source=digitalglobe or source=maxar
-    var someFbRoadsSelected = entityIDs ? entityIDs.some(function(entity) {
-            return entity.__fbid__ && (entity.tags.source === 'maxar' || entity.tags.source === 'digitalglobe');
-        }) : false;
-
-
-    if ( someFbRoadsSelected ) {
-        options.remove = false;
-        options.revert = false;
-    }
-
-    var dispatch = d3_dispatch('change', 'revert');
-    var field = Object.assign({}, presetField);   // shallow copy
-    field.domId = utilUniqueString('form-field-' + field.safeid);
-    var _show = options.show;
-    var _state = '';
-    var _tags = {};
-
-    var _entityExtent = null;
-    if (entityIDs && entityIDs.length) {
-        _entityExtent = utilTotalExtent(entityIDs, context.graph());
-    }
-
-    var _locked = false;
-    var _lockedTip = uiTooltip()
-        .title(t.html('inspector.lock.suggestion', { label: field.label }))
-        .placement('bottom');
-
-
-    field.keys = field.keys || [field.key];
-
-    // only create the fields that are actually being shown
-    if (_show && !field.impl) {
-        createField();
-    }
-
-    // Creates the field.. This is done lazily,
-    // once we know that the field will be shown.
-    function createField() {
-        field.impl = uiFields[field.type](field, context)
-            .on('change', function(t, onInput) {
-                dispatch.call('change', field, t, onInput);
-            });
-
-        if (entityIDs) {
-            field.entityIDs = entityIDs;
-            // if this field cares about the entities, pass them along
-            if (field.impl.entityIDs) {
-                field.impl.entityIDs(entityIDs);
-            }
-        }
-    }
-
-
-    function isModified() {
-        if (!entityIDs || !entityIDs.length) return false;
-        return entityIDs.some(function(entityID) {
-            var original = context.graph().base.entities.get(entityID);
-            var latest = context.graph().entity(entityID);
-            return field.keys.some(function(key) {
-                return original ? latest.tags[key] !== original.tags[key] : latest.tags[key];
-            });
-        });
-    }
-
-
-    function tagsContainFieldKey() {
-        return field.keys.some(function(key) {
-            if (field.type === 'multiCombo') {
-                for (var tagKey in _tags) {
-                    if (tagKey.indexOf(key) === 0) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            return _tags[key] !== undefined;
-        });
-    }
-
-
-    function revert(d3_event, d) {
-        d3_event.stopPropagation();
-        d3_event.preventDefault();
-        if (!entityIDs || _locked) return;
-
-        dispatch.call('revert', d, d.keys);
-    }
-
-
-    function remove(d3_event, d) {
-        d3_event.stopPropagation();
-        d3_event.preventDefault();
-        if (_locked) return;
-
-        var t = {};
-        d.keys.forEach(function(key) {
-            t[key] = undefined;
-        });
-
-        dispatch.call('change', d, t);
-    }
-
-
-    field.render = function(selection) {
-        var container = selection.selectAll('.form-field')
-            .data([field]);
-
-        // Enter
-        var enter = container.enter()
-            .append('div')
-            .attr('class', function(d) { return 'form-field form-field-' + d.safeid; })
-            .classed('nowrap', !options.wrap);
-
-        if (options.wrap) {
-            var labelEnter = enter
-                .append('label')
-                .attr('class', 'field-label')
-                .attr('for', function(d) { return d.domId; });
-
-            var textEnter = labelEnter
-                .append('span')
-                .attr('class', 'label-text');
-
-            textEnter
-                .append('span')
-                .attr('class', 'label-textvalue')
-                .html(function(d) { return d.label(); });
-
-            textEnter
-                .append('span')
-                .attr('class', 'label-textannotation');
-
-            if (options.remove) {
-                labelEnter
-                    .append('button')
-                    .attr('class', 'remove-icon')
-                    .attr('title', t('icons.remove'))
-                    .call(uiIcon('#rapid-operation-delete'));
-            }
-
-            if (options.revert) {
-                labelEnter
-                    .append('button')
-                    .attr('class', 'modified-icon')
-                    .attr('title', t('icons.undo'))
-                    .call(uiIcon((localizer.textDirection() === 'rtl') ? '#rapid-icon-redo' : '#rapid-icon-undo'));
-            }
-        }
-
-
-        // Update
-        container = container
-            .merge(enter);
-
-        container.select('.field-label > .remove-icon')  // propagate bound data
-            .on('click', remove);
-
-        container.select('.field-label > .modified-icon')  // propagate bound data
-            .on('click', revert);
-
-        container
-            .each(function(d) {
-                var selection = d3_select(this);
-
-                if (!d.impl) {
-                    createField();
-                }
-
-                var reference, help;
-
-//                // instantiate field help
-//                if (options.wrap && field.type === 'restrictions') {
-//                    help = uiFieldHelp(context, 'restrictions');
-//                }
-
-                // instantiate tag reference
-                if (options.wrap && options.info) {
-                    var referenceKey = d.key || '';
-                    if (d.type === 'multiCombo') {   // lookup key without the trailing ':'
-                        referenceKey = referenceKey.replace(/:$/, '');
-                    }
-
-                    reference = uiTagReference(d.reference || { key: referenceKey }, context);
-                    if (_state === 'hover') {
-                        reference.showing(false);
-                    }
-                }
-
-                selection
-                    .call(d.impl);
-
-                // add field help components
-                if (help) {
-                    selection
-                        .call(help.body)
-                        .select('.field-label')
-                        .call(help.button);
-                }
-
-                // add tag reference components
-                if (reference) {
-                    selection
-                        .call(reference.body)
-                        .select('.field-label')
-                        .call(reference.button);
-                }
-
-                d.impl.tags(_tags);
-            });
-
-
-            container
-                .classed('locked', _locked)
-                .classed('modified', isModified())
-                .classed('present', tagsContainFieldKey());
-
-
-            // show a tip and lock icon if the field is locked
-            var annotation = container.selectAll('.field-label .label-textannotation');
-            var icon = annotation.selectAll('.icon')
-                .data(_locked ? [0]: []);
-
-            icon.exit()
-                .remove();
-
-            icon.enter()
-                .append('svg')
-                .attr('class', 'icon')
-                .append('use')
-                .attr('xlink:href', '#fas-lock');
-
-            container.call(_locked ? _lockedTip : _lockedTip.destroy);
-    };
-
-
-    field.state = function(val) {
-        if (!arguments.length) return _state;
-        _state = val;
-        return field;
-    };
-
-
-    field.tags = function(val) {
-        if (!arguments.length) return _tags;
-        _tags = val;
-
-        if (tagsContainFieldKey() && !_show) {
-            // always show a field if it has a value to display
-            _show = true;
-            if (!field.impl) {
-                createField();
-            }
-        }
-
-        return field;
-    };
-
-
-    field.locked = function(val) {
-        if (!arguments.length) return _locked;
-        _locked = val;
-        return field;
-    };
-
-
-    field.show = function() {
-        _show = true;
-        if (!field.impl) {
-            createField();
-        }
-        if (field.default && field.key && _tags[field.key] !== field.default) {
-            var t = {};
-            t[field.key] = field.default;
-            dispatch.call('change', this, t);
-        }
-    };
-
-    // A shown field has a visible UI, a non-shown field is in the 'Add field' dropdown
-    field.isShown = function() {
-        return _show;
-    };
-
-
-    // An allowed field can appear in the UI or in the 'Add field' dropdown.
-    // A non-allowed field is hidden from the user altogether
-    field.isAllowed = function() {
-
-        if (entityIDs &&
-            entityIDs.length > 1 &&
-            uiFields[field.type].supportsMultiselection === false) return false;
-
-        if (field.geometry && !entityIDs.every(function(entityID) {
-            return field.matchGeometry(context.graph().geometry(entityID));
-        })) return false;
-
-        if (entityIDs && _entityExtent && field.locationSetID) {   // is field allowed in this location?
-            var validHere = locationManager.locationSetsAt(_entityExtent.center());
-            if (!validHere[field.locationSetID]) return false;
-        }
-
-        var prerequisiteTag = field.prerequisiteTag;
-
-        if (entityIDs &&
-            !tagsContainFieldKey() && // ignore tagging prerequisites if a value is already present
-            prerequisiteTag) {
-
-            if (!entityIDs.every(function(entityID) {
-                var entity = context.graph().entity(entityID);
-                if (prerequisiteTag.key) {
-                    var value = entity.tags[prerequisiteTag.key];
-                    if (!value) return false;
-
-                    if (prerequisiteTag.valueNot) {
-                        return prerequisiteTag.valueNot !== value;
-                    }
-                    if (prerequisiteTag.value) {
-                        return prerequisiteTag.value === value;
-                    }
-                } else if (prerequisiteTag.keyNot) {
-                    if (entity.tags[prerequisiteTag.keyNot]) return false;
-                }
-                return true;
-            })) return false;
-        }
-
-        return true;
-    };
-
-
-    field.focus = function() {
-        if (field.impl) {
-            field.impl.focus();
-        }
-    };
-
-
-    return utilRebind(field, dispatch, 'on');
-}
diff --git a/modules/ui/field_help.js b/modules/ui/field_help.js
index 5bd6c62de3..6c03f707f8 100644
--- a/modules/ui/field_help.js
+++ b/modules/ui/field_help.js
@@ -1,7 +1,6 @@
 //import { select as d3_select } from 'd3-selection';
 //
 //import { marked } from 'marked';
-//import { t, localizer } from '../core/localizer';
 //import { uiIcon } from './icon';
 //import { icon } from './intro/helper';
 //
@@ -52,8 +51,8 @@
 //    var fieldHelpHeadings = {};
 //
 //    var replacements = {
-//        distField: t.html('restriction.controls.distance'),
-//        viaField: t.html('restriction.controls.via'),
+//        distField: context.tHtml('restriction.controls.distance'),
+//        viaField: context.tHtml('restriction.controls.via'),
 //        fromShadow: icon('#rapid-turn-shadow', 'inline shadow from'),
 //        allowShadow: icon('#rapid-turn-shadow', 'inline shadow allow'),
 //        restrictShadow: icon('#rapid-turn-shadow', 'inline shadow restrict'),
@@ -71,12 +70,12 @@
 //            var subkey = helpkey + '.' + part;
 //            var depth = fieldHelpHeadings[subkey];                     // is this subkey a heading?
 //            var hhh = depth ? Array(depth + 1).join('#') + ' ' : '';   // if so, prepend with some ##'s
-//            return all + hhh + t.html(subkey, replacements) + '\n\n';
+//            return all + hhh + context.tHtml(subkey, replacements) + '\n\n';
 //        }, '');
 //
 //        return {
 //            key: helpkey,
-//            title: t.html(helpkey + '.title'),
+//            title: context.tHtml(helpkey + '.title'),
 //            html: marked.parse(text.trim())
 //        };
 //    });
@@ -176,6 +175,7 @@
 //        _wrap = selection.selectAll('.form-field-input-wrap');
 //        if (_wrap.empty()) return;
 //
+//        const isRTL = context.localizationSystem().isRTL();
 //        // absolute position relative to the inspector, so it "floats" above the fields
 //        _inspector = context.container().select('.sidebar .entity-editor-pane .inspector-body');
 //        if (_inspector.empty()) return;
@@ -193,8 +193,8 @@
 //
 //        titleEnter
 //            .append('h2')
-//            .attr('class', ((localizer.textDirection() === 'rtl') ? 'fr' : 'fl'))
-//            .html(t.html('help.field.' + fieldName + '.title'));
+//            .attr('class', isRTL ? 'fr' : 'fl')
+//            .html(context.tHtml('help.field.' + fieldName + '.title'));
 //
 //        titleEnter
 //            .append('button')
diff --git a/modules/ui/fields/access.js b/modules/ui/fields/access.js
index fa8dc010f5..12a3ac36db 100644
--- a/modules/ui/fields/access.js
+++ b/modules/ui/fields/access.js
@@ -3,257 +3,254 @@ import { select as d3_select } from 'd3-selection';
 
 import { uiCombobox } from '../combobox';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
-import { t } from '../../core/localizer';
-
-export function uiFieldAccess(field, context) {
-    var dispatch = d3_dispatch('change');
-    var items = d3_select(null);
-    var _tags;
-
-    function access(selection) {
-        var wrap = selection.selectAll('.form-field-input-wrap')
-            .data([0]);
-
-        wrap = wrap.enter()
-            .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
-            .merge(wrap);
-
-        var list = wrap.selectAll('ul')
-            .data([0]);
-
-        list = list.enter()
-            .append('ul')
-            .attr('class', 'rows')
-            .merge(list);
-
-
-        items = list.selectAll('li')
-            .data(field.keys);
-
-        // Enter
-        var enter = items.enter()
-            .append('li')
-            .attr('class', function(d) { return 'labeled-input preset-access-' + d; });
-
-        enter
-            .append('span')
-            .attr('class', 'label preset-label-access')
-            .attr('for', function(d) { return 'preset-input-access-' + d; })
-            .html(function(d) { return field.t.html('types.' + d); });
-
-        enter
-            .append('div')
-            .attr('class', 'preset-input-access-wrap')
-            .append('input')
-            .attr('type', 'text')
-            .attr('class', function(d) { return 'preset-input-access preset-input-access-' + d; })
-            .call(utilNoAuto)
-            .each(function(d) {
-                d3_select(this)
-                    .call(uiCombobox(context, 'access-' + d)
-                        .data(access.options(d))
-                    );
-            });
-
-
-        // Update
-        items = items.merge(enter);
-
-        wrap.selectAll('.preset-input-access')
-            .on('change', change)
-            .on('blur', change);
-    }
 
 
-    function change(d3_event, d) {
-        var tag = {};
-        var value = context.cleanTagValue(utilGetSetValue(d3_select(this)));
+export function uiFieldAccess(context, uifield) {
+  const dispatch = d3_dispatch('change');
+  let items = d3_select(null);
+  let _tags;
 
-        // don't override multiple values with blank string
-        if (!value && typeof _tags[d] !== 'string') return;
+  function access(selection) {
+    let wrap = selection.selectAll('.form-field-input-wrap')
+      .data([0]);
 
-        tag[d] = value || undefined;
-        dispatch.call('change', this, tag);
-    }
+    wrap = wrap.enter()
+      .append('div')
+      .attr('class', `form-field-input-wrap form-field-input-${uifield.type}`)
+      .merge(wrap);
+
+    let list = wrap.selectAll('ul')
+      .data([0]);
+
+    list = list.enter()
+      .append('ul')
+      .attr('class', 'rows')
+      .merge(list);
+
+
+    items = list.selectAll('li')
+      .data(uifield.keys);
+
+    // Enter
+    let enter = items.enter()
+      .append('li')
+      .attr('class', d => `labeled-input preset-access-${d}`);
+
+    enter
+      .append('span')
+      .attr('class', 'label preset-label-access')
+      .attr('for', d => `preset-input-access-${d}`)
+      .html(d => uifield.tHtml(`types.${d}`));
+
+    enter
+      .append('div')
+      .attr('class', 'preset-input-access-wrap')
+      .append('input')
+      .attr('type', 'text')
+      .attr('class', d => `preset-input-access preset-input-access-${d}`)
+      .call(utilNoAuto)
+      .each((d, i, nodes) => {
+        d3_select(nodes[i])
+          .call(uiCombobox(context, `access-${d}`)
+            .data(access.options(d))
+          );
+      });
+
+
+    // Update
+    items = items.merge(enter);
+
+    wrap.selectAll('.preset-input-access')
+      .on('change', change)
+      .on('blur', change);
+  }
+
+
+  function change(d3_event, d) {
+    let tagChange = {};
+    const value = context.cleanTagValue(utilGetSetValue(d3_select(this)));
 
+    // don't override multiple values with blank string
+    if (!value && typeof _tags[d] !== 'string') return;
 
-    access.options = function(type) {
-        var options = ['no', 'permissive', 'private', 'permit', 'destination'];
+    tagChange[d] = value || undefined;
+    dispatch.call('change', this, tagChange);
+  }
 
-        if (type !== 'access') {
-            options.unshift('yes');
-            options.push('designated');
 
-            if (type === 'bicycle') {
-                options.push('dismount');
+  access.options = function(type) {
+    const options = ['no', 'permissive', 'private', 'permit', 'destination'];
+
+    if (type !== 'access') {
+      options.unshift('yes');
+      options.push('designated');
+
+      if (type === 'bicycle') {
+        options.push('dismount');
+      }
+    }
+
+    return options.map(val => {
+      return {
+        title: uifield.t(`options.${val}.description`),
+        value: val
+      };
+    });
+  };
+
+
+  const placeholdersByHighway = {
+    footway: {
+      foot: 'designated',
+      motor_vehicle: 'no'
+    },
+    steps: {
+      foot: 'yes',
+      motor_vehicle: 'no',
+      bicycle: 'no',
+      horse: 'no'
+    },
+    pedestrian: {
+      foot: 'yes',
+      motor_vehicle: 'no'
+    },
+    cycleway: {
+      motor_vehicle: 'no',
+      bicycle: 'designated'
+    },
+    bridleway: {
+      motor_vehicle: 'no',
+      horse: 'designated'
+    },
+    path: {
+      foot: 'yes',
+      motor_vehicle: 'no',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    motorway: {
+      foot: 'no',
+      motor_vehicle: 'yes',
+      bicycle: 'no',
+      horse: 'no'
+    },
+    trunk: {
+      motor_vehicle: 'yes'
+    },
+    primary: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    secondary: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    tertiary: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    residential: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    unclassified: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    service: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    motorway_link: {
+      foot: 'no',
+      motor_vehicle: 'yes',
+      bicycle: 'no',
+      horse: 'no'
+    },
+    trunk_link: {
+      motor_vehicle: 'yes'
+    },
+    primary_link: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    secondary_link: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    },
+    tertiary_link: {
+      foot: 'yes',
+      motor_vehicle: 'yes',
+      bicycle: 'yes',
+      horse: 'yes'
+    }
+  };
+
+
+  access.tags = function(tags) {
+    _tags = tags;
+
+    utilGetSetValue(items.selectAll('.preset-input-access'), d => {
+      return typeof tags[d] === 'string' ? tags[d] : '';
+    })
+      .classed('mixed', d => {
+        return tags[d] && Array.isArray(tags[d]);
+      })
+      .attr('title', d => {
+        return tags[d] && Array.isArray(tags[d]) && tags[d].filter(Boolean).join('\n');
+      })
+      .attr('placeholder', d => {
+        if (tags[d] && Array.isArray(tags[d])) {
+          return context.t('inspector.multiple_values');
+        }
+        if (d === 'access') {
+          return 'yes';
+        }
+        if (tags.access && typeof tags.access === 'string') {
+          return tags.access;
+        }
+        if (tags.highway) {
+          if (typeof tags.highway === 'string') {
+            if (placeholdersByHighway[tags.highway] && placeholdersByHighway[tags.highway][d]) {
+              return placeholdersByHighway[tags.highway][d];
+            }
+          } else {
+            const impliedAccesses = tags.highway.filter(Boolean).map(highwayVal => {
+              return placeholdersByHighway[highwayVal] && placeholdersByHighway[highwayVal][d];
+            }).filter(Boolean);
+
+            if (impliedAccesses.length === tags.highway.length && new Set(impliedAccesses).size === 1) {
+              // if all the highway values have the same implied access for this type then use that
+              return impliedAccesses[0];
             }
+          }
         }
+        return uifield.placeholder;
+      });
+  };
 
-        return options.map(function(option) {
-            return {
-                title: field.t('options.' + option + '.description'),
-                value: option
-            };
-        });
-    };
-
-
-    var placeholdersByHighway = {
-        footway: {
-            foot: 'designated',
-            motor_vehicle: 'no'
-        },
-        steps: {
-            foot: 'yes',
-            motor_vehicle: 'no',
-            bicycle: 'no',
-            horse: 'no'
-        },
-        pedestrian: {
-            foot: 'yes',
-            motor_vehicle: 'no'
-        },
-        cycleway: {
-            motor_vehicle: 'no',
-            bicycle: 'designated'
-        },
-        bridleway: {
-            motor_vehicle: 'no',
-            horse: 'designated'
-        },
-        path: {
-            foot: 'yes',
-            motor_vehicle: 'no',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        motorway: {
-            foot: 'no',
-            motor_vehicle: 'yes',
-            bicycle: 'no',
-            horse: 'no'
-        },
-        trunk: {
-            motor_vehicle: 'yes'
-        },
-        primary: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        secondary: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        tertiary: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        residential: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        unclassified: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        service: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        motorway_link: {
-            foot: 'no',
-            motor_vehicle: 'yes',
-            bicycle: 'no',
-            horse: 'no'
-        },
-        trunk_link: {
-            motor_vehicle: 'yes'
-        },
-        primary_link: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        secondary_link: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        },
-        tertiary_link: {
-            foot: 'yes',
-            motor_vehicle: 'yes',
-            bicycle: 'yes',
-            horse: 'yes'
-        }
-    };
-
-
-    access.tags = function(tags) {
-        _tags = tags;
-
-        utilGetSetValue(items.selectAll('.preset-input-access'), function(d) {
-                return typeof tags[d] === 'string' ? tags[d] : '';
-            })
-            .classed('mixed', function(d) {
-                return tags[d] && Array.isArray(tags[d]);
-            })
-            .attr('title', function(d) {
-                return tags[d] && Array.isArray(tags[d]) && tags[d].filter(Boolean).join('\n');
-            })
-            .attr('placeholder', function(d) {
-                if (tags[d] && Array.isArray(tags[d])) {
-                    return t('inspector.multiple_values');
-                }
-                if (d === 'access') {
-                    return 'yes';
-                }
-                if (tags.access && typeof tags.access === 'string') {
-                    return tags.access;
-                }
-                if (tags.highway) {
-                    if (typeof tags.highway === 'string') {
-                        if (placeholdersByHighway[tags.highway] &&
-                            placeholdersByHighway[tags.highway][d]) {
-
-                            return placeholdersByHighway[tags.highway][d];
-                        }
-                    } else {
-                        var impliedAccesses = tags.highway.filter(Boolean).map(function(highwayVal) {
-                            return placeholdersByHighway[highwayVal] && placeholdersByHighway[highwayVal][d];
-                        }).filter(Boolean);
-
-                        if (impliedAccesses.length === tags.highway.length &&
-                            new Set(impliedAccesses).size === 1) {
-                            // if all the highway values have the same implied access for this type then use that
-                            return impliedAccesses[0];
-                        }
-                    }
-                }
-                return field.placeholder();
-            });
-    };
-
-
-    access.focus = function() {
-        items.selectAll('.preset-input-access')
-            .node().focus();
-    };
-
-
-    return utilRebind(access, dispatch, 'on');
+
+  access.focus = function() {
+    items.selectAll('.preset-input-access')
+      .node().focus();
+  };
+
+
+  return utilRebind(access, dispatch, 'on');
 }
diff --git a/modules/ui/fields/address.js b/modules/ui/fields/address.js
index 3062859eb7..b213b4f440 100644
--- a/modules/ui/fields/address.js
+++ b/modules/ui/fields/address.js
@@ -4,324 +4,303 @@ import { Extent, geoSphericalDistance } from '@rapid-sdk/math';
 import { utilArrayUniqBy } from '@rapid-sdk/util';
 import * as countryCoder from '@rapideditor/country-coder';
 
-import { presetManager } from '../../presets';
-import { fileFetcher } from '../../core/file_fetcher';
 import { geoChooseEdge } from '../../geo';
 import { uiCombobox } from '../combobox';
-import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util';
-import { t } from '../../core/localizer';
-
-
-export function uiFieldAddress(field, context) {
-    var dispatch = d3_dispatch('change');
-    var _selection = d3_select(null);
-    var _wrap = d3_select(null);
-    var addrField = presetManager.field('address');   // needed for placeholder strings
-
-    var _entityIDs = [];
-    var _tags;
-    var _countryCode;
-    var _addressFormats = [{
-        format: [
-            ['housenumber', 'street'],
-            ['city', 'postcode']
-        ]
-      }];
-
-    fileFetcher.get('address_formats')
-        .then(function(d) {
-            _addressFormats = d;
-            if (!_selection.empty()) {
-                _selection.call(address);
-            }
-        })
-        .catch(e => console.error(e));  // eslint-disable-line
-
-
-    function getNearStreets() {
-        var extent = combinedEntityExtent();
-        var l = extent.center();
-        var box = new Extent(l).padByMeters(200);
-
-        var streets = context.history().intersects(box)
-            .filter(isAddressable)
-            .map(function(d) {
-                var loc = context.projection.project([
-                    (extent.min[0] + extent.max[0]) / 2,
-                    (extent.min[1] + extent.max[1]) / 2
-                ]);
-                var choice = geoChooseEdge(context.graph().childNodes(d), loc, context.projection);
-
-                return {
-                    title: d.tags.name,
-                    value: d.tags.name,
-                    dist: choice.distance
-                };
-            })
-            .sort(function(a, b) {
-                return a.dist - b.dist;
-            });
-
-        return utilArrayUniqBy(streets, 'value');
-
-        function isAddressable(d) {
-            return d.tags.highway && d.tags.name && d.type === 'way';
-        }
-    }
+import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
+
+
+export function uiFieldAddress(context, uifield) {
+  const dispatch = d3_dispatch('change');
+  let _selection = d3_select(null);
+  let _wrap = d3_select(null);
+
+  let _entityIDs = [];
+  let _tags;
+  let _countryCode;
+  let _addressFormats = [{
+    format: [
+      ['housenumber', 'street'],
+      ['city', 'postcode']
+    ]
+  }];
+
+  const dataLoaderSystem = context.dataLoaderSystem();
+  dataLoaderSystem.get('address_formats')
+    .then(d => {
+      _addressFormats = d;
+      if (!_selection.empty()) {
+        _selection.call(address);  // rerender
+      }
+    })
+    .catch(e => console.error(e));  // eslint-disable-line
+
+
+  function getNearbyStreets() {
+    const center = uifield.entityExtent.center();
+    const box = new Extent(center).padByMeters(200);
+
+    const streets = context.editSystem().intersects(box)
+      .filter(isAddressableStreet)
+      .map(d => {
+        const loc = context.projection.project(center);
+        const choice = geoChooseEdge(context.graph().childNodes(d), loc, context.projection);
+        return {
+          title: d.tags.name,
+          value: d.tags.name,
+          dist: choice.distance
+        };
+      })
+      .sort((a, b) => a.dist - b.dist);
 
+    return utilArrayUniqBy(streets, 'value');
 
-    function getNearCities() {
-        var extent = combinedEntityExtent();
-        var l = extent.center();
-        var box = new Extent(l).padByMeters(200);
+    function isAddressableStreet(d) {
+      return d.tags.highway && d.tags.name && d.type === 'way';
+    }
+  }
 
-        var cities = context.history().intersects(box)
-            .filter(isAddressable)
-            .map(function(d) {
-                return {
-                    title: d.tags['addr:city'] || d.tags.name,
-                    value: d.tags['addr:city'] || d.tags.name,
-                    dist: geoSphericalDistance(d.extent(context.graph()).center(), l)
-                };
-            })
-            .sort(function(a, b) {
-                return a.dist - b.dist;
-            });
 
-        return utilArrayUniqBy(cities, 'value');
+  function getNearbyCities() {
+    const center = uifield.entityExtent.center();
+    const box = new Extent(center).padByMeters(200);
 
+    const cities = context.editSystem().intersects(box)
+      .filter(isAddressableCity)
+      .map(d => {
+        return {
+          title: d.tags['addr:city'] || d.tags.name,
+          value: d.tags['addr:city'] || d.tags.name,
+          dist: geoSphericalDistance(d.extent(context.graph()).center(), center)
+        };
+      })
+      .sort((a, b) => a.dist - b.dist);
 
-        function isAddressable(d) {
-            if (d.tags.name) {
-                if (d.tags.admin_level === '8' && d.tags.boundary === 'administrative') return true;
-                if (d.tags.border_type === 'city') return true;
-                if (d.tags.place === 'city' || d.tags.place === 'town' || d.tags.place === 'village') return true;
-            }
+    return utilArrayUniqBy(cities, 'value');
 
-            if (d.tags['addr:city']) return true;
+    function isAddressableCity(d) {
+      if (d.tags.name) {
+        if (d.tags.admin_level === '8' && d.tags.boundary === 'administrative') return true;
+        if (d.tags.border_type === 'city') return true;
+        if (d.tags.place === 'city' || d.tags.place === 'town' || d.tags.place === 'village') return true;
+      }
 
-            return false;
-        }
-    }
+      if (d.tags['addr:city']) return true;
 
-    function getNearValues(key) {
-        var extent = combinedEntityExtent();
-        var l = extent.center();
-        var box = new Extent(l).padByMeters(200);
-
-        var results = context.history().intersects(box)
-            .filter(function hasTag(d) { return _entityIDs.indexOf(d.id) === -1 && d.tags[key]; })
-            .map(function(d) {
-                return {
-                    title: d.tags[key],
-                    value: d.tags[key],
-                    dist: geoSphericalDistance(d.extent(context.graph()).center(), l)
-                };
-            })
-            .sort(function(a, b) {
-                return a.dist - b.dist;
-            });
-
-        return utilArrayUniqBy(results, 'value');
+      return false;
     }
+  }
 
 
-    function updateForCountryCode() {
-
-        if (!_countryCode) return;
+  // Suggest values that are used by other nearby entities
+  function getNearbyValues(key) {
+    const center = uifield.entityExtent.center();
+    const box = new Extent(center).padByMeters(200);
 
-        var addressFormat;
-        for (var i = 0; i < _addressFormats.length; i++) {
-            var format = _addressFormats[i];
-            if (!format.countryCodes) {
-                addressFormat = format;   // choose the default format, keep going
-            } else if (format.countryCodes.indexOf(_countryCode) !== -1) {
-                addressFormat = format;   // choose the country format, stop here
-                break;
-            }
-        }
-
-        var dropdowns = addressFormat.dropdowns || [
-            'city', 'county', 'country', 'district', 'hamlet',
-            'neighbourhood', 'place', 'postcode', 'province',
-            'quarter', 'state', 'street', 'subdistrict', 'suburb'
-        ];
-
-        var widths = addressFormat.widths || {
-            housenumber: 1/3, street: 2/3,
-            city: 2/3, state: 1/4, postcode: 1/3
+    const results = context.editSystem().intersects(box)
+      .filter(entityHasAddressTag)
+      .map(d => {
+        return {
+          title: d.tags[key],
+          value: d.tags[key],
+          dist: geoSphericalDistance(d.extent(context.graph()).center(), center)
         };
+      })
+      .sort((a, b) => a.dist - b.dist);
 
-        function row(r) {
-            // Normalize widths.
-            var total = r.reduce(function(sum, key) {
-                return sum + (widths[key] || 0.5);
-            }, 0);
-
-            return r.map(function(key) {
-                return {
-                    id: key,
-                    width: (widths[key] || 0.5) / total
-                };
-            });
-        }
-
-        var rows = _wrap.selectAll('.addr-row')
-            .data(addressFormat.format, function(d) {
-                return d.toString();
-            });
-
-        rows.exit()
-            .remove();
-
-        rows
-            .enter()
-            .append('div')
-            .attr('class', 'addr-row')
-            .selectAll('input')
-            .data(row)
-            .enter()
-            .append('input')
-            .property('type', 'text')
-            .call(updatePlaceholder)
-            .attr('class', function (d) { return 'addr-' + d.id; })
-            .call(utilNoAuto)
-            .each(addDropdown)
-            .style('width', function (d) { return d.width * 100 + '%'; });
-
-
-        function addDropdown(d) {
-            if (dropdowns.indexOf(d.id) === -1) return;  // not a dropdown
-
-            var nearValues = (d.id === 'street') ? getNearStreets
-                : (d.id === 'city') ? getNearCities
-                : getNearValues;
-
-            d3_select(this)
-                .call(uiCombobox(context, 'address-' + d.id)
-                    .minItems(1)
-                    .caseSensitive(true)
-                    .fetcher(function(value, callback) {
-                        callback(nearValues('addr:' + d.id));
-                    })
-                );
-        }
-
-        _wrap.selectAll('input')
-            .on('blur', change())
-            .on('change', change());
-
-        _wrap.selectAll('input:not(.combobox-input)')
-            .on('input', change(true));
-
-        if (_tags) updateTags(_tags);
-    }
-
+    return utilArrayUniqBy(results, 'value');
 
-    function address(selection) {
-        _selection = selection;
-
-        _wrap = selection.selectAll('.form-field-input-wrap')
-            .data([0]);
-
-        _wrap = _wrap.enter()
-            .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
-            .merge(_wrap);
-
-        var extent = combinedEntityExtent();
-
-        if (extent) {
-            var countryCode;
-            if (context.inIntro()) {
-                // localize the address format for the walkthrough
-                countryCode = t('intro.graph.countrycode');
-            } else {
-                var center = extent.center();
-                countryCode = countryCoder.iso1A2Code(center);
-            }
-            if (countryCode) {
-                _countryCode = countryCode.toLowerCase();
-                updateForCountryCode();
-            }
-        }
+    function entityHasAddressTag(d) {
+      return !_entityIDs.includes(d.id) && d.tags[key];
     }
+  }
 
 
-    function change(onInput) {
-        return function() {
-            var tags = {};
+  function updateForCountryCode() {
+    if (!_countryCode) return;
 
-            _wrap.selectAll('input')
-                .each(function (subfield) {
-                    var key = field.key + ':' + subfield.id;
+    let addressFormat;
+    for (let i = 0; i < _addressFormats.length; i++) {
+      let format = _addressFormats[i];
+      if (!format.countryCodes) {
+        addressFormat = format;   // choose the default format, keep going
+      } else if (format.countryCodes.includes(_countryCode)) {
+        addressFormat = format;   // choose the country format, stop here
+        break;
+      }
+    }
 
-                    var value = this.value;
-                    if (!onInput) value = context.cleanTagValue(value);
+    const dropdowns = addressFormat.dropdowns || [
+      'city', 'county', 'country', 'district', 'hamlet',
+      'neighbourhood', 'place', 'postcode', 'province',
+      'quarter', 'state', 'street', 'subdistrict', 'suburb'
+    ];
 
-                    // don't override multiple values with blank string
-                    if (Array.isArray(_tags[key]) && !value) return;
+    const widths = addressFormat.widths || {
+      housenumber: 1/3, street: 2/3,
+      city: 2/3, state: 1/4, postcode: 1/3
+    };
 
-                    tags[key] = value || undefined;
-                });
+    function row(r) {
+      // Normalize widths.
+      const total = r.reduce((sum, key) => {
+        return sum + (widths[key] || 0.5);
+      }, 0);
 
-            dispatch.call('change', this, tags, onInput);
+      return r.map(key => {
+        return {
+          id: key,
+          width: (widths[key] || 0.5) / total
         };
+      });
     }
 
-    function updatePlaceholder(inputSelection) {
-        return inputSelection.attr('placeholder', function(subfield) {
-            if (_tags && Array.isArray(_tags[field.key + ':' + subfield.id])) {
-                return t('inspector.multiple_values');
-            }
-            if (_countryCode) {
-                var localkey = subfield.id + '!' + _countryCode;
-                var tkey = addrField.hasTextForStringId('placeholders.' + localkey) ? localkey : subfield.id;
-                return addrField.t('placeholders.' + tkey);
-            }
-        });
+    let rows = _wrap.selectAll('.addr-row')
+      .data(addressFormat.format, d => d.toString());
+
+    rows.exit()
+      .remove();
+
+    rows
+      .enter()
+      .append('div')
+      .attr('class', 'addr-row')
+      .selectAll('input')
+      .data(row)
+      .enter()
+      .append('input')
+      .property('type', 'text')
+      .call(updatePlaceholder)
+      .attr('class', d => `addr-${d.id}`)
+      .call(utilNoAuto)
+      .each(addDropdown)
+      .style('width', d => (d.width * 100) + '%');
+
+
+    function addDropdown(d) {
+      if (!dropdowns.includes(d.id)) return;  // not a dropdown
+
+      const getValues = (d.id === 'street') ? getNearbyStreets
+        : (d.id === 'city') ? getNearbyCities
+        : getNearbyValues;
+
+      d3_select(this)
+        .call(uiCombobox(context, `address-${d.id}`)
+          .minItems(1)
+          .caseSensitive(true)
+          .fetcher(function(value, callback) {
+            callback(getValues(`addr:${d.id}`));
+          })
+        );
     }
 
+    _wrap.selectAll('input')
+      .on('blur', change())
+      .on('change', change());
 
-    function updateTags(tags) {
-        utilGetSetValue(_wrap.selectAll('input'), function (subfield) {
-                var val = tags[field.key + ':' + subfield.id];
-                return typeof val === 'string' ? val : '';
-            })
-            .attr('title', function(subfield) {
-                var val = tags[field.key + ':' + subfield.id];
-                return val && Array.isArray(val) && val.filter(Boolean).join('\n');
-            })
-            .classed('mixed', function(subfield) {
-                return Array.isArray(tags[field.key + ':' + subfield.id]);
-            })
-            .call(updatePlaceholder);
-    }
+    _wrap.selectAll('input:not(.combobox-input)')
+      .on('input', change(true));
 
+    if (_tags) updateTags(_tags);
+  }
 
-    function combinedEntityExtent() {
-        return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
-    }
 
+  function address(selection) {
+    _selection = selection;
 
-    address.entityIDs = function(val) {
-        if (!arguments.length) return _entityIDs;
-        _entityIDs = val;
-        return address;
-    };
+    _wrap = selection.selectAll('.form-field-input-wrap')
+      .data([0]);
 
+    _wrap = _wrap.enter()
+      .append('div')
+      .attr('class', `form-field-input-wrap form-field-input-${uifield.type}`)
+      .merge(_wrap);
 
-    address.tags = function(tags) {
-        _tags = tags;
-        updateTags(tags);
-    };
+    const center = uifield.entityExtent.center();
+    let countryCode;
+    if (context.inIntro) {  // localize the address format for the walkthrough
+      countryCode = context.t('intro.graph.countrycode');
+    } else {
+      countryCode = countryCoder.iso1A2Code(center);
+    }
+    if (countryCode) {
+      _countryCode = countryCode.toLowerCase();
+      updateForCountryCode();
+    }
+  }
 
 
-    address.focus = function() {
-        var node = _wrap.selectAll('input').node();
-        if (node) node.focus();
-    };
+  function change(onInput) {
+    return function() {
+      let tagChange = {};
+      _wrap.selectAll('input')
+        .each((subfield, i, nodes) => {
+          const node = nodes[i];
+          const key = uifield.key + ':' + subfield.id;
+          const value = onInput ? node.value : context.cleanTagValue(node.value);
 
+          // don't override multiple values with blank string
+          if (Array.isArray(_tags[key]) && !value) return;
 
-    return utilRebind(address, dispatch, 'on');
+          tagChange[key] = value || undefined;
+        });
+
+      dispatch.call('change', this, tagChange, onInput);
+    };
+  }
+
+
+  function updatePlaceholder(inputSelection) {
+    return inputSelection.attr('placeholder', function(subfield) {
+      const key = uifield.key + ':' + subfield.id;
+      if (_tags && Array.isArray(_tags[key])) {
+        return context.t('inspector.multiple_values');
+      }
+      if (_countryCode) {
+        const localkey = subfield.id + '!' + _countryCode;
+        const tkey = uifield.hasTextForStringID('placeholders.' + localkey) ? localkey : subfield.id;
+        return uifield.presetField.t(`placeholders.${tkey}`);
+      }
+    });
+  }
+
+
+  function updateTags(tags) {
+    utilGetSetValue(_wrap.selectAll('input'), function(subfield) {
+        const key = uifield.key + ':' + subfield.id;
+        const val = tags[key];
+        return typeof val === 'string' ? val : '';
+      })
+      .attr('title', subfield => {
+        const key = uifield.key + ':' + subfield.id;
+        const val = tags[key];
+        return val && Array.isArray(val) && val.filter(Boolean).join('\n');
+      })
+      .classed('mixed', subfield => {
+        const key = uifield.key + ':' + subfield.id;
+        return Array.isArray(tags[key]);
+      })
+      .call(updatePlaceholder);
+  }
+
+
+  address.entityIDs = function(val) {
+    if (!arguments.length) return _entityIDs;
+    _entityIDs = val;
+    return address;
+  };
+
+
+  address.tags = function(tags) {
+    _tags = tags;
+    updateTags(tags);
+  };
+
+
+  address.focus = function() {
+    let node = _wrap.selectAll('input').node();
+    if (node) node.focus();
+  };
+
+
+  return utilRebind(address, dispatch, 'on');
 }
diff --git a/modules/ui/fields/check.js b/modules/ui/fields/check.js
index ec4f837de1..e941872253 100644
--- a/modules/ui/fields/check.js
+++ b/modules/ui/fields/check.js
@@ -1,11 +1,7 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
-
-import {
-    select as d3_select
-} from 'd3-selection';
+import { select as d3_select } from 'd3-selection';
 
 import { utilRebind } from '../../util/rebind';
-import { t } from '../../core/localizer';
 import { actionReverse } from '../../actions/reverse';
 import { osmOneWayTags } from '../../osm';
 import { uiIcon } from '../icon';
@@ -14,220 +10,221 @@ export { uiFieldCheck as uiFieldDefaultCheck };
 export { uiFieldCheck as uiFieldOnewayCheck };
 
 
-export function uiFieldCheck(field, context) {
-    var dispatch = d3_dispatch('change');
-    var options = field.options;
-    var values = [];
-    var texts = [];
-
-    var _tags;
+export function uiFieldCheck(context, uifield) {
+  const dispatch = d3_dispatch('change');
+  let values = [];
+  let texts = [];
 
-    var input = d3_select(null);
-    var text = d3_select(null);
-    var label = d3_select(null);
-    var reverser = d3_select(null);
+  let input = d3_select(null);
+  let text = d3_select(null);
+  let label = d3_select(null);
+  let reverser = d3_select(null);
 
-    var _impliedYes;
-    var _entityIDs = [];
-    var _value;
+  let _tags;
+  let _impliedYes;
+  let _entityIDs = [];
+  let _value;
 
 
-    if (options) {
-        for (var i in options) {
-            var v = options[i];
-            values.push(v === 'undefined' ? undefined : v);
-            texts.push(field.t.html('options.' + v, { 'default': v }));
-        }
-    } else {
-        values = [undefined, 'yes'];
-        texts = [t.html('inspector.unknown'), t.html('inspector.check.yes')];
-        if (field.type !== 'defaultCheck') {
-            values.push('no');
-            texts.push(t.html('inspector.check.no'));
-        }
+  // Prepare the values and texts that this checkbox works with
+  const options = uifield.presetField.options;
+  if (Array.isArray(options)) {
+    for (const v of options) {
+      values.push(v === 'undefined' ? undefined : v);
+      texts.push(uifield.tHtml(`options.${v}`, { 'default': v }));
     }
-
-
-    // Checks tags to see whether an undefined value is "Assumed to be Yes"
-    function checkImpliedYes() {
-        _impliedYes = (field.id === 'oneway_yes');
-
-        // hack: pretend `oneway` field is a `oneway_yes` field
-        // where implied oneway tag exists (e.g. `junction=roundabout`) #2220, #1841
-        if (field.id === 'oneway') {
-            var entity = context.entity(_entityIDs[0]);
-            for (var key in entity.tags) {
-                if (key in osmOneWayTags && (entity.tags[key] in osmOneWayTags[key])) {
-                    _impliedYes = true;
-                    texts[0] = t.html('_tagging.presets.fields.oneway_yes.options.undefined');
-                    break;
-                }
-            }
+  } else {
+    values = [undefined, 'yes'];
+    texts = [context.tHtml('inspector.unknown'), context.tHtml('inspector.check.yes')];
+    if (uifield.type !== 'defaultCheck') {
+      values.push('no');
+      texts.push(context.tHtml('inspector.check.no'));
+    }
+  }
+
+
+  // Checks tags to see whether an undefined value is "Assumed to be Yes"
+  function checkImpliedYes() {
+    _impliedYes = (uifield.id === 'oneway_yes');
+
+    // hack: pretend `oneway` field is a `oneway_yes` field
+    // where implied oneway tag exists (e.g. `junction=roundabout`) iD#2220, iD#1841
+    if (uifield.id === 'oneway' && _entityIDs.length) {
+      const entity = context.entity(_entityIDs[0]);
+      for (let key in entity.tags) {
+        if (key in osmOneWayTags && (entity.tags[key] in osmOneWayTags[key])) {
+          _impliedYes = true;
+          texts[0] = context.tHtml('_tagging.presets.fields.oneway_yes.options.undefined');
+          break;
         }
+      }
     }
+  }
 
 
-    function reverserHidden() {
-        if (!context.container().select('div.inspector-hover').empty()) return true;
-        return !(_value === 'yes' || (_impliedYes && !_value));
-    }
+  function reverserHidden() {
+    if (!context.container().select('div.inspector-hover').empty()) return true;
+    return !(_value === 'yes' || (_impliedYes && !_value));
+  }
 
 
-    function reverserSetText(selection) {
-        var entity = _entityIDs.length && context.hasEntity(_entityIDs[0]);
-        if (reverserHidden() || !entity) return selection;
+  function reverserSetText(selection) {
+    const entity = _entityIDs.length && context.hasEntity(_entityIDs[0]);
+    if (reverserHidden() || !entity) return selection;
 
-        var first = entity.first();
-        var last = entity.isClosed() ? entity.nodes[entity.nodes.length - 2] : entity.last();
-        var pseudoDirection = first < last;
-        var icon = pseudoDirection ? '#rapid-icon-forward' : '#rapid-icon-backward';
+    const first = entity.first();
+    const last = entity.isClosed() ? entity.nodes[entity.nodes.length - 2] : entity.last();
+    const pseudoDirection = first < last;
+    const icon = pseudoDirection ? '#rapid-icon-forward' : '#rapid-icon-backward';
 
-        selection.selectAll('.reverser-span')
-            .html(t.html('inspector.check.reverser'))
-            .call(uiIcon(icon, 'inline'));
+    selection.selectAll('.reverser-span')
+      .html(context.tHtml('inspector.check.reverser'))
+      .call(uiIcon(icon, 'inline'));
 
-        return selection;
-    }
+    return selection;
+  }
 
 
-    var check = function(selection) {
-        checkImpliedYes();
+  let check = function(selection) {
+    checkImpliedYes();
 
-        label = selection.selectAll('.form-field-input-wrap')
-            .data([0]);
+    label = selection.selectAll('.form-field-input-wrap')
+      .data([0]);
 
-        var enter = label.enter()
-            .append('label')
-            .attr('class', 'form-field-input-wrap form-field-input-check');
+    let enter = label.enter()
+      .append('label')
+      .attr('class', 'form-field-input-wrap form-field-input-check');
 
-        enter
-            .append('input')
-            .property('indeterminate', field.type !== 'defaultCheck')
-            .attr('type', 'checkbox')
-            .attr('id', field.domId);
+    enter
+      .append('input')
+      .property('indeterminate', uifield.type !== 'defaultCheck')
+      .attr('type', 'checkbox')
+      .attr('id', uifield.uid);
 
-        enter
-            .append('span')
-            .html(texts[0])
-            .attr('class', 'value');
+    enter
+      .append('span')
+      .html(texts[0])
+      .attr('class', 'value');
 
-        if (field.type === 'onewayCheck') {
-            enter
-                .append('button')
-                .attr('class', 'reverser' + (reverserHidden() ? ' hide' : ''))
-                .append('span')
-                .attr('class', 'reverser-span');
+    if (uifield.type === 'onewayCheck') {
+      enter
+        .append('button')
+        .attr('class', 'reverser' + (reverserHidden() ? ' hide' : ''))
+        .append('span')
+        .attr('class', 'reverser-span');
+    }
+
+    label = label.merge(enter);
+    input = label.selectAll('input');
+    text = label.selectAll('span.value');
+
+    input
+      .on('click', function(d3_event) {
+        d3_event.stopPropagation();
+        const key = uifield.key;
+        let tagChange = {};
+
+        if (Array.isArray(_tags[key])) {
+          if (values.indexOf('yes') !== -1) {
+            tagChange[key] = 'yes';
+          } else {
+            tagChange[key] = values[0];
+          }
+        } else {
+          tagChange[key] = values[(values.indexOf(_value) + 1) % values.length];
         }
 
-        label = label.merge(enter);
-        input = label.selectAll('input');
-        text = label.selectAll('span.value');
-
-        input
-            .on('click', function(d3_event) {
-                d3_event.stopPropagation();
-                var t = {};
-
-                if (Array.isArray(_tags[field.key])) {
-                    if (values.indexOf('yes') !== -1) {
-                        t[field.key] = 'yes';
-                    } else {
-                        t[field.key] = values[0];
-                    }
-                } else {
-                    t[field.key] = values[(values.indexOf(_value) + 1) % values.length];
-                }
-
-                // Don't cycle through `alternating` or `reversible` states - #4970
-                // (They are supported as translated strings, but should not toggle with clicks)
-                if (t[field.key] === 'reversible' || t[field.key] === 'alternating') {
-                    t[field.key] = values[0];
-                }
-
-                dispatch.call('change', this, t);
-            });
-
-        if (field.type === 'onewayCheck') {
-            reverser = label.selectAll('.reverser');
-
-            reverser
-                .call(reverserSetText)
-                .on('click', function(d3_event) {
-                    d3_event.preventDefault();
-                    d3_event.stopPropagation();
-                    context.perform(
-                        function(graph) {
-                            for (var i in _entityIDs) {
-                                graph = actionReverse(_entityIDs[i])(graph);
-                            }
-                            return graph;
-                        },
-                        t('operations.reverse.annotation.line', { n: 1 })
-                    );
-
-                    // must manually revalidate since no 'change' event was called
-                    context.validator().validate();
-
-                    d3_select(this)
-                        .call(reverserSetText);
-                });
+        // Don't cycle through `alternating` or `reversible` states - iD#4970
+        // (They are supported as translated strings, but should not toggle with clicks)
+        if (tagChange[key] === 'reversible' || tagChange[key] === 'alternating') {
+          tagChange[key] = values[0];
         }
-    };
 
+        dispatch.call('change', this, tagChange);
+      });
 
-    check.entityIDs = function(val) {
-        if (!arguments.length) return _entityIDs;
-        _entityIDs = val;
-        return check;
-    };
 
+    if (uifield.type === 'onewayCheck') {
+      reverser = label.selectAll('.reverser');
 
-    check.tags = function(tags) {
+      reverser
+        .call(reverserSetText)
+        .on('click', function(d3_event) {
+          d3_event.preventDefault();
+          d3_event.stopPropagation();
+          if (!_entityIDs.length) return;
 
-        _tags = tags;
+          context.perform(
+            function(graph) {
+              for (const entityID of _entityIDs) {
+                graph = actionReverse(entityID)(graph);
+              }
+              return graph;
+            },
+            context.t('operations.reverse.annotation.line', { n: 1 })
+          );
 
-        function isChecked(val) {
-            return val !== 'no' && val !== '' && val !== undefined && val !== null;
-        }
+          // must manually revalidate since no 'change' event was dispatched
+          context.validationSystem().validate();
 
-        function textFor(val) {
-            if (val === '') val = undefined;
-            var index = values.indexOf(val);
-            return (index !== -1 ? texts[index] : ('"' + val + '"'));
-        }
+          d3_select(this)
+            .call(reverserSetText);
+        });
+    }
+  };
 
-        checkImpliedYes();
 
-        var isMixed = Array.isArray(tags[field.key]);
+  check.entityIDs = function(val) {
+    if (!arguments.length) return _entityIDs;
+    _entityIDs = val;
+    return check;
+  };
 
-        _value = !isMixed && tags[field.key] && tags[field.key].toLowerCase();
 
-        if (field.type === 'onewayCheck' && (_value === '1' || _value === '-1')) {
-            _value = 'yes';
-        }
+  check.tags = function(tags) {
+    _tags = tags;
+    const key = uifield.key;
 
-        input
-            .property('indeterminate', isMixed || (field.type !== 'defaultCheck' && !_value))
-            .property('checked', isChecked(_value));
+    function isChecked(val) {
+      return val !== 'no' && val !== '' && val !== undefined && val !== null;
+    }
 
-        text
-            .html(isMixed ? t.html('inspector.multiple_values') : textFor(_value))
-            .classed('mixed', isMixed);
+    function textFor(val) {
+      if (val === '') val = undefined;
+      const index = values.indexOf(val);
+      return index === -1 ? `"${val}"` : texts[index];
+    }
 
-        label
-            .classed('set', !!_value);
+    checkImpliedYes();
+    let isMixed = Array.isArray(tags[key]);
+    _value = !isMixed && tags[key] && tags[key].toLowerCase();
 
-        if (field.type === 'onewayCheck') {
-            reverser
-                .classed('hide', reverserHidden())
-                .call(reverserSetText);
-        }
-    };
+    if (uifield.type === 'onewayCheck' && (_value === '1' || _value === '-1')) {
+      _value = 'yes';
+    }
+
+    input
+      .property('indeterminate', isMixed || (uifield.type !== 'defaultCheck' && !_value))
+      .property('checked', isChecked(_value));
+
+    text
+      .html(isMixed ? context.tHtml('inspector.multiple_values') : textFor(_value))
+      .classed('mixed', isMixed);
+
+    label
+      .classed('set', !!_value);
+
+    if (uifield.type === 'onewayCheck') {
+      reverser
+        .classed('hide', reverserHidden())
+        .call(reverserSetText);
+    }
+  };
 
 
-    check.focus = function() {
-        input.node().focus();
-    };
+  check.focus = function() {
+    input.node().focus();
+  };
 
-    return utilRebind(check, dispatch, 'on');
+  return utilRebind(check, dispatch, 'on');
 }
diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 5da3901802..25f0bd22f2 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -4,13 +4,10 @@ import { drag as d3_drag } from 'd3-drag';
 import { utilArrayUniq, utilUnicodeCharsCount } from '@rapid-sdk/util';
 import * as countryCoder from '@rapideditor/country-coder';
 
-import { fileFetcher } from '../../core/file_fetcher';
 import { osmEntity } from '../../osm/entity';
-import { t } from '../../core/localizer';
-import { services } from '../../services';
 import { uiCombobox } from '../combobox';
 import { utilKeybinding } from '../../util/keybinding';
-import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util';
+import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 export {
     uiFieldCombo as uiFieldManyCombo,
@@ -21,17 +18,19 @@ export {
 };
 
 
-export function uiFieldCombo(field, context) {
-    var dispatch = d3_dispatch('change');
-    var _isMulti = (field.type === 'multiCombo' || field.type === 'manyCombo');
-    var _isNetwork = (field.type === 'networkCombo');
-    var _isSemi = (field.type === 'semiCombo');
-    var _optarray = field.options;
-    var _showTagInfoSuggestions = field.type !== 'manyCombo' && field.autoSuggestions !== false;
-    var _allowCustomValues = field.type !== 'manyCombo' && field.customValues !== false;
-    var _snake_case = (field.snake_case || (field.snake_case === undefined));
-    var _combobox = uiCombobox(context, 'combo-' + field.safeid)
-        .caseSensitive(field.caseSensitive)
+export function uiFieldCombo(context, uifield) {
+    const dispatch = d3_dispatch('change');
+    const presetField = uifield.presetField;
+
+    var _isMulti = (uifield.type === 'multiCombo' || uifield.type === 'manyCombo');
+    var _isNetwork = (uifield.type === 'networkCombo');
+    var _isSemi = (uifield.type === 'semiCombo');
+    var _optarray = presetField.options;
+    var _showTagInfoSuggestions = uifield.type !== 'manyCombo' && presetField.autoSuggestions !== false;
+    var _allowCustomValues = uifield.type !== 'manyCombo' && presetField.customValues !== false;
+    var _snake_case = (presetField.snake_case || (presetField.snake_case === undefined));
+    var _combobox = uiCombobox(context, 'combo-' + uifield.safeid)
+        .caseSensitive(presetField.caseSensitive)
         .minItems(_isMulti || _isSemi ? 1 : 2);
     var _container = d3_select(null);
     var _inputWrap = d3_select(null);
@@ -45,14 +44,15 @@ export function uiFieldCombo(field, context) {
 
     // initialize deprecated tags array
     var _dataDeprecated = [];
-    fileFetcher.get('deprecated')
-        .then(function(d) { _dataDeprecated = d; })
-        .catch(e => console.error(e));  // eslint-disable-line
+    const dataLoaderSystem = context.dataLoaderSystem();
+    dataLoaderSystem.get('deprecated')
+      .then(function(d) { _dataDeprecated = d; })
+      .catch(e => console.error(e));  // eslint-disable-line
 
 
     // ensure multiCombo field.key ends with a ':'
-    if (_isMulti && field.key && /[^:]$/.test(field.key)) {
-        field.key += ':';
+    if (_isMulti && uifield.key && /[^:]$/.test(uifield.key)) {
+        uifield.key += ':';
     }
 
 
@@ -61,9 +61,7 @@ export function uiFieldCombo(field, context) {
     }
 
     function clean(s) {
-        return s.split(';')
-            .map(function(s) { return s.trim(); })
-            .join(';');
+        return s.split(';').map(s => s.trim()).join(';');
     }
 
 
@@ -77,7 +75,7 @@ export function uiFieldCombo(field, context) {
         });
         if (found) return found.key;
 
-        if (field.type === 'typeCombo' && !dval) {
+        if (uifield.type === 'typeCombo' && !dval) {
             return 'yes';
         }
 
@@ -90,11 +88,11 @@ export function uiFieldCombo(field, context) {
     function displayValue(tval) {
         tval = tval || '';
 
-        if (field.hasTextForStringId('options.' + tval)) {
-            return field.t('options.' + tval, { default: tval });
+        if (uifield.hasTextForStringID('options.' + tval)) {
+            return uifield.t(`options.${tval}`, { default: tval });
         }
 
-        if (field.type === 'typeCombo' && tval.toLowerCase() === 'yes') {
+        if (uifield.type === 'typeCombo' && tval.toLowerCase() === 'yes') {
             return '';
         }
 
@@ -121,13 +119,13 @@ export function uiFieldCombo(field, context) {
             selection.attr('readonly', 'readonly');
         }
 
-        if (_showTagInfoSuggestions && services.taginfo) {
-            selection.call(_combobox.fetcher(setTaginfoValues), attachTo);
-            setTaginfoValues('', setPlaceholder);
-
+        const taginfo = context.services.get('taginfo');
+        if (taginfo && _showTagInfoSuggestions) {
+          selection.call(_combobox.fetcher(setTaginfoValues), attachTo);
+          setTaginfoValues('', setPlaceholder);
         } else {
-            selection.call(_combobox, attachTo);
-            setStaticValues(setPlaceholder);
+          selection.call(_combobox, attachTo);
+          setStaticValues(setPlaceholder);
         }
     }
 
@@ -138,10 +136,10 @@ export function uiFieldCombo(field, context) {
         _comboData = _optarray.map(function(v) {
             return {
                 key: v,
-                value: field.t('options.' + v, { default: v }),
+                value: uifield.t(`options.${v}`, { default: v }),
                 title: v,
-                display: field.t.html('options.' + v, { default: v }),
-                klass: field.hasTextForStringId('options.' + v) ? '' : 'raw-option'
+                display: uifield.tHtml(`options.${v}`, { default: v }),
+                klass: uifield.hasTextForStringID(`options.${v}`) ? '' : 'raw-option'
             };
         });
 
@@ -151,8 +149,15 @@ export function uiFieldCombo(field, context) {
 
 
     function setTaginfoValues(q, callback) {
-        var fn = _isMulti ? 'multikeys' : 'values';
-        var query = (_isMulti ? field.key : '') + q;
+        const taginfo = context.services.get('taginfo');
+        if (!taginfo) {
+          _comboData = [];
+          if (callback) callback(_comboData);
+          return;
+        }
+
+        var fn = _isMulti ? taginfo.multikeys : taginfo.values;
+        var query = (_isMulti ? uifield.key : '') + q;
         var hasCountryPrefix = _isNetwork && _countryCode && _countryCode.indexOf(q.toLowerCase()) === 0;
         if (hasCountryPrefix) {
             query = _countryCode + ':';
@@ -160,7 +165,7 @@ export function uiFieldCombo(field, context) {
 
         var params = {
             debounce: (q !== ''),
-            key: field.key,
+            key: uifield.key,
             query: query
         };
 
@@ -168,12 +173,11 @@ export function uiFieldCombo(field, context) {
             params.geometry = context.graph().geometry(_entityIDs[0]);
         }
 
-        services.taginfo[fn](params, function(err, data) {
+        fn(params, function(err, data) {
             if (err) return;
 
             data = data.filter(function(d) {
-
-                if (field.type === 'typeCombo' && d.value === 'yes') {
+                if (uifield.type === 'typeCombo' && d.value === 'yes') {
                     // don't show the fallback value
                     return false;
                 }
@@ -182,7 +186,7 @@ export function uiFieldCombo(field, context) {
                 return !d.count || d.count > 10;
             });
 
-            var deprecatedValues = osmEntity.deprecatedTagValuesByKey(_dataDeprecated)[field.key];
+            var deprecatedValues = osmEntity.deprecatedTagValuesByKey(_dataDeprecated)[uifield.key];
             if (deprecatedValues) {
                 // don't suggest deprecated tag values
                 data = data.filter(function(d) {
@@ -201,14 +205,14 @@ export function uiFieldCombo(field, context) {
 
             _comboData = data.map(function(d) {
                 var k = d.value;
-                if (_isMulti) k = k.replace(field.key, '');
-                var label = field.t('options.' + k, { default: k });
+                if (_isMulti) k = k.replace(uifield.key, '');
+                var label = uifield.t(`options.${k}`, { default: k });
                 return {
                     key: k,
                     value: label,
-                    display: field.t.html('options.' + k, { default: k }),
+                    display: uifield.tHtml(`options.${k}`, { default: k }),
                     title: d.title || label,
-                    klass: field.hasTextForStringId('options.' + k) ? '' : 'raw-option'
+                    klass: uifield.hasTextForStringID(`options.${k}`) ? '' : 'raw-option'
                 };
             });
 
@@ -219,16 +223,15 @@ export function uiFieldCombo(field, context) {
 
 
     function setPlaceholder(values) {
-
         if (_isMulti || _isSemi) {
-            _staticPlaceholder = field.placeholder() || t('inspector.add');
+            _staticPlaceholder = uifield.placeholder || context.t('inspector.add');
         } else {
             var vals = values
                 .map(function(d) { return d.value; })
                 .filter(function(s) { return s.length < 20; });
 
             var placeholders = vals.length > 1 ? vals : values.map(function(d) { return d.key; });
-            _staticPlaceholder = field.placeholder() || placeholders.slice(0, 3).join(', ');
+            _staticPlaceholder = uifield.placeholder || placeholders.slice(0, 3).join(', ');
         }
 
         if (!/(…|\.\.\.)$/.test(_staticPlaceholder)) {
@@ -236,8 +239,8 @@ export function uiFieldCombo(field, context) {
         }
 
         var ph;
-        if (!_isMulti && !_isSemi && _tags && Array.isArray(_tags[field.key])) {
-            ph = t('inspector.multiple_values');
+        if (!_isMulti && !_isSemi && _tags && Array.isArray(_tags[uifield.key])) {
+            ph = context.t('inspector.multiple_values');
         } else {
             ph =  _staticPlaceholder;
         }
@@ -261,7 +264,7 @@ export function uiFieldCombo(field, context) {
 
             if (_isMulti) {
                 utilArrayUniq(vals).forEach(function(v) {
-                    var key = (field.key || '') + v;
+                    var key = (uifield.key || '') + v;
                     if (_tags) {
                         // don't set a multicombo value to 'yes' if it already has a non-'no' value
                         // e.g. `language:de=main`
@@ -269,14 +272,14 @@ export function uiFieldCombo(field, context) {
                         if (typeof old === 'string' && old.toLowerCase() !== 'no') return;
                     }
                     key = context.cleanTagKey(key);
-                    field.keys.push(key);
+                    uifield.keys.push(key);
                     t[key] = 'yes';
                 });
 
             } else if (_isSemi) {
                 var arr = _multiData.map(function(d) { return d.key; });
                 arr = arr.concat(vals);
-                t[field.key] = context.cleanTagValue(utilArrayUniq(arr).filter(Boolean).join(';'));
+                t[uifield.key] = context.cleanTagValue(utilArrayUniq(arr).filter(Boolean).join(';'));
             }
 
             window.setTimeout(function() { _input.node().focus(); }, 10);
@@ -285,10 +288,10 @@ export function uiFieldCombo(field, context) {
             var rawValue = utilGetSetValue(_input);
 
             // don't override multiple values with blank string
-            if (!rawValue && Array.isArray(_tags[field.key])) return;
+            if (!rawValue && Array.isArray(_tags[uifield.key])) return;
 
             val = context.cleanTagValue(tagValue(rawValue));
-            t[field.key] = val || undefined;
+            t[uifield.key] = val || undefined;
         }
 
         dispatch.call('change', this, t);
@@ -308,9 +311,11 @@ export function uiFieldCombo(field, context) {
         d3_event.preventDefault();
         d3_event.stopPropagation();
 
+        const key = uifield.key;
+
         // don't move source=digitalglobe or source=maxar on ML road
         // TODO: switch to check on __fbid__
-        if (field.key === 'source' && _entityIDs[0] && isFbRoadId(_entityIDs[0]) && (d.value === 'digitalglobe' || d.value === 'maxar')) return;
+        if (key === 'source' && _entityIDs[0] && isFbRoadId(_entityIDs[0]) && (d.value === 'digitalglobe' || d.value === 'maxar')) return;
         var t = {};
         if (_isMulti) {
             t[d.key] = undefined;
@@ -320,7 +325,7 @@ export function uiFieldCombo(field, context) {
             }).filter(Boolean);
 
             arr = utilArrayUniq(arr);
-            t[field.key] = arr.length ? arr.join(';') : undefined;
+            t[key] = arr.length ? arr.join(';') : undefined;
         }
         dispatch.call('change', this, t);
     }
@@ -344,7 +349,7 @@ export function uiFieldCombo(field, context) {
 
             // Use a separate line for each value in the Destinations and Via fields
             // to mimic highway exit signs
-            if (field.key === 'destination' || field.key === 'via') {
+            if (uifield.key === 'destination' || uifield.key === 'via') {
                 listClass += ' full-line-chips';
             }
 
@@ -375,13 +380,13 @@ export function uiFieldCombo(field, context) {
         _input = _input.enter()
             .append('input')
             .attr('type', 'text')
-            .attr('id', field.domId)
+            .attr('id', uifield.uid)
             .call(utilNoAuto)
             .call(initCombo, selection)
             .merge(_input);
 
         if (_isNetwork) {
-            var extent = combinedEntityExtent();
+            var extent = uifield.entityExtent;
             var countryCode = extent && countryCoder.iso1A2Code(extent.center());
             _countryCode = countryCode && countryCode.toLowerCase();
         }
@@ -415,6 +420,8 @@ export function uiFieldCombo(field, context) {
 
     combo.tags = function(tags) {
         _tags = tags;
+        let key = uifield.key;
+        let keys = uifield.keys;
 
         if (_isMulti || _isSemi) {
             _multiData = [];
@@ -424,13 +431,13 @@ export function uiFieldCombo(field, context) {
             if (_isMulti) {
                 // Build _multiData array containing keys already set..
                 for (var k in tags) {
-                    if (field.key && k.indexOf(field.key) !== 0) continue;
-                    if (!field.key && field.keys.indexOf(k) === -1) continue;
+                    if (key && k.indexOf(key) !== 0) continue;
+                    if (!key && keys.indexOf(k) === -1) continue;
 
                     var v = tags[k];
                     if (!v || (typeof v === 'string' && v.toLowerCase() === 'no')) continue;
 
-                    var suffix = field.key ? k.slice(field.key.length) : k;
+                    var suffix = key ? k.slice(key.length) : k;
                     _multiData.push({
                         key: k,
                         value: displayValue(suffix),
@@ -438,23 +445,23 @@ export function uiFieldCombo(field, context) {
                     });
                 }
 
-                if (field.key) {
+                if (key) {
                     // Set keys for form-field modified (needed for undo and reset buttons)..
-                    field.keys = _multiData.map(function(d) { return d.key; });
+                    keys = _multiData.map(function(d) { return d.key; });
 
                     // limit the input length so it fits after prepending the key prefix
-                    maxLength = context.maxCharsForTagKey() - utilUnicodeCharsCount(field.key);
+                    maxLength = context.maxCharsForTagKey - utilUnicodeCharsCount(key);
                 } else {
-                    maxLength = context.maxCharsForTagKey();
+                    maxLength = context.maxCharsForTagKey;
                 }
 
             } else if (_isSemi) {
 
                 var allValues = [];
                 var commonValues;
-                if (Array.isArray(tags[field.key])) {
+                if (Array.isArray(tags[key])) {
 
-                    tags[field.key].forEach(function(tagVal) {
+                    tags[key].forEach(function(tagVal) {
                         var thisVals = utilArrayUniq((tagVal || '').split(';')).filter(Boolean);
                         allValues = allValues.concat(thisVals);
                         if (!commonValues) {
@@ -466,7 +473,7 @@ export function uiFieldCombo(field, context) {
                     allValues = utilArrayUniq(allValues).filter(Boolean);
 
                 } else {
-                    allValues =  utilArrayUniq((tags[field.key] || '').split(';')).filter(Boolean);
+                    allValues =  utilArrayUniq((tags[key] || '').split(';')).filter(Boolean);
                     commonValues = allValues;
                 }
 
@@ -481,7 +488,7 @@ export function uiFieldCombo(field, context) {
                 var currLength = utilUnicodeCharsCount(commonValues.join(';'));
 
                 // limit the input length to the remaining available characters
-                maxLength = context.maxCharsForTagValue() - currLength;
+                maxLength = context.maxCharsForTagValue - currLength;
 
                 if (currLength > 0) {
                     // account for the separator if a new value will be appended to existing
@@ -492,7 +499,7 @@ export function uiFieldCombo(field, context) {
             maxLength = Math.max(0, maxLength);
 
             var allowDragAndDrop = _isSemi // only semiCombo values are ordered
-                && !Array.isArray(tags[field.key]);
+                && !Array.isArray(tags[key]);
 
             // Exclude existing multikeys from combo options..
             var available = objectDifference(_comboData, _multiData);
@@ -524,15 +531,15 @@ export function uiFieldCombo(field, context) {
                 .order()
                 .classed('raw-value', function(d) {
                     var k = d.key;
-                    if (_isMulti) k = k.replace(field.key, '');
-                    return !field.hasTextForStringId('options.' + k);
+                    if (_isMulti) k = k.replace(key, '');
+                    return !uifield.hasTextForStringID('options.' + k);
                 })
                 .classed('draggable', allowDragAndDrop)
                 .classed('mixed', function(d) {
                     return d.isMixed;
                 })
                 .attr('title', function(d) {
-                    return d.isMixed ? t('inspector.unshared_value_tooltip') : null;
+                    return d.isMixed ? context.t('inspector.unshared_value_tooltip') : null;
                 });
 
             if (allowDragAndDrop) {
@@ -549,27 +556,27 @@ export function uiFieldCombo(field, context) {
                 .text(function(d) {
                     // don't show 'x' on the digitalglobe/maxar label on ML road
                     // TODO: switch to check on __fbid__
-                    return _entityIDs[0] && isFbRoadId(_entityIDs[0]) && field.key === 'source' && (d.value === 'digitalglobe' || d.value === 'maxar') ? '' : '×';
+                    return _entityIDs[0] && isFbRoadId(_entityIDs[0]) && key === 'source' && (d.value === 'digitalglobe' || d.value === 'maxar') ? '' : '×';
                 });
 
         } else {
-            var isMixed = Array.isArray(tags[field.key]);
+            var isMixed = Array.isArray(tags[key]);
 
-            var mixedValues = isMixed && tags[field.key].map(function(val) {
+            var mixedValues = isMixed && tags[key].map(function(val) {
                 return displayValue(val);
             }).filter(Boolean);
 
-            var showsValue = !isMixed && tags[field.key] && !(field.type === 'typeCombo' && tags[field.key] === 'yes');
-            var isRawValue = showsValue && !field.hasTextForStringId('options.' + tags[field.key]);
+            var showsValue = !isMixed && tags[key] && !(uifield.type === 'typeCombo' && tags[key] === 'yes');
+            var isRawValue = showsValue && !uifield.hasTextForStringID('options.' + tags[key]);
             var isKnownValue = showsValue && !isRawValue;
             var isReadOnly = !_allowCustomValues || isKnownValue;
 
-            utilGetSetValue(_input, !isMixed ? displayValue(tags[field.key]) : '')
+            utilGetSetValue(_input, !isMixed ? displayValue(tags[key]) : '')
                 .classed('raw-value', isRawValue)
                 .classed('known-value', isKnownValue)
                 .attr('readonly', isReadOnly ? 'readonly' : undefined)
                 .attr('title', isMixed ? mixedValues.join('\n') : undefined)
-                .attr('placeholder', isMixed ? t('inspector.multiple_values') : _staticPlaceholder || '')
+                .attr('placeholder', isMixed ? context.t('inspector.multiple_values') : _staticPlaceholder || '')
                 .classed('mixed', isMixed)
                 .on('keydown.deleteCapture', function(d3_event) {
                     if (isReadOnly &&
@@ -581,15 +588,16 @@ export function uiFieldCombo(field, context) {
                         d3_event.stopPropagation();
 
                         var t = {};
-                        t[field.key] = undefined;
+                        t[key] = undefined;
                         dispatch.call('change', this, t);
                     }
                 });
         }
     };
 
-    function registerDragAndDrop(selection) {
 
+    function registerDragAndDrop(selection) {
+        let key = uifield.key;
         // allow drag and drop re-ordering of chips
         var dragOrigin, targetIndex;
         selection.call(d3_drag()
@@ -617,7 +625,7 @@ export function uiFieldCombo(field, context) {
                 var targetIndexOffsetTop = null;
                 var draggedTagWidth = d3_select(this).node().offsetWidth;
 
-                if (field.key === 'destination' || field.key === 'via') { // meaning tags are full width
+                if (key === 'destination' || key === 'via') { // meaning tags are full width
                     _container.selectAll('.chip')
                         .style('transform', function(d2, index2) {
                             var node = d3_select(this).node();
@@ -695,11 +703,11 @@ export function uiFieldCombo(field, context) {
                     var t = {};
 
                     if (_multiData.length) {
-                        t[field.key] = _multiData.map(function(element) {
+                        t[key] = _multiData.map(function(element) {
                             return element.key;
                         }).join(';');
                     } else {
-                        t[field.key] = undefined;
+                        t[key] = undefined;
                     }
 
                     dispatch.call('change', this, t);
@@ -723,10 +731,5 @@ export function uiFieldCombo(field, context) {
     };
 
 
-    function combinedEntityExtent() {
-        return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
-    }
-
-
     return utilRebind(combo, dispatch, 'on');
 }
diff --git a/modules/ui/fields/cycleway.js b/modules/ui/fields/cycleway.js
index 5976dbea96..fe3389fb88 100644
--- a/modules/ui/fields/cycleway.js
+++ b/modules/ui/fields/cycleway.js
@@ -3,10 +3,9 @@ import { select as d3_select } from 'd3-selection';
 
 import { uiCombobox } from '../combobox';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
-import { t } from '../../core/localizer';
 
 
-export function uiFieldCycleway(field, context) {
+export function uiFieldCycleway(context, uifield) {
     var dispatch = d3_dispatch('change');
     var items = d3_select(null);
     var wrap = d3_select(null);
@@ -24,7 +23,7 @@ export function uiFieldCycleway(field, context) {
 
         wrap = wrap.enter()
             .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
+            .attr('class', 'form-field-input-wrap form-field-input-' + uifield.type)
             .merge(wrap);
 
 
@@ -49,7 +48,7 @@ export function uiFieldCycleway(field, context) {
             .append('span')
             .attr('class', 'label preset-label-cycleway')
             .attr('for', function(d) { return 'preset-input-cycleway-' + stripcolon(d); })
-            .html(function(d) { return field.t.html('types.' + d); });
+            .html(function(d) { return uifield.tHtml('types.' + d); });
 
         enter
             .append('div')
@@ -75,7 +74,6 @@ export function uiFieldCycleway(field, context) {
 
 
     function change(d3_event, key) {
-
         var newValue = context.cleanTagValue(utilGetSetValue(d3_select(this)));
 
         // don't override multiple values with blank string
@@ -115,9 +113,9 @@ export function uiFieldCycleway(field, context) {
 
 
     cycleway.options = function() {
-        return field.options.map(function(option) {
+        return uifield.presetField.options.map(function(option) {
             return {
-                title: field.t('options.' + option + '.description'),
+                title: uifield.t(`options.${option}.description`),
                 value: option
             };
         });
@@ -149,9 +147,9 @@ export function uiFieldCycleway(field, context) {
             })
             .attr('placeholder', function(d) {
                 if (Array.isArray(tags.cycleway) || Array.isArray(tags[d])) {
-                    return t('inspector.multiple_values');
+                    return context.t('inspector.multiple_values');
                 }
-                return field.placeholder();
+                return uifield.placeholder;
             })
             .classed('mixed', function(d) {
                 return Array.isArray(tags.cycleway) || Array.isArray(tags[d]);
diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js
index 547c4f5e21..bc4853830d 100644
--- a/modules/ui/fields/input.js
+++ b/modules/ui/fields/input.js
@@ -2,266 +2,262 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 import * as countryCoder from '@rapideditor/country-coder';
 
-import { presetManager } from '../../presets';
-import { fileFetcher } from '../../core/file_fetcher';
-import { t, localizer } from '../../core/localizer';
-import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util';
+import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 import { uiIcon } from '../icon';
 
 export {
-    uiFieldText as uiFieldUrl,
-    uiFieldText as uiFieldIdentifier,
-    uiFieldText as uiFieldNumber,
-    uiFieldText as uiFieldTel,
-    uiFieldText as uiFieldEmail
+  uiFieldText as uiFieldUrl,
+  uiFieldText as uiFieldIdentifier,
+  uiFieldText as uiFieldNumber,
+  uiFieldText as uiFieldTel,
+  uiFieldText as uiFieldEmail
 };
 
 
-export function uiFieldText(field, context) {
-    var dispatch = d3_dispatch('change');
-    var input = d3_select(null);
-    var outlinkButton = d3_select(null);
-    var _entityIDs = [];
-    var _tags;
-    var _phoneFormats = {};
-
-    if (field.type === 'tel') {
-        fileFetcher.get('phone_formats')
-          .then(function(d) {
-            _phoneFormats = d;
-            updatePhonePlaceholder();
-          })
-          .catch(e => console.error(e));  // eslint-disable-line
+export function uiFieldText(context, uifield) {
+  const l10n = context.localizationSystem();
+  const dispatch = d3_dispatch('change');
+
+  let input = d3_select(null);
+  let outlinkButton = d3_select(null);
+  let _entityIDs = [];
+  let _tags;
+  let _phoneFormats = {};
+
+  if (uifield.type === 'tel') {
+    const dataLoaderSystem = context.dataLoaderSystem();
+    dataLoaderSystem.get('phone_formats')
+      .then(d => {
+        _phoneFormats = d;
+        updatePhonePlaceholder();
+      })
+      .catch(e => console.error(e));  // eslint-disable-line
+  }
+
+
+  function calcLocked() {
+    // Protect certain fields that have a companion `*:wikidata` value
+    const lockable = ['brand', 'network', 'operator', 'flag'];
+    const isLocked = lockable.includes(uifield.id) && _entityIDs.length && _entityIDs.some(entityID => {
+      const entity = context.graph().hasEntity(entityID);
+      if (!entity) return false;
+
+      // Features linked to Wikidata are likely important and should be protected
+      if (entity.tags.wikidata) return true;
+
+      const preset = context.presetSystem().match(entity, context.graph());
+      const isSuggestion = preset?.suggestion;
+
+      // Lock the field if there is a value and a companion `*:wikidata` value
+      const which = uifield.id;   // 'brand', 'network', 'operator', 'flag'
+      return isSuggestion && !!entity.tags[which] && !!entity.tags[which + ':wikidata'];
+    });
+
+    uifield.locked(isLocked);
+  }
+
+
+  function i(selection) {
+    const presetField = uifield.presetField;
+
+    calcLocked();
+    let isLocked = uifield.locked();
+
+    let wrap = selection.selectAll('.form-field-input-wrap')
+      .data([0]);
+
+    wrap = wrap.enter()
+      .append('div')
+      .attr('class', `form-field-input-wrap form-field-input-${uifield.type}`)
+      .merge(wrap);
+
+    input = wrap.selectAll('input')
+      .data([0]);
+
+    input = input.enter()
+      .append('input')
+      .attr('type', uifield.type === 'identifier' || uifield.type === 'roadheight' ? 'text' : uifield.type)
+      .attr('id', uifield.uid)
+      .classed(uifield.type, true)
+      .call(utilNoAuto)
+      .merge(input);
+
+    input
+      .classed('disabled', !!isLocked)
+      .attr('readonly', isLocked || null)
+      .on('input', change(true))
+      .on('blur', change())
+      .on('change', change());
+
+
+    if (uifield.type === 'tel') {
+      updatePhonePlaceholder();
+
+    } else if (uifield.type === 'number') {
+      input.attr('type', 'text');
+
+      const inc = presetField.increment ?? 1;
+      let buttons = wrap.selectAll('.increment, .decrement')
+        .data(l10n.isRTL() ? [inc, -inc] : [-inc, inc]);
+
+      buttons.enter()
+        .append('button')
+        .attr('class', function(d) {
+          const which = (d > 0) ? 'increment' : 'decrement';
+          return `form-field-button ${which}`;
+        })
+        .merge(buttons)
+        .on('click', function(d3_event, d) {
+          d3_event.preventDefault();
+          const raw_vals = input.node().value || '0';
+          let vals = raw_vals.split(';');
+          vals = vals.map(v => {
+            const num = parseFloat(v.trim(), 10);
+            return isFinite(num) ? clamped(num + d) : v.trim();
+          });
+          input.node().value = vals.join(';');
+          change()();
+        });
+
+    } else if (uifield.type === 'identifier' && presetField.urlFormat && presetField.pattern) {
+      input.attr('type', 'text');
+
+      outlinkButton = wrap.selectAll('.foreign-id-permalink')
+        .data([0]);
+
+      outlinkButton.enter()
+        .append('button')
+        .call(uiIcon('#rapid-icon-out-link'))
+        .attr('class', 'form-field-button foreign-id-permalink')
+        .attr('title', function() {
+          const domainResults = /^https?:\/\/(.{1,}?)\//.exec(presetField.urlFormat);
+          if (domainResults.length >= 2 && domainResults[1]) {
+            const domain = domainResults[1];
+            return l10n.t('icons.view_on', { domain: domain });
+          }
+          return '';
+        })
+        .on('click', function(d3_event) {
+          d3_event.preventDefault();
+          const value = validIdentifierValueForLink();
+          if (value) {
+            const url = presetField.urlFormat.replace(/{value}/, encodeURIComponent(value));
+            window.open(url, '_blank');
+          }
+        })
+        .merge(outlinkButton);
+
+    } else if (uifield.type === 'url') {
+      input.attr('type', 'text');
+
+      outlinkButton = wrap.selectAll('.foreign-id-permalink')
+        .data([0]);
+
+      outlinkButton.enter()
+        .append('button')
+        .call(uiIcon('#rapid-icon-out-link'))
+        .attr('class', 'form-field-button foreign-id-permalink')
+        .attr('title', () => l10n.t('icons.visit_website'))
+        .on('click', function(d3_event) {
+          d3_event.preventDefault();
+          const value = validIdentifierValueForLink();
+          if (value) window.open(value, '_blank');
+        })
+        .merge(outlinkButton);
     }
+  }
 
 
-    function calcLocked() {
-        // Protect certain fields that have a companion `*:wikidata` value
-        var isLocked = (field.id === 'brand' || field.id === 'network' || field.id === 'operator' || field.id === 'flag') &&
-            _entityIDs.length &&
-            _entityIDs.some(function(entityID) {
-                var entity = context.graph().hasEntity(entityID);
-                if (!entity) return false;
+  function updatePhonePlaceholder() {
+    if (input.empty() || !Object.keys(_phoneFormats).length) return;
 
-                // Features linked to Wikidata are likely important and should be protected
-                if (entity.tags.wikidata) return true;
+    const extent = uifield.entityExtent;
+    const countryCode = extent && countryCoder.iso1A2Code(extent.center());
+    const format = countryCode && _phoneFormats[countryCode.toLowerCase()];
+    if (format) input.attr('placeholder', format);
+  }
 
-                var preset = presetManager.match(entity, context.graph());
-                var isSuggestion = preset && preset.suggestion;
 
-                // Lock the field if there is a value and a companion `*:wikidata` value
-                var which = field.id;   // 'brand', 'network', 'operator', 'flag'
-                return isSuggestion && !!entity.tags[which] && !!entity.tags[which + ':wikidata'];
-            });
+  function validIdentifierValueForLink() {
+    const pattern = uifield.presetField.pattern;
+    const value = utilGetSetValue(input).trim().split(';')[0];
 
-        field.locked(isLocked);
+    if (uifield.type === 'url' && value) return value;
+    if (uifield.type === 'identifier' && pattern) {
+      return value && value.match(new RegExp(pattern));
     }
+    return null;
+  }
 
 
-    function i(selection) {
-        calcLocked();
-        var isLocked = field.locked();
-
-        var wrap = selection.selectAll('.form-field-input-wrap')
-            .data([0]);
-
-        wrap = wrap.enter()
-            .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
-            .merge(wrap);
-
-        input = wrap.selectAll('input')
-            .data([0]);
-
-        input = input.enter()
-            .append('input')
-            .attr('type', field.type === 'identifier' || field.type === 'roadheight' ? 'text' : field.type)
-            .attr('id', field.domId)
-            .classed(field.type, true)
-            .call(utilNoAuto)
-            .merge(input);
-
-        input
-            .classed('disabled', !!isLocked)
-            .attr('readonly', isLocked || null)
-            .on('input', change(true))
-            .on('blur', change())
-            .on('change', change());
-
-
-        if (field.type === 'tel') {
-            updatePhonePlaceholder();
-
-        } else if (field.type === 'number') {
-            var rtl = (localizer.textDirection() === 'rtl');
-
-            input.attr('type', 'text');
-
-            var inc = field.increment;
-
-            var buttons = wrap.selectAll('.increment, .decrement')
-                .data(rtl ? [inc, -inc] : [-inc, inc]);
-
-            buttons.enter()
-                .append('button')
-                .attr('class', function(d) {
-                    var which = (d > 0 ? 'increment' : 'decrement');
-                    return 'form-field-button ' + which;
-                })
-                .merge(buttons)
-                .on('click', function(d3_event, d) {
-                    d3_event.preventDefault();
-                    var raw_vals = input.node().value || '0';
-                    var vals = raw_vals.split(';');
-                    vals = vals.map(function(v) {
-                        var num = parseFloat(v.trim(), 10);
-                        return isFinite(num) ? clamped(num + d) : v.trim();
-                    });
-                    input.node().value = vals.join(';');
-                    change()();
-                });
-        } else if (field.type === 'identifier' && field.urlFormat && field.pattern) {
-
-            input.attr('type', 'text');
-
-            outlinkButton = wrap.selectAll('.foreign-id-permalink')
-                .data([0]);
-
-            outlinkButton.enter()
-                .append('button')
-                .call(uiIcon('#rapid-icon-out-link'))
-                .attr('class', 'form-field-button foreign-id-permalink')
-                .attr('title', function() {
-                    var domainResults = /^https?:\/\/(.{1,}?)\//.exec(field.urlFormat);
-                    if (domainResults.length >= 2 && domainResults[1]) {
-                        var domain = domainResults[1];
-                        return t('icons.view_on', { domain: domain });
-                    }
-                    return '';
-                })
-                .on('click', function(d3_event) {
-                    d3_event.preventDefault();
-
-                    var value = validIdentifierValueForLink();
-                    if (value) {
-                        var url = field.urlFormat.replace(/{value}/, encodeURIComponent(value));
-                        window.open(url, '_blank');
-                    }
-                })
-                .merge(outlinkButton);
-        } else if (field.type === 'url') {
-            input.attr('type', 'text');
-
-            outlinkButton = wrap.selectAll('.foreign-id-permalink')
-                .data([0]);
-
-            outlinkButton.enter()
-                .append('button')
-                .call(uiIcon('#rapid-icon-out-link'))
-                .attr('class', 'form-field-button foreign-id-permalink')
-                .attr('title', () => t('icons.visit_website'))
-                .on('click', function(d3_event) {
-                    d3_event.preventDefault();
-
-                    const value = validIdentifierValueForLink();
-                    if (value) window.open(value, '_blank');
-                })
-                .merge(outlinkButton);
-        }
-    }
-
-
-    function updatePhonePlaceholder() {
-        if (input.empty() || !Object.keys(_phoneFormats).length) return;
-
-        var extent = combinedEntityExtent();
-        var countryCode = extent && countryCoder.iso1A2Code(extent.center());
-        var format = countryCode && _phoneFormats[countryCode.toLowerCase()];
-        if (format) input.attr('placeholder', format);
+  // clamp number to min/max
+  function clamped(num) {
+    const presetField = uifield.presetField;
+    if (presetField.minValue !== undefined) {
+      num = Math.max(num, presetField.minValue);
     }
-
-
-    function validIdentifierValueForLink() {
-        const value = utilGetSetValue(input).trim().split(';')[0];
-
-        if (field.type === 'url' && value) return value;
-        if (field.type === 'identifier' && field.pattern) {
-            return value && value.match(new RegExp(field.pattern));
-        }
-        return null;
+    if (presetField.maxValue !== undefined) {
+      num = Math.min(num, presetField.maxValue);
     }
-
-
-    // clamp number to min/max
-    function clamped(num) {
-        if (field.minValue !== undefined) {
-            num = Math.max(num, field.minValue);
-        }
-        if (field.maxValue !== undefined) {
-            num = Math.min(num, field.maxValue);
+    return num;
+  }
+
+
+  function change(onInput) {
+    return function() {
+      const key = uifield.key;
+      let tagChange = {};
+      let val = utilGetSetValue(input);
+      if (!onInput) val = context.cleanTagValue(val);
+
+      // don't override multiple values with blank string
+      if (!val && Array.isArray(_tags[key])) return;
+
+      if (!onInput) {
+        if (uifield.type === 'number' && val) {
+          let vals = val.split(';');
+          vals = vals.map(v => {
+            const num = parseFloat(v.trim(), 10);
+            return isFinite(num) ? clamped(num) : v.trim();
+          });
+          val = vals.join(';');
         }
-        return num;
-    }
-
-
-    function change(onInput) {
-        return function() {
-            var t = {};
-            var val = utilGetSetValue(input);
-            if (!onInput) val = context.cleanTagValue(val);
-
-            // don't override multiple values with blank string
-            if (!val && Array.isArray(_tags[field.key])) return;
-
-            if (!onInput) {
-                if (field.type === 'number' && val) {
-                    var vals = val.split(';');
-                    vals = vals.map(function(v) {
-                        var num = parseFloat(v.trim(), 10);
-                        return isFinite(num) ? clamped(num) : v.trim();
-                    });
-                    val = vals.join(';');
-                }
-                utilGetSetValue(input, val);
-            }
-            t[field.key] = val || undefined;
-            dispatch.call('change', this, t, onInput);
-        };
-    }
-
-
-    i.entityIDs = function(val) {
-        if (!arguments.length) return _entityIDs;
-        _entityIDs = val;
-        return i;
+        utilGetSetValue(input, val);
+      }
+      tagChange[key] = val || undefined;
+      dispatch.call('change', this, tagChange, onInput);
     };
+  }
 
 
-    i.tags = function(tags) {
-        _tags = tags;
+  i.entityIDs = function(val) {
+    if (!arguments.length) return _entityIDs;
+    _entityIDs = val;
+    return i;
+  };
 
-        var isMixed = Array.isArray(tags[field.key]);
 
-        utilGetSetValue(input, !isMixed && tags[field.key] ? tags[field.key] : '')
-            .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : undefined)
-            .attr('placeholder', isMixed ? t('inspector.multiple_values') : (field.placeholder() || t('inspector.unknown')))
-            .classed('mixed', isMixed);
+  i.tags = function(tags) {
+    _tags = tags;
+    const key = uifield.key;
+    const isMixed = Array.isArray(tags[key]);
 
-        if (outlinkButton && !outlinkButton.empty()) {
-            var disabled = !validIdentifierValueForLink();
-            outlinkButton.classed('disabled', disabled);
-        }
-    };
+    utilGetSetValue(input, !isMixed && tags[key] ? tags[key] : '')
+      .attr('title', isMixed ? tags[key].filter(Boolean).join('\n') : undefined)
+      .attr('placeholder', isMixed ? l10n.t('inspector.multiple_values') : (uifield.placeholder || l10n.t('inspector.unknown')))
+      .classed('mixed', isMixed);
 
+    if (outlinkButton && !outlinkButton.empty()) {
+      const disabled = !validIdentifierValueForLink();
+      outlinkButton.classed('disabled', disabled);
+    }
+  };
 
-    i.focus = function() {
-        var node = input.node();
-        if (node) node.focus();
-    };
 
-    function combinedEntityExtent() {
-        return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
-    }
+  i.focus = function() {
+    const node = input.node();
+    if (node) node.focus();
+  };
 
-    return utilRebind(i, dispatch, 'on');
+  return utilRebind(i, dispatch, 'on');
 }
diff --git a/modules/ui/fields/lanes.js b/modules/ui/fields/lanes.js
index d442678f96..1f23f5f340 100644
--- a/modules/ui/fields/lanes.js
+++ b/modules/ui/fields/lanes.js
@@ -4,7 +4,7 @@ import { utilRebind } from '../../util/rebind';
 import { utilGetDimensions } from '../../util/dimensions';
 
 
-export function uiFieldLanes(field, context) {
+export function uiFieldLanes(context, uifield) {
     var dispatch = d3_dispatch('change');
     var LANE_WIDTH = 40;
     var LANE_HEIGHT = 200;
@@ -23,7 +23,7 @@ export function uiFieldLanes(field, context) {
 
         wrap = wrap.enter()
             .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
+            .attr('class', 'form-field-input-wrap form-field-input-' + uifield.type)
             .merge(wrap);
 
         var surface =  wrap.selectAll('.surface')
diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js
index 0c4798d629..1cac5ca698 100644
--- a/modules/ui/fields/localized.js
+++ b/modules/ui/fields/localized.js
@@ -3,21 +3,20 @@ import { select as d3_select } from 'd3-selection';
 import { utilArrayUniq, utilUniqueString } from '@rapid-sdk/util';
 import * as countryCoder from '@rapideditor/country-coder';
 
-import { presetManager } from '../../presets';
-import { fileFetcher } from '../../core/file_fetcher';
-import { t, localizer } from '../../core/localizer';
-import { services } from '../../services';
 import { uiIcon } from '../icon';
 import { uiTooltip } from '../tooltip';
 import { uiCombobox } from '../combobox';
-import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util';
+import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 var _languagesArray = [];
 
 
-export function uiFieldLocalized(field, context) {
+export function uiFieldLocalized(context, uifield) {
+    const dataLoaderSystem = context.dataLoaderSystem();
+    const l10n = context.localizationSystem();
+
     var dispatch = d3_dispatch('change', 'input');
-    var wikipedia = services.wikipedia;
+    var wikipedia = context.services.get('wikipedia');
     var input = d3_select(null);
     var localizedInputs = d3_select(null);
     var _countryCode;
@@ -27,12 +26,13 @@ export function uiFieldLocalized(field, context) {
     // A concern here in switching to async data means that _languagesArray will not
     // be available the first time through, so things like the fetchers and
     // the language() function will not work immediately.
-    fileFetcher.get('languages')
+
+    dataLoaderSystem.get('languages')
         .then(loadLanguagesArray)
         .catch(e => console.error(e));  // eslint-disable-line
 
     var _territoryLanguages = {};
-    fileFetcher.get('territory_languages')
+    dataLoaderSystem.get('territory_languages')
         .then(function(d) { _territoryLanguages = d; })
         .catch(e => console.error(e));  // eslint-disable-line
 
@@ -43,8 +43,8 @@ export function uiFieldLocalized(field, context) {
 
     var _selection = d3_select(null);
     var _multilingual = [];
-    var _buttonTip = uiTooltip()
-        .title(t.html('translate.translate'))
+    var _buttonTip = uiTooltip(context)
+        .title(l10n.tHtml('translate.translate'))
         .placement('left');
     var _wikiTitles;
     var _entityIDs = [];
@@ -65,10 +65,10 @@ export function uiFieldLocalized(field, context) {
             if (replacements[code]) metaCode = replacements[code];
 
             _languagesArray.push({
-                localName: localizer.languageName(metaCode, { localOnly: true }),
+                localName: l10n.languageName(metaCode, { localOnly: true }),
                 nativeName: dataLanguages[metaCode].nativeName,
                 code: code,
-                label: localizer.languageName(metaCode)
+                label: l10n.languageName(metaCode)
             });
         }
     }
@@ -76,7 +76,7 @@ export function uiFieldLocalized(field, context) {
 
     function calcLocked() {
         // Protect name field for suggestion presets that don't display a brand/operator field
-        var isLocked = (field.id === 'name') &&
+        var isLocked = (uifield.id === 'name') &&
             _entityIDs.length &&
             _entityIDs.some(function(entityID) {
                 var entity = context.graph().hasEntity(entityID);
@@ -92,7 +92,7 @@ export function uiFieldLocalized(field, context) {
                 // and the preset does not display a `brand` or `operator` field.
                 // (For presets like hotels, car dealerships, post offices, the `name` should remain editable)
                 // see also similar logic in `outdated_tags.js`
-                var preset = presetManager.match(entity, context.graph());
+                var preset = context.presetSystem().match(entity, context.graph());
                 if (preset) {
                     var isSuggestion = preset.suggestion;
                     var fields = preset.fields();
@@ -111,7 +111,7 @@ export function uiFieldLocalized(field, context) {
                 return false;
             });
 
-        field.locked(isLocked);
+        uifield.locked(isLocked);
     }
 
 
@@ -128,7 +128,7 @@ export function uiFieldLocalized(field, context) {
             // not for languages, e.g. name:left, name:source, etc.
             // https://github.com/openstreetmap/iD/pull/9124
             var m = k.match(/^(.*):([a-z]{2,3}(?:-[A-Z][a-z]{3})?(?:-[A-Z]{2})?)$/);
-            if (m && m[1] === field.key && m[2]) {
+            if (m && m[1] === uifield.key && m[2]) {
                 var item = { lang: m[2], value: tags[k] };
                 if (existingLangs.has(item.lang)) {
                     // update the value
@@ -153,7 +153,7 @@ export function uiFieldLocalized(field, context) {
     function localized(selection) {
         _selection = selection;
         calcLocked();
-        var isLocked = field.locked();
+        var isLocked = uifield.locked();
 
         var wrap = selection.selectAll('.form-field-input-wrap')
             .data([0]);
@@ -161,7 +161,7 @@ export function uiFieldLocalized(field, context) {
         // enter/update
         wrap = wrap.enter()
             .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
+            .attr('class', 'form-field-input-wrap form-field-input-' + uifield.type)
             .merge(wrap);
 
         input = wrap.selectAll('.localized-main')
@@ -171,7 +171,7 @@ export function uiFieldLocalized(field, context) {
         input = input.enter()
             .append('input')
             .attr('type', 'text')
-            .attr('id', field.domId)
+            .attr('id', uifield.uid)
             .attr('class', 'localized-main')
             .call(utilNoAuto)
             .merge(input);
@@ -222,9 +222,9 @@ export function uiFieldLocalized(field, context) {
 
         function addNew(d3_event) {
             d3_event.preventDefault();
-            if (field.locked()) return;
+            if (uifield.locked()) return;
 
-            var defaultLang = localizer.languageCode().toLowerCase();
+            var defaultLang = l10n.languageCode().toLowerCase();
             var langExists = _multilingual.find(function(datum) { return datum.lang === defaultLang; });
             var isLangEn = defaultLang.indexOf('en') > -1;
             if (isLangEn || langExists) {
@@ -244,7 +244,7 @@ export function uiFieldLocalized(field, context) {
 
         function change(onInput) {
             return function(d3_event) {
-                if (field.locked()) {
+                if (uifield.locked()) {
                     d3_event.preventDefault();
                     return;
                 }
@@ -253,11 +253,11 @@ export function uiFieldLocalized(field, context) {
                 if (!onInput) val = context.cleanTagValue(val);
 
                 // don't override multiple values with blank string
-                if (!val && Array.isArray(_tags[field.key])) return;
+                if (!val && Array.isArray(_tags[uifield.key])) return;
 
                 var t = {};
 
-                t[field.key] = val || undefined;
+                t[uifield.key] = val || undefined;
                 dispatch.call('change', this, t, onInput);
             };
         }
@@ -265,7 +265,7 @@ export function uiFieldLocalized(field, context) {
 
 
     function key(lang) {
-        return field.key + ':' + lang;
+        return uifield.key + ':' + lang;
     }
 
 
@@ -319,7 +319,7 @@ export function uiFieldLocalized(field, context) {
         var v = value.toLowerCase();
 
         // show the user's language first
-        var langCodes = [localizer.localeCode(), localizer.languageCode()];
+        var langCodes = [l10n.localeCode(), l10n.languageCode()];
 
         if (_countryCode && _territoryLanguages[_countryCode]) {
             langCodes = langCodes.concat(_territoryLanguages[_countryCode]);
@@ -363,12 +363,12 @@ export function uiFieldLocalized(field, context) {
             .attr('class', 'entry')
             .each(function(_, index) {
                 var wrap = d3_select(this);
-                var domId = utilUniqueString(index);
+                var uid = utilUniqueString(index);
 
                 var label = wrap
                     .append('label')
                     .attr('class', 'field-label')
-                    .attr('for', domId);
+                    .attr('for', uid);
 
                 var text = label
                     .append('span')
@@ -377,7 +377,7 @@ export function uiFieldLocalized(field, context) {
                 text
                     .append('span')
                     .attr('class', 'label-textvalue')
-                    .html(t.html('translate.localized_translation_label'));
+                    .html(l10n.tHtml('translate.localized_translation_label'));
 
                 text
                     .append('span')
@@ -387,7 +387,7 @@ export function uiFieldLocalized(field, context) {
                     .append('button')
                     .attr('class', 'remove-icon-multilingual')
                     .on('click', function(d3_event, d) {
-                        if (field.locked()) return;
+                        if (uifield.locked()) return;
                         d3_event.preventDefault();
 
                         // remove the UI item manually
@@ -410,9 +410,9 @@ export function uiFieldLocalized(field, context) {
                 wrap
                     .append('input')
                     .attr('class', 'localized-lang')
-                    .attr('id', domId)
+                    .attr('id', uid)
                     .attr('type', 'text')
-                    .attr('placeholder', t('translate.localized_translation_language'))
+                    .attr('placeholder', l10n.t('translate.localized_translation_language'))
                     .on('blur', changeLang)
                     .on('change', changeLang)
                     .call(langCombo);
@@ -462,7 +462,7 @@ export function uiFieldLocalized(field, context) {
                 return Array.isArray(d.value) ? d.value.filter(Boolean).join('\n') : null;
             })
             .attr('placeholder', function(d) {
-                return Array.isArray(d.value) ? t('inspector.multiple_values') : t('translate.localized_translation_name');
+                return Array.isArray(d.value) ? l10n.t('inspector.multiple_values') : l10n.t('translate.localized_translation_name');
             })
             .classed('mixed', function(d) {
                 return Array.isArray(d.value);
@@ -485,11 +485,11 @@ export function uiFieldLocalized(field, context) {
             }
         }
 
-        var isMixed = Array.isArray(tags[field.key]);
+        var isMixed = Array.isArray(tags[uifield.key]);
 
-        utilGetSetValue(input, typeof tags[field.key] === 'string' ? tags[field.key] : '')
-            .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : undefined)
-            .attr('placeholder', isMixed ? t('inspector.multiple_values') : field.placeholder())
+        utilGetSetValue(input, typeof tags[uifield.key] === 'string' ? tags[uifield.key] : '')
+            .attr('title', isMixed ? tags[uifield.key].filter(Boolean).join('\n') : undefined)
+            .attr('placeholder', isMixed ? l10n.t('inspector.multiple_values') : uifield.placeholder)
             .classed('mixed', isMixed);
 
         calcMultilingual(tags);
@@ -513,14 +513,11 @@ export function uiFieldLocalized(field, context) {
     };
 
     function loadCountryCode() {
-        var extent = combinedEntityExtent();
+        var extent = uifield.entityExtent;
         var countryCode = extent && countryCoder.iso1A2Code(extent.center());
         _countryCode = countryCode && countryCode.toLowerCase();
     }
 
-    function combinedEntityExtent() {
-        return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
-    }
 
     return utilRebind(localized, dispatch, 'on');
 }
diff --git a/modules/ui/fields/radio.js b/modules/ui/fields/radio.js
index 6e09ac9631..6ba4f4010c 100644
--- a/modules/ui/fields/radio.js
+++ b/modules/ui/fields/radio.js
@@ -2,22 +2,19 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 import { utilArrayUnion } from '@rapid-sdk/util';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
-import { uiField } from '../field';
+import { UiField } from '../UiField';
 import { utilRebind } from '../../util';
 
-
 export { uiFieldRadio as uiFieldStructureRadio };
 
 
-export function uiFieldRadio(field, context) {
+export function uiFieldRadio(context, uifield) {
     var dispatch = d3_dispatch('change');
     var placeholder = d3_select(null);
     var wrap = d3_select(null);
     var labels = d3_select(null);
     var radios = d3_select(null);
-    var radioData = (field.options || field.keys).slice();  // shallow copy
+    var radioData = (uifield.presetField.options || uifield.keys).slice();  // shallow copy
     var typeField;
     var layerField;
     var _oldType = {};
@@ -59,13 +56,13 @@ export function uiFieldRadio(field, context) {
         enter
             .append('input')
             .attr('type', 'radio')
-            .attr('name', field.id)
-            .attr('value', function(d) { return field.t('options.' + d, { 'default': d }); })
+            .attr('name', uifield.id)
+            .attr('value', function(d) { return uifield.t(`options.${d}`, { 'default': d }); })
             .attr('checked', false);
 
         enter
             .append('span')
-            .html(function(d) { return field.t.html('options.' + d, { 'default': d }); });
+            .html(function(d) { return uifield.tHtml(`options.${d}`, { 'default': d }); });
 
         labels = labels
             .merge(enter);
@@ -78,11 +75,11 @@ export function uiFieldRadio(field, context) {
 
     function structureExtras(selection, tags) {
         var selected = selectedKey() || tags.layer !== undefined;
-        var type = presetManager.field(selected);
-        var layer = presetManager.field('layer');
+        var presetSystem = context.presetSystem();
+        var type = presetSystem.field(selected);
+        var layer = presetSystem.field('layer');
         var showLayer = (selected === 'bridge' || selected === 'tunnel' || tags.layer !== undefined);
 
-
         var extrasWrap = selection.selectAll('.structure-extras-wrap')
             .data(selected ? [0] : []);
 
@@ -106,8 +103,8 @@ export function uiFieldRadio(field, context) {
         // Type
         if (type) {
             if (!typeField || typeField.id !== selected) {
-                typeField = uiField(context, type, _entityIDs, { wrap: false })
-                    .on('change', changeType);
+                typeField = new UiField(context, type, _entityIDs, { wrap: false })
+                  .on('change', changeType);
             }
             typeField.tags(tags);
         } else {
@@ -130,7 +127,7 @@ export function uiFieldRadio(field, context) {
             .append('span')
             .attr('class', 'label structure-label-type')
             .attr('for', 'preset-input-' + selected)
-            .html(t.html('inspector.radio.structure.type'));
+            .html(context.tHtml('inspector.radio.structure.type'));
 
         typeEnter
             .append('div')
@@ -149,14 +146,14 @@ export function uiFieldRadio(field, context) {
         // Layer
         if (layer && showLayer) {
             if (!layerField) {
-                layerField = uiField(context, layer, _entityIDs, { wrap: false })
+                layerField = new UiField(context, layer, _entityIDs, { wrap: false })
                     .on('change', changeLayer);
             }
             layerField.tags(tags);
-            field.keys = utilArrayUnion(field.keys, ['layer']);
+            uifield.keys = utilArrayUnion(uifield.keys, ['layer']);
         } else {
             layerField = null;
-            field.keys = field.keys.filter(function(k) { return k !== 'layer'; });
+            uifield.keys = uifield.keys.filter(function(k) { return k !== 'layer'; });
         }
 
         var layerItem = list.selectAll('.structure-layer-item')
@@ -175,7 +172,7 @@ export function uiFieldRadio(field, context) {
             .append('span')
             .attr('class', 'label structure-label-layer')
             .attr('for', 'preset-input-layer')
-            .html(t.html('inspector.radio.structure.layer'));
+            .html(context.tHtml('inspector.radio.structure.layer'));
 
         layerEnter
             .append('div')
@@ -201,7 +198,7 @@ export function uiFieldRadio(field, context) {
             _oldType[key] = val;
         }
 
-        if (field.type === 'structureRadio') {
+        if (uifield.type === 'structureRadio') {
             // remove layer if it should not be set
             if (val === 'no' ||
                 (key !== 'bridge' && key !== 'tunnel') ||
@@ -235,23 +232,23 @@ export function uiFieldRadio(field, context) {
         var t = {};
         var activeKey;
 
-        if (field.key) {
-            t[field.key] = undefined;
+        if (uifield.key) {
+            t[uifield.key] = undefined;
         }
 
         radios.each(function(d) {
             var active = d3_select(this).property('checked');
             if (active) activeKey = d;
 
-            if (field.key) {
-                if (active) t[field.key] = d;
+            if (uifield.key) {
+                if (active) t[uifield.key] = d;
             } else {
                 var val = _oldType[activeKey] || 'yes';
                 t[d] = active ? val : undefined;
             }
         });
 
-        if (field.type === 'structureRadio') {
+        if (uifield.type === 'structureRadio') {
             if (activeKey === 'bridge') {
                 t.layer = '1';
             } else if (activeKey === 'tunnel' && t.tunnel !== 'building_passage') {
@@ -268,43 +265,43 @@ export function uiFieldRadio(field, context) {
     radio.tags = function(tags) {
 
         radios.property('checked', function(d) {
-            if (field.key) {
-                return tags[field.key] === d;
+            if (uifield.key) {
+                return tags[uifield.key] === d;
             }
             return !!(typeof tags[d] === 'string' && tags[d].toLowerCase() !== 'no');
         });
 
         function isMixed(d) {
-            if (field.key) {
-                return Array.isArray(tags[field.key]) && tags[field.key].includes(d);
+            if (uifield.key) {
+                return Array.isArray(tags[uifield.key]) && tags[uifield.key].includes(d);
             }
             return Array.isArray(tags[d]);
         }
 
         labels
             .classed('active', function(d) {
-                if (field.key) {
-                    return (Array.isArray(tags[field.key]) && tags[field.key].includes(d))
-                        || tags[field.key] === d;
+                if (uifield.key) {
+                    return (Array.isArray(tags[uifield.key]) && tags[uifield.key].includes(d))
+                        || tags[uifield.key] === d;
                 }
                 return Array.isArray(tags[d]) || !!(tags[d] && tags[d].toLowerCase() !== 'no');
             })
             .classed('mixed', isMixed)
             .attr('title', function(d) {
-                return isMixed(d) ? t('inspector.unshared_value_tooltip') : null;
+                return isMixed(d) ? context.t('inspector.unshared_value_tooltip') : null;
             });
 
 
         var selection = radios.filter(function() { return this.checked; });
 
         if (selection.empty()) {
-            placeholder.html(t.html('inspector.none'));
+            placeholder.html(context.tHtml('inspector.none'));
         } else {
             placeholder.html(selection.attr('value'));
             _oldType[selection.datum()] = tags[selection.datum()];
         }
 
-        if (field.type === 'structureRadio') {
+        if (uifield.type === 'structureRadio') {
             // For waterways without a tunnel tag, set 'culvert' as
             // the _oldType to default to if the user picks 'tunnel'
             if (!!tags.waterway && !_oldType.tunnel) {
diff --git a/modules/ui/fields/restrictions.js b/modules/ui/fields/restrictions.js
index d8ed78ac65..8a2282c648 100644
--- a/modules/ui/fields/restrictions.js
+++ b/modules/ui/fields/restrictions.js
@@ -3,23 +3,22 @@
 //import { Extent, Projection, geoZoomToScale, vecScale, vecSubtract } from '@rapid-sdk/math';
 //import { utilEntitySelector } from '@rapid-sdk/util';
 //
-//import { presetManager } from '../../presets';
-//import { prefs } from '../../core/preferences';
-//import { t, localizer } from '../../core/localizer';
 //import { actionRestrictTurn } from '../../actions/restrict_turn';
 //import { actionUnrestrictTurn } from '../../actions/unrestrict_turn';
 //import { osmIntersection, osmInferRestriction, osmTurn, osmWay } from '../../osm';
 //import { svgLayers, svgLines, svgTurns, svgVertices } from '../../svg';
-//import { utilDisplayName, utilDisplayType, utilFunctor, utilRebind } from '../../util';
+//import { utilFunctor, utilRebind } from '../../util';
 //import { utilGetDimensions, utilSetDimensions } from '../../util/dimensions';
 //
 //
-//export function uiFieldRestrictions(field, context) {
-//    var dispatch = d3_dispatch('change');
+//export function uiFieldRestrictions(context, uifield) {
+//    const dispatch = d3_dispatch('change');
+//    const l10n = context.localizationSystem();
+//    const prefs = context.storageSystem();
 //
-//    prefs('turn-restriction-via-way', null);                 // remove old key
-//    var storedViaWay = prefs('turn-restriction-via-way0');   // use new key #6922
-//    var storedDistance = prefs('turn-restriction-distance');
+//    prefs.removeItem('turn-restriction-via-way');                    // remove old key
+//    var storedViaWay = prefs.getItem('turn-restriction-via-way0');   // use new key #6922
+//    var storedDistance = prefs.getItem('turn-restriction-distance');
 //
 //    var _maxViaWay = storedViaWay !== null ? (+storedViaWay) : 0;
 //    var _maxDistance = storedDistance ? (+storedDistance) : 30;
@@ -75,7 +74,7 @@
 //
 //        wrap = wrap.enter()
 //            .append('div')
-//            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
+//            .attr('class', 'form-field-input-wrap form-field-input-' + uifield.type)
 //            .merge(wrap);
 //
 //        var container = wrap.selectAll('.restriction-container')
@@ -123,7 +122,7 @@
 //        distControlEnter
 //            .append('span')
 //            .attr('class', 'restriction-control-label restriction-distance-label')
-//            .html(t.html('restriction.controls.distance') + ':');
+//            .html(l10n.tHtml('restriction.controls.distance') + ':');
 //
 //        distControlEnter
 //            .append('input')
@@ -145,7 +144,7 @@
 //                _maxDistance = +val;
 //                _intersection = null;
 //                _container.selectAll('.layer-osm .layer-turns *').remove();
-//                prefs('turn-restriction-distance', _maxDistance);
+//                prefs.setItem('turn-restriction-distance', _maxDistance);
 //                _parent.call(restrictions);
 //            });
 //
@@ -166,7 +165,7 @@
 //        viaControlEnter
 //            .append('span')
 //            .attr('class', 'restriction-control-label restriction-via-way-label')
-//            .html(t.html('restriction.controls.via') + ':');
+//            .html(l10n.tHtml('restriction.controls.via') + ':');
 //
 //        viaControlEnter
 //            .append('input')
@@ -187,7 +186,7 @@
 //                var val = d3_select(this).property('value');
 //                _maxViaWay = +val;
 //                _container.selectAll('.layer-osm .layer-turns *').remove();
-//                prefs('turn-restriction-via-way0', _maxViaWay);
+//                prefs.setItem('turn-restriction-via-way0', _maxViaWay);
 //                _parent.call(restrictions);
 //            });
 //
@@ -348,7 +347,7 @@
 //
 //                    actions = _intersection.actions.concat(extraActions, [
 //                        actionRestrictTurn(datumOnly, restrictionType),
-//                        t('operations.restriction.annotation.create')
+//                        l10n.t('operations.restriction.annotation.create')
 //                    ]);
 //
 //                } else if (datum.restrictionID) {   // ONLY -> Allowed
@@ -366,13 +365,13 @@
 //
 //                    actions = _intersection.actions.concat(extraActions, [
 //                        actionUnrestrictTurn(datum),
-//                        t('operations.restriction.annotation.delete')
+//                        l10n.t('operations.restriction.annotation.delete')
 //                    ]);
 //
 //                } else {    // Allowed -> NO
 //                    actions = _intersection.actions.concat([
 //                        actionRestrictTurn(datum, restrictionType),
-//                        t('operations.restriction.annotation.create')
+//                        l10n.t('operations.restriction.annotation.create')
 //                    ]);
 //                }
 //
@@ -455,7 +454,7 @@
 //
 //            var placeholders = {};
 //            ['from', 'via', 'to'].forEach(function(k) {
-//                placeholders[k] = '<span class="qualifier">' + t('restriction.help.' + k) + '</span>';
+//                placeholders[k] = '<span class="qualifier">' + l10n.t('restriction.help.' + k) + '</span>';
 //            });
 //
 //            var entity = datum && datum.properties && datum.properties.entity;
@@ -482,7 +481,7 @@
 //                var clickSelect = (!_fromWayID || _fromWayID !== way.id);
 //                help
 //                    .append('div')      // "Click to select FROM {fromName}." / "FROM {fromName}"
-//                    .html(t.html('restriction.help.' + (clickSelect ? 'select_from_name' : 'from_name'), {
+//                    .html(l10n.tHtml('restriction.help.' + (clickSelect ? 'select_from_name' : 'from_name'), {
 //                        from: placeholders.from,
 //                        fromName: displayName(way.id, vgraph)
 //                    }));
@@ -492,21 +491,21 @@
 //            } else if (datum instanceof osmTurn) {
 //                var restrictionType = osmInferRestriction(vgraph, datum, projection);
 //                var turnType = restrictionType.replace(/^(only|no)\_/, '');
-//                var indirect = (datum.direct === false ? t.html('restriction.help.indirect') : '');
+//                var indirect = (datum.direct === false ? l10n.tHtml('restriction.help.indirect') : '');
 //                var klass, turnText, nextText;
 //
 //                if (datum.no) {
 //                    klass = 'restrict';
-//                    turnText = t.html('restriction.help.turn.no_' + turnType, { indirect: indirect });
-//                    nextText = t.html('restriction.help.turn.only_' + turnType, { indirect: '' });
+//                    turnText = l10n.tHtml('restriction.help.turn.no_' + turnType, { indirect: indirect });
+//                    nextText = l10n.tHtml('restriction.help.turn.only_' + turnType, { indirect: '' });
 //                } else if (datum.only) {
 //                    klass = 'only';
-//                    turnText = t.html('restriction.help.turn.only_' + turnType, { indirect: indirect });
-//                    nextText = t.html('restriction.help.turn.allowed_' + turnType, { indirect: '' });
+//                    turnText = l10n.tHtml('restriction.help.turn.only_' + turnType, { indirect: indirect });
+//                    nextText = l10n.tHtml('restriction.help.turn.allowed_' + turnType, { indirect: '' });
 //                } else {
 //                    klass = 'allow';
-//                    turnText = t.html('restriction.help.turn.allowed_' + turnType, { indirect: indirect });
-//                    nextText = t.html('restriction.help.turn.no_' + turnType, { indirect: '' });
+//                    turnText = l10n.tHtml('restriction.help.turn.allowed_' + turnType, { indirect: indirect });
+//                    nextText = l10n.tHtml('restriction.help.turn.no_' + turnType, { indirect: '' });
 //                }
 //
 //                help
@@ -516,7 +515,7 @@
 //
 //                help
 //                    .append('div')      // "FROM {fromName} TO {toName}"
-//                    .html(t.html('restriction.help.from_name_to_name', {
+//                    .html(l10n.tHtml('restriction.help.from_name_to_name', {
 //                        from: placeholders.from,
 //                        fromName: displayName(datum.from.way, vgraph),
 //                        to: placeholders.to,
@@ -536,7 +535,7 @@
 //
 //                    help
 //                        .append('div')      // "VIA {viaNames}"
-//                        .html(t.html('restriction.help.via_names', {
+//                        .html(l10n.tHtml('restriction.help.via_names', {
 //                            via: placeholders.via,
 //                            viaNames: names.join(', ')
 //                        }));
@@ -545,7 +544,7 @@
 //                if (!indirect) {
 //                    help
 //                        .append('div')      // Click for "No Right Turn"
-//                        .html(t.html('restriction.help.toggle', { turn: nextText.trim() }));
+//                        .html(l10n.tHtml('restriction.help.toggle', { turn: nextText.trim() }));
 //                }
 //
 //                highlightPathsFrom(null);
@@ -563,7 +562,7 @@
 //                if (_fromWayID) {
 //                    help
 //                        .append('div')      // "FROM {fromName}"
-//                        .html(t.html('restriction.help.from_name', {
+//                        .html(l10n.tHtml('restriction.help.from_name', {
 //                            from: placeholders.from,
 //                            fromName: displayName(_fromWayID, vgraph)
 //                        }));
@@ -571,7 +570,7 @@
 //                } else {
 //                    help
 //                        .append('div')      // "Click to select a FROM segment."
-//                        .html(t.html('restriction.help.select_from', {
+//                        .html(l10n.tHtml('restriction.help.select_from', {
 //                            from: placeholders.from
 //                        }));
 //                }
@@ -581,34 +580,34 @@
 //
 //
 //    function displayMaxDistance(maxDist) {
-//        var isImperial = !localizer.usesMetric();
+//        var isImperial = !context.localizationSystem().usesMetric();
 //        var opts;
 //
 //        if (isImperial) {
 //            var distToFeet = {   // imprecise conversion for prettier display
 //                20: 70, 25: 85, 30: 100, 35: 115, 40: 130, 45: 145, 50: 160
 //            }[maxDist];
-//            opts = { distance: t('units.feet', { quantity: distToFeet }) };
+//            opts = { distance: l10n.t('units.feet', { quantity: distToFeet }) };
 //        } else {
-//            opts = { distance: t('units.meters', { quantity: maxDist }) };
+//            opts = { distance: l10n.t('units.meters', { quantity: maxDist }) };
 //        }
 //
-//        return t.html('restriction.controls.distance_up_to', opts);
+//        return l10n.tHtml('restriction.controls.distance_up_to', opts);
 //    }
 //
 //
 //    function displayMaxVia(maxVia) {
-//        return maxVia === 0 ? t.html('restriction.controls.via_node_only')
-//            : maxVia === 1 ? t.html('restriction.controls.via_up_to_one')
-//            : t.html('restriction.controls.via_up_to_two');
+//        return maxVia === 0 ? l10n.tHtml('restriction.controls.via_node_only')
+//            : maxVia === 1 ? l10n.tHtml('restriction.controls.via_up_to_one')
+//            : l10n.tHtml('restriction.controls.via_up_to_two');
 //    }
 //
 //
 //    function displayName(entityID, graph) {
 //        var entity = graph.entity(entityID);
-//        var name = utilDisplayName(entity) || '';
-//        var matched = presetManager.match(entity, graph);
-//        var type = (matched && matched.name()) || utilDisplayType(entity.id);
+//        var name = l10n.displayName(entity) || '';
+//        var matched = context.presetSystem().match(entity, graph);
+//        var type = (matched && matched.name()) || l10n.displayType(entity.id);
 //        return name || type;
 //    }
 //
diff --git a/modules/ui/fields/roadspeed.js b/modules/ui/fields/roadspeed.js
index 4e218c43d2..05629ac839 100644
--- a/modules/ui/fields/roadspeed.js
+++ b/modules/ui/fields/roadspeed.js
@@ -3,15 +3,13 @@ import { select as d3_select } from 'd3-selection';
 import * as countryCoder from '@rapideditor/country-coder';
 
 import { uiCombobox } from '../combobox';
-import { t } from '../../core/localizer';
-import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util';
+import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 
-export function uiFieldRoadspeed(field, context) {
+export function uiFieldRoadspeed(context, uifield) {
     var dispatch = d3_dispatch('change');
     var unitInput = d3_select(null);
     var input = d3_select(null);
-    var _entityIDs = [];
     var _tags;
     var _isImperial;
 
@@ -24,13 +22,12 @@ export function uiFieldRoadspeed(field, context) {
 
 
     function roadspeed(selection) {
-
         var wrap = selection.selectAll('.form-field-input-wrap')
             .data([0]);
 
         wrap = wrap.enter()
             .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
+            .attr('class', 'form-field-input-wrap form-field-input-' + uifield.type)
             .merge(wrap);
 
 
@@ -41,7 +38,7 @@ export function uiFieldRoadspeed(field, context) {
             .append('input')
             .attr('type', 'text')
             .attr('class', 'roadspeed-number')
-            .attr('id', field.domId)
+            .attr('id', uifield.uid)
             .call(utilNoAuto)
             .call(speedCombo)
             .merge(input);
@@ -50,7 +47,7 @@ export function uiFieldRoadspeed(field, context) {
             .on('change', change)
             .on('blur', change);
 
-        var loc = combinedEntityExtent().center();
+        var loc = uifield.entityExtent.center();
         _isImperial = countryCoder.roadSpeedUnit(loc) === 'mph';
 
         unitInput = wrap.selectAll('input.roadspeed-unit')
@@ -94,16 +91,17 @@ export function uiFieldRoadspeed(field, context) {
     function change() {
         var tag = {};
         var value = utilGetSetValue(input).trim();
+        let key = uifield.key;
 
         // don't override multiple values with blank string
-        if (!value && Array.isArray(_tags[field.key])) return;
+        if (!value && Array.isArray(_tags[key])) return;
 
         if (!value) {
-            tag[field.key] = undefined;
+            tag[key] = undefined;
         } else if (isNaN(value) || !_isImperial) {
-            tag[field.key] = context.cleanTagValue(value);
+            tag[key] = context.cleanTagValue(value);
         } else {
-            tag[field.key] = context.cleanTagValue(value + ' mph');
+            tag[key] = context.cleanTagValue(value + ' mph');
         }
 
         dispatch.call('change', this, tag);
@@ -112,8 +110,9 @@ export function uiFieldRoadspeed(field, context) {
 
     roadspeed.tags = function(tags) {
         _tags = tags;
+        let key = uifield.key;
 
-        var value = tags[field.key];
+        var value = tags[key];
         var isMixed = Array.isArray(value);
 
         if (!isMixed) {
@@ -129,7 +128,7 @@ export function uiFieldRoadspeed(field, context) {
 
         utilGetSetValue(input, typeof value === 'string' ? value : '')
             .attr('title', isMixed ? value.filter(Boolean).join('\n') : null)
-            .attr('placeholder', isMixed ? t('inspector.multiple_values') : field.placeholder())
+            .attr('placeholder', isMixed ? context.t('inspector.multiple_values') : uifield.placeholder)
             .classed('mixed', isMixed);
     };
 
@@ -138,16 +137,5 @@ export function uiFieldRoadspeed(field, context) {
         input.node().focus();
     };
 
-
-    roadspeed.entityIDs = function(val) {
-        _entityIDs = val;
-    };
-
-
-    function combinedEntityExtent() {
-        return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
-    }
-
-
     return utilRebind(roadspeed, dispatch, 'on');
 }
diff --git a/modules/ui/fields/textarea.js b/modules/ui/fields/textarea.js
index 31e7920526..96bef1a1b3 100644
--- a/modules/ui/fields/textarea.js
+++ b/modules/ui/fields/textarea.js
@@ -1,75 +1,72 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../../core/localizer';
-import {
-    utilGetSetValue,
-    utilNoAuto,
-    utilRebind
-} from '../../util';
+import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 
-export function uiFieldTextarea(field, context) {
-    var dispatch = d3_dispatch('change');
-    var input = d3_select(null);
-    var _tags;
+export function uiFieldTextarea(context, uifield) {
+  let dispatch = d3_dispatch('change');
+  let input = d3_select(null);
+  let _tags;
 
 
-    function textarea(selection) {
-        var wrap = selection.selectAll('.form-field-input-wrap')
-            .data([0]);
+  function textarea(selection) {
+    let wrap = selection.selectAll('.form-field-input-wrap')
+      .data([0]);
 
-        wrap = wrap.enter()
-            .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
-            .merge(wrap);
+    wrap = wrap.enter()
+      .append('div')
+      .attr('class', `form-field-input-wrap form-field-input-${uifield.type}`)
+      .merge(wrap);
 
-        input = wrap.selectAll('textarea')
-            .data([0]);
+    input = wrap.selectAll('textarea')
+      .data([0]);
 
-        input = input.enter()
-            .append('textarea')
-            .attr('id', field.domId)
-            .call(utilNoAuto)
-            .on('input', change(true))
-            .on('blur', change())
-            .on('change', change())
-            .merge(input);
-    }
+    input = input.enter()
+      .append('textarea')
+      .attr('id', uifield.uid)
+      .call(utilNoAuto)
+      .on('input', change(true))
+      .on('blur', change())
+      .on('change', change())
+      .merge(input);
+  }
 
 
-    function change(onInput) {
-        return function() {
+  function change(onInput) {
+    return function() {
+      const key = uifield.key;
+      let val = utilGetSetValue(input);
+      if (!onInput) val = context.cleanTagValue(val);
 
-            var val = utilGetSetValue(input);
-            if (!onInput) val = context.cleanTagValue(val);
+      // don't override multiple values with blank string
+      if (!val && Array.isArray(_tags[key])) return;
 
-            // don't override multiple values with blank string
-            if (!val && Array.isArray(_tags[field.key])) return;
-
-            var t = {};
-            t[field.key] = val || undefined;
-            dispatch.call('change', this, t, onInput);
-        };
-    }
+      let t = {};
+      t[key] = val || undefined;
+      dispatch.call('change', this, t, onInput);
+    };
+  }
 
 
-    textarea.tags = function(tags) {
-        _tags = tags;
+  textarea.tags = function(tags) {
+    _tags = tags;
+    const key = uifield.key;
+    const isMixed = Array.isArray(tags[key]);
+    const placeholder = isMixed ? context.t('inspector.multiple_values') :
+      (uifield.placeholder || context.t('inspector.unknown'));
 
-        var isMixed = Array.isArray(tags[field.key]);
+    utilGetSetValue(input, !isMixed && tags[key] ? tags[key] : '')
+      .attr('title', isMixed ? tags[key].filter(Boolean).join('\n') : undefined)
+      .attr('placeholder', placeholder)
+      .classed('mixed', isMixed);
+  };
 
-        utilGetSetValue(input, !isMixed && tags[field.key] ? tags[field.key] : '')
-            .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : undefined)
-            .attr('placeholder', isMixed ? t('inspector.multiple_values') : (field.placeholder() || t('inspector.unknown')))
-            .classed('mixed', isMixed);
-    };
 
-
-    textarea.focus = function() {
-        input.node().focus();
-    };
+  textarea.focus = function() {
+    input.node().focus();
+  };
 
 
-    return utilRebind(textarea, dispatch, 'on');
+  return utilRebind(textarea, dispatch, 'on');
 }
diff --git a/modules/ui/fields/wikidata.js b/modules/ui/fields/wikidata.js
index 3005f92a43..f801960db0 100644
--- a/modules/ui/fields/wikidata.js
+++ b/modules/ui/fields/wikidata.js
@@ -2,15 +2,13 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
 import { actionChangeTags } from '../../actions/change_tags';
-import { services } from '../../services/index';
 import { uiIcon } from '../icon';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 import { uiCombobox } from '../combobox';
-import { t } from '../../core/localizer';
 
 
-export function uiFieldWikidata(field, context) {
-    var wikidata = services.wikidata;
+export function uiFieldWikidata(context, uifield) {
+    var wikidata = context.services.get('wikidata');
     var dispatch = d3_dispatch('change');
 
     var _selection = d3_select(null);
@@ -20,12 +18,12 @@ export function uiFieldWikidata(field, context) {
     var _wikiURL = '';
     var _entityIDs = [];
 
-    var _wikipediaKey = field.keys && field.keys.find(function(key) {
+    var _wikipediaKey = uifield.keys && uifield.keys.find(function(key) {
         return key.includes('wikipedia');
     });
-    var _hintKey = field.key === 'wikidata' ? 'name' : field.key.split(':')[0];
+    var _hintKey = uifield.key === 'wikidata' ? 'name' : uifield.key.split(':')[0];
 
-    var combobox = uiCombobox(context, 'combo-' + field.safeid)
+    var combobox = uiCombobox(context, 'combo-' + uifield.safeid)
         .caseSensitive(true)
         .minItems(1);
 
@@ -38,7 +36,7 @@ export function uiFieldWikidata(field, context) {
 
         wrap = wrap.enter()
             .append('div')
-            .attr('class', 'form-field-input-wrap form-field-input-' + field.type)
+            .attr('class', 'form-field-input-wrap form-field-input-' + uifield.type)
             .merge(wrap);
 
 
@@ -60,7 +58,7 @@ export function uiFieldWikidata(field, context) {
         searchRowEnter
             .append('input')
             .attr('type', 'text')
-            .attr('id', field.domId)
+            .attr('id', uifield.uid)
             .style('flex', '1')
             .call(utilNoAuto)
             .on('focus', function() {
@@ -84,7 +82,7 @@ export function uiFieldWikidata(field, context) {
         searchRowEnter
             .append('button')
             .attr('class', 'form-field-button wiki-link')
-            .attr('title', t('icons.view_on', { domain: 'wikidata.org' }))
+            .attr('title', context.t('icons.view_on', { domain: 'wikidata.org' }))
             .call(uiIcon('#rapid-icon-out-link'))
             .on('click', function(d3_event) {
                 d3_event.preventDefault();
@@ -108,7 +106,7 @@ export function uiFieldWikidata(field, context) {
         enter
             .append('span')
             .attr('class', 'label')
-            .html(function(d) { return t.html('wikidata.' + d); });
+            .html(function(d) { return context.tHtml('wikidata.' + d); });
 
         enter
             .append('input')
@@ -120,7 +118,7 @@ export function uiFieldWikidata(field, context) {
         enter
             .append('button')
             .attr('class', 'form-field-button')
-            .attr('title', t('icons.copy'))
+            .attr('title', context.t('icons.copy'))
             .call(uiIcon('#rapid-operation-copy'))
             .on('click', function(d3_event) {
                 d3_event.preventDefault();
@@ -163,8 +161,9 @@ export function uiFieldWikidata(field, context) {
 
 
     function change() {
+        let key = uifield.key;
         var syncTags = {};
-        syncTags[field.key] = _qid;
+        syncTags[key] = _qid;
         dispatch.call('change', this, syncTags);
 
         // attempt asynchronous update of wikidata tag..
@@ -259,7 +258,7 @@ export function uiFieldWikidata(field, context) {
                     });
                     return graph;
                 },
-                context.history().undoAnnotation()
+                context.editSystem().undoAnnotation()
             );
 
             // do not dispatch.call('change') here, because entity_editor
@@ -280,14 +279,14 @@ export function uiFieldWikidata(field, context) {
 
 
     wiki.tags = function(tags) {
-
-        var isMixed = Array.isArray(tags[field.key]);
+        let key = uifield.key;
+        var isMixed = Array.isArray(tags[key]);
         _searchInput
-            .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : null)
-            .attr('placeholder', isMixed ? t('inspector.multiple_values') : '')
+            .attr('title', isMixed ? tags[key].filter(Boolean).join('\n') : null)
+            .attr('placeholder', isMixed ? context.t('inspector.multiple_values') : '')
             .classed('mixed', isMixed);
 
-        _qid = typeof tags[field.key] === 'string' && tags[field.key] || '';
+        _qid = typeof tags[key] === 'string' && tags[key] || '';
 
         if (!/^Q[0-9]*$/.test(_qid)) {   // not a proper QID
             unrecognized();
diff --git a/modules/ui/fields/wikipedia.js b/modules/ui/fields/wikipedia.js
index f8b8c64c62..b08250d7e0 100644
--- a/modules/ui/fields/wikipedia.js
+++ b/modules/ui/fields/wikipedia.js
@@ -1,19 +1,16 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { fileFetcher } from '../../core/file_fetcher';
-import { t, localizer } from '../../core/localizer';
 import { actionChangeTags } from '../../actions/change_tags';
-import { services } from '../../services/index';
 import { uiIcon } from '../icon';
 import { uiCombobox } from '../combobox';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 
-export function uiFieldWikipedia(field, context) {
+export function uiFieldWikipedia(context, uifield) {
   const dispatch = d3_dispatch('change');
-  const wikipedia = services.wikipedia;
-  const wikidata = services.wikidata;
+  const wikipedia = context.services.get('wikipedia');
+  const wikidata = context.services.get('wikidata');
   let _langInput = d3_select(null);
   let _titleInput = d3_select(null);
   let _wikiURL = '';
@@ -21,7 +18,8 @@ export function uiFieldWikipedia(field, context) {
   let _tags;
 
   let _dataWikipedia = [];
-  fileFetcher.get('wmf_sitematrix')
+  const dataLoaderSystem = context.dataLoaderSystem();
+  dataLoaderSystem.get('wmf_sitematrix')
     .then(d => {
       _dataWikipedia = d;
       if (_tags) updateForTags(_tags);
@@ -67,7 +65,7 @@ export function uiFieldWikipedia(field, context) {
 
     wrap = wrap.enter()
       .append('div')
-      .attr('class', `form-field-input-wrap form-field-input-${field.type}`)
+      .attr('class', `form-field-input-wrap form-field-input-${uifield.type}`)
       .merge(wrap);
 
 
@@ -87,7 +85,7 @@ export function uiFieldWikipedia(field, context) {
       .append('input')
       .attr('type', 'text')
       .attr('class', 'wiki-lang')
-      .attr('placeholder', t('translate.localized_translation_language'))
+      .attr('placeholder', context.t('translate.localized_translation_language'))
       .call(utilNoAuto)
       .call(langCombo)
       .merge(_langInput);
@@ -112,7 +110,7 @@ export function uiFieldWikipedia(field, context) {
       .append('input')
       .attr('type', 'text')
       .attr('class', 'wiki-title')
-      .attr('id', field.domId)
+      .attr('id', uifield.uid)
       .call(utilNoAuto)
       .call(titleCombo)
       .merge(_titleInput);
@@ -132,7 +130,7 @@ export function uiFieldWikipedia(field, context) {
     link = link.enter()
       .append('button')
       .attr('class', 'form-field-button wiki-link')
-      .attr('title', t('icons.view_on', { domain: 'wikipedia.org' }))
+      .attr('title', context.t('icons.view_on', { domain: 'wikipedia.org' }))
       .call(uiIcon('#rapid-icon-out-link'))
       .merge(link);
 
@@ -145,7 +143,7 @@ export function uiFieldWikipedia(field, context) {
 
 
   function defaultLanguageInfo(skipEnglishFallback) {
-    const langCode = localizer.languageCode().toLowerCase();
+    const langCode = context.localizationSystem().languageCode().toLowerCase();
 
     for (let i in _dataWikipedia) {
       let d = _dataWikipedia[i];
@@ -193,7 +191,7 @@ export function uiFieldWikipedia(field, context) {
       if (m[3]) {
         let anchor;
         // try {
-        // leave this out for now - #6232
+        // leave this out for now - iD#6232
           // Best-effort `anchordecode:` implementation
           // anchor = decodeURIComponent(m[3].replace(/\.([0-9A-F]{2})/g, '%$1'));
         // } catch (e) {
@@ -250,7 +248,7 @@ export function uiFieldWikipedia(field, context) {
           });
           return graph;
         },
-        context.history().undoAnnotation()
+        context.editSystem().undoAnnotation()
       );
 
       // do not dispatch.call('change') here, because entity_editor
@@ -265,8 +263,8 @@ export function uiFieldWikipedia(field, context) {
   };
 
   function updateForTags(tags) {
-
-    const value = typeof tags[field.key] === 'string' ? tags[field.key] : '';
+    let key = uifield.key;
+    const value = typeof tags[key] === 'string' ? tags[key] : '';
     // Expect tag format of `tagLang:tagArticleTitle`, e.g. `fr:Paris`, with
     // optional suffix of `#anchor`
     const m = value.match(/([^:]+):([^#]+)(?:#(.+))?/);
diff --git a/modules/ui/form_fields.js b/modules/ui/form_fields.js
index 9c8c154974..59583c1c96 100644
--- a/modules/ui/form_fields.js
+++ b/modules/ui/form_fields.js
@@ -1,148 +1,146 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../core/localizer';
 import { uiCombobox } from './combobox';
 import { utilGetSetValue, utilNoAuto } from '../util';
 
 
 export function uiFormFields(context) {
-    var moreCombo = uiCombobox(context, 'more-fields').minItems(1);
-    var _fieldsArr = [];
-    var _lastPlaceholder = '';
-    var _state = '';
-    var _klass = '';
+  let moreCombo = uiCombobox(context, 'more-fields').minItems(1);
+  let _uifields = [];
+  let _lastPlaceholder = '';
+  let _state = '';
+  let _klass = '';
 
 
-    function formFields(selection) {
-        var allowedFields = _fieldsArr.filter(function(field) { return field.isAllowed(); });
-        var shown = allowedFields.filter(function(field) { return field.isShown(); });
-        var notShown = allowedFields.filter(function(field) { return !field.isShown(); });
-
-        var container = selection.selectAll('.form-fields-container')
-            .data([0]);
-
-        container = container.enter()
-            .append('div')
-            .attr('class', 'form-fields-container ' + (_klass || ''))
-            .merge(container);
-
-
-        var fields = container.selectAll('.wrap-form-field')
-            .data(shown, function(d) { return d.id + (d.entityIDs ? d.entityIDs.join() : ''); });
-
-        fields.exit()
-            .remove();
-
-        // Enter
-        var enter = fields.enter()
-            .append('div')
-            .attr('class', function(d) { return 'wrap-form-field wrap-form-field-' + d.safeid; });
-
-        // Update
-        fields = fields
-            .merge(enter);
-
-        fields
-            .order()
-            .each(function(d) {
-                d3_select(this)
-                    .call(d.render);
-            });
-
-
-        var titles = [];
-        var moreFields = notShown.map(function(field) {
-            var title = field.title();
-            titles.push(title);
-
-            var terms = field.terms();
-            if (field.key) terms.push(field.key);
-            if (field.keys) terms = terms.concat(field.keys);
-
-            return {
-                display: field.label(),
-                value: title,
-                title: title,
-                field: field,
-                terms: terms
-            };
-        });
-
-        var placeholder = titles.slice(0,3).join(', ') + ((titles.length > 3) ? '…' : '');
-
-
-        var more = selection.selectAll('.more-fields')
-            .data((_state === 'hover' || moreFields.length === 0) ? [] : [0]);
-
-        more.exit()
-            .remove();
-
-        var moreEnter = more.enter()
-            .append('div')
-            .attr('class', 'more-fields')
-            .append('label');
-
-        moreEnter
-            .append('span')
-            .html(t.html('inspector.add_fields'));
-
-        more = moreEnter
-            .merge(more);
-
-
-        var input = more.selectAll('.value')
-            .data([0]);
-
-        input.exit()
-            .remove();
-
-        input = input.enter()
-            .append('input')
-            .attr('class', 'value')
-            .attr('type', 'text')
-            .attr('placeholder', placeholder)
-            .call(utilNoAuto)
-            .merge(input);
-
-        input
-            .call(utilGetSetValue, '')
-            .call(moreCombo
-                .data(moreFields)
-                .on('accept', function (d) {
-                    if (!d) return;  // user entered something that was not matched
-                    var field = d.field;
-                    field.show();
-                    selection.call(formFields);  // rerender
-                    field.focus();
-                })
-            );
-
-        // avoid updating placeholder excessively (triggers style recalc)
-        if (_lastPlaceholder !== placeholder) {
-            input.attr('placeholder', placeholder);
-            _lastPlaceholder = placeholder;
-        }
+  function formFields(selection) {
+    const allowedFields = _uifields.filter(uifield => uifield.isAllowed());
+    const shown = allowedFields.filter(uifield => uifield.isShown());
+    const notShown = allowedFields.filter(uifield => !uifield.isShown());
+
+    let container = selection.selectAll('.form-fields-container')
+      .data([0]);
+
+    container = container.enter()
+      .append('div')
+      .attr('class', 'form-fields-container ' + (_klass || ''))
+      .merge(container);
+
+
+    let fields = container.selectAll('.wrap-form-field')
+      .data(shown, d => (d.id + (d.entityIDs ? d.entityIDs.join() : '')));
+
+    fields.exit()
+      .remove();
+
+    // Enter
+    let enter = fields.enter()
+      .append('div')
+      .attr('class', d => `wrap-form-field wrap-form-field-${d.safeid}`);
+
+    // Update
+    fields = fields
+      .merge(enter);
+
+    fields
+      .order()
+      .each((d, i, nodes) => {
+        d3_select(nodes[i]).call(d.render);
+      });
+
+
+    let titles = [];
+    let moreFields = notShown.map(uifield => {
+      const title = uifield.title;
+      titles.push(title);
+
+      let terms = uifield.terms;
+      if (uifield.key)  terms.push(uifield.key);
+      if (uifield.keys) terms = terms.concat(uifield.keys);
+
+      return {
+        display: uifield.label,
+        value: title,
+        title: title,
+        field: uifield,
+        terms: terms
+      };
+    });
+
+
+    let placeholder = titles.slice(0,3).join(', ') + ((titles.length > 3) ? '…' : '');
+
+    let more = selection.selectAll('.more-fields')
+      .data((_state === 'hover' || moreFields.length === 0) ? [] : [0]);
+
+    more.exit()
+      .remove();
+
+    let moreEnter = more.enter()
+      .append('div')
+      .attr('class', 'more-fields')
+      .append('label');
+
+    moreEnter
+      .append('span')
+      .text(context.t('inspector.add_fields'));
+
+    more = moreEnter
+      .merge(more);
+
+
+    let input = more.selectAll('.value')
+      .data([0]);
+
+    input.exit()
+      .remove();
+
+    input = input.enter()
+      .append('input')
+      .attr('class', 'value')
+      .attr('type', 'text')
+      .attr('placeholder', placeholder)
+      .call(utilNoAuto)
+      .merge(input);
+
+    input
+      .call(utilGetSetValue, '')
+      .call(moreCombo
+        .data(moreFields)
+        .on('accept', d => {
+          if (!d) return;  // user entered something that was not matched
+          const uifield = d.field;
+          uifield.show();
+          selection.call(formFields);  // rerender
+          uifield.focus();
+        })
+      );
+
+    // avoid updating placeholder excessively (triggers style recalc)
+    if (_lastPlaceholder !== placeholder) {
+      input.attr('placeholder', placeholder);
+      _lastPlaceholder = placeholder;
     }
+  }
 
 
-    formFields.fieldsArr = function(val) {
-        if (!arguments.length) return _fieldsArr;
-        _fieldsArr = val || [];
-        return formFields;
-    };
+  formFields.fieldsArr = function(val) {
+    if (!arguments.length) return _uifields;
+    _uifields = val || [];
+    return formFields;
+  };
 
-    formFields.state = function(val) {
-        if (!arguments.length) return _state;
-        _state = val;
-        return formFields;
-    };
+  formFields.state = function(val) {
+    if (!arguments.length) return _state;
+    _state = val;
+    return formFields;
+  };
 
-    formFields.klass = function(val) {
-        if (!arguments.length) return _klass;
-        _klass = val;
-        return formFields;
-    };
+  formFields.klass = function(val) {
+    if (!arguments.length) return _klass;
+    _klass = val;
+    return formFields;
+  };
 
 
-    return formFields;
+  return formFields;
 }
diff --git a/modules/ui/geolocate.js b/modules/ui/geolocate.js
index 3477d0f4a3..766c8bee25 100644
--- a/modules/ui/geolocate.js
+++ b/modules/ui/geolocate.js
@@ -1,7 +1,6 @@
 import { select as d3_select } from 'd3-selection';
 import { Extent } from '@rapid-sdk/math';
 
-import { t, localizer } from '../core/localizer';
 import { uiTooltip } from './tooltip';
 import { uiIcon } from './icon';
 import { uiLoading } from './loading';
@@ -15,7 +14,7 @@ const GEOLOCATE_OPTIONS = {
 
 
 export function uiGeolocate(context) {
-  let _uiModal = uiLoading(context).message(t.html('geolocate.locating')).blocking(true);
+  let _uiModal = uiLoading(context).message(context.tHtml('geolocate.locating')).blocking(true);
   let _layer = context.scene().layers.get('map-ui');
   let _enabled = false;
   let _timeoutID;
@@ -23,7 +22,7 @@ export function uiGeolocate(context) {
 
 
   function click() {
-    if (context.inIntro()) return;
+    if (context.inIntro) return;
 
     if (!_enabled) {   // start geolocating
       _enabled = true;
@@ -39,7 +38,7 @@ export function uiGeolocate(context) {
     } else {   // stop geolocating
       _enabled = false;
       _layer.geolocationData = null;
-      context.map().deferredRedraw();
+      context.mapSystem().deferredRedraw();
       finish();
     }
   }
@@ -52,7 +51,7 @@ export function uiGeolocate(context) {
       const coords = result.coords;
       const extent = new Extent([coords.longitude, coords.latitude]).padByMeters(coords.accuracy);
       _layer.geolocationData = result;
-      context.map().deferredRedraw();
+      context.mapSystem().deferredRedraw();
 
       // If `_timeoutID` has a value, this is the first successful result we've received.
       // Recenter the map and clear the timeout.
@@ -60,7 +59,7 @@ export function uiGeolocate(context) {
         window.clearTimeout(_timeoutID);
         _timeoutID = undefined;
 
-        const map = context.map();
+        const map = context.mapSystem();
         map.centerZoomEase(extent.center(), Math.min(20, map.extentZoom(extent)));
       }
 
@@ -76,13 +75,13 @@ export function uiGeolocate(context) {
   function error() {
     if (_enabled) {    // user may have disabled it before the callback fires
       context.ui().flash
-        .label(t.html('geolocate.location_unavailable'))
+        .label(context.tHtml('geolocate.location_unavailable'))
         .iconName('#rapid-icon-geolocate')();
     }
 
     _enabled = false;
     _layer.geolocationData = null;
-    context.map().deferredRedraw();
+    context.mapSystem().deferredRedraw();
     finish();
   }
 
@@ -101,13 +100,15 @@ export function uiGeolocate(context) {
   return function(selection) {
     if (!navigator.geolocation || !navigator.geolocation.getCurrentPosition) return;
 
+    const isRTL = context.localizationSystem().isRTL();
+
     _button = selection
       .append('button')
       .on('click', click)
       .call(uiIcon('#rapid-icon-geolocate', 'light'))
-      .call(uiTooltip()
-        .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
-        .title(t.html('geolocate.title'))
+      .call(uiTooltip(context)
+        .placement(isRTL ? 'right' : 'left')
+        .title(context.tHtml('geolocate.title'))
       );
   };
 }
diff --git a/modules/ui/improveOSM_comments.js b/modules/ui/improveOSM_comments.js
index 8b70760bab..74a2b6a971 100644
--- a/modules/ui/improveOSM_comments.js
+++ b/modules/ui/improveOSM_comments.js
@@ -1,24 +1,27 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t, localizer } from '../core/localizer';
 import { uiIcon } from './icon';
-import { services } from '../services';
 
-export function uiImproveOsmComments() {
+
+export function uiImproveOsmComments(context) {
   let _qaItem;
 
+
   function issueComments(selection) {
+    const improveosm = context.services.get('improveOSM');
+    if (!improveosm) return;
+
     // make the div immediately so it appears above the buttons
     let comments = selection.selectAll('.comments-container')
       .data([0]);
 
     comments = comments.enter()
       .append('div')
-        .attr('class', 'comments-container')
+      .attr('class', 'comments-container')
       .merge(comments);
 
     // must retrieve comments from API before they can be displayed
-    services.improveOSM.getComments(_qaItem)
+    improveosm.getCommentsAsync(_qaItem)
       .then(d => {
         if (!d.comments) return; // nothing to do here
 
@@ -45,7 +48,7 @@ export function uiImproveOsmComments() {
           .append('div')
             .attr('class', 'comment-author')
             .each(function(d) {
-              const osm = services.osm;
+              const osm = context.services.get('osm');
               let selection = d3_select(this);
               if (osm && d.username) {
                 selection = selection
@@ -61,7 +64,7 @@ export function uiImproveOsmComments() {
         metadataEnter
           .append('div')
             .attr('class', 'comment-date')
-            .html(d => t.html('note.status.commented', { when: localeDateString(d.timestamp) }));
+            .html(d => context.tHtml('note.status.commented', { when: localeDateString(d.timestamp) }));
 
         mainEnter
           .append('div')
@@ -72,14 +75,18 @@ export function uiImproveOsmComments() {
     .catch(e => console.log(e)); // eslint-disable-line no-console
   }
 
+
   function localeDateString(s) {
     if (!s) return null;
     const options = { day: 'numeric', month: 'short', year: 'numeric' };
     const d = new Date(s * 1000); // timestamp is served in seconds, date takes ms
     if (isNaN(d.getTime())) return null;
-    return d.toLocaleDateString(localizer.localeCode(), options);
+
+    const localeCode = context.localizationSystem().localeCode();
+    return d.toLocaleDateString(localeCode, options);
   }
 
+
   issueComments.issue = function(val) {
     if (!arguments.length) return _qaItem;
     _qaItem = val;
diff --git a/modules/ui/improveOSM_details.js b/modules/ui/improveOSM_details.js
index 933e81c223..db7fe21512 100644
--- a/modules/ui/improveOSM_details.js
+++ b/modules/ui/improveOSM_details.js
@@ -1,11 +1,10 @@
 import { select as d3_select } from 'd3-selection';
 
-import { presetManager } from '../presets';
-import { modeSelect } from '../modes/select';
-import { t } from '../core/localizer';
-import { utilDisplayName, utilHighlightEntities } from '../util';
+import { utilHighlightEntities } from '../util';
+
 
 export function uiImproveOsmDetails(context) {
+  const l10n = context.localizationSystem();
   let _qaItem;
 
 
@@ -13,8 +12,8 @@ export function uiImproveOsmDetails(context) {
     if (d.desc) return d.desc;
     const issueKey = d.issueKey;
     d.replacements = d.replacements || {};
-    d.replacements.default = t.html('inspector.unknown');  // special key `default` works as a fallback string
-    return t.html(`QA.improveOSM.error_types.${issueKey}.description`, d.replacements);
+    d.replacements.default = l10n.tHtml('inspector.unknown');  // special key `default` works as a fallback string
+    return l10n.tHtml(`QA.improveOSM.error_types.${issueKey}.description`, d.replacements);
   }
 
 
@@ -40,7 +39,7 @@ export function uiImproveOsmDetails(context) {
 
     descriptionEnter
       .append('h4')
-        .html(t.html('QA.keepRight.detail_description'));
+        .html(l10n.tHtml('QA.keepRight.detail_description'));
 
     descriptionEnter
       .append('div')
@@ -51,10 +50,11 @@ export function uiImproveOsmDetails(context) {
     let relatedEntities = [];
     descriptionEnter.selectAll('.error_entity_link, .error_object_link')
       .attr('href', '#')
-      .each(function() {
-        const link = d3_select(this);
+      .each((d, i, nodes) => {
+        const node = nodes[i];
+        const link = d3_select(node);
         const isObjectLink = link.classed('error_object_link');
-        const entityID = isObjectLink ? (_qaItem.objectType.charAt(0) + _qaItem.objectId) : this.textContent;
+        const entityID = isObjectLink ? (_qaItem.objectType.charAt(0) + _qaItem.objectId) : node.textContent;
         const entity = context.hasEntity(entityID);
 
         relatedEntities.push(entityID);
@@ -73,15 +73,17 @@ export function uiImproveOsmDetails(context) {
             utilHighlightEntities([entityID], false, context);
 
             context.scene().enableLayers('osm');  // make sure osm layer is even on
-            context.map().centerZoom(_qaItem.loc, 20);
+            context.mapSystem().centerZoom(_qaItem.loc, 20);
 
             if (entity) {
-              context.enter(modeSelect(context, [entityID]));
+              context.enter('select-osm', { selectedIDs: [entityID] });
             } else {
               context.loadEntity(entityID, (err, result) => {
                 if (err) return;
                 const entity = result.data.find(e => e.id === entityID);
-                if (entity) context.enter(modeSelect(context, [entityID]));
+                if (entity) {
+                  context.enter('select-osm', { selectedIDs: [entityID] });
+                }
               });
             }
           });
@@ -89,22 +91,22 @@ export function uiImproveOsmDetails(context) {
         // Replace with friendly name if possible
         // (The entity may not yet be loaded into the graph)
         if (entity) {
-          let name = utilDisplayName(entity);  // try to use common name
-
+          let name = l10n.displayName(entity);  // try to use common name
           if (!name && !isObjectLink) {
-            const preset = presetManager.match(entity, context.graph());
+            const presetSystem = context.presetSystem();
+            const preset = presetSystem.match(entity, context.graph());
             name = preset && !preset.isFallback() && preset.name();  // fallback to preset name
           }
 
           if (name) {
-            this.innerText = name;
+            node.innerText = name;
           }
         }
       });
 
-    // Don't hide entities related to this error - #5880
-    context.features().forceVisible(relatedEntities);
-    context.map().immediateRedraw();
+    // Don't hide entities related to this error - iD#5880
+    context.filterSystem().forceVisible(relatedEntities);
+    context.mapSystem().immediateRedraw();
   }
 
   improveOsmDetails.issue = function(val) {
diff --git a/modules/ui/improveOSM_editor.js b/modules/ui/improveOSM_editor.js
index ea9da3a142..1373ecb7cf 100644
--- a/modules/ui/improveOSM_editor.js
+++ b/modules/ui/improveOSM_editor.js
@@ -1,26 +1,23 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../core/localizer';
-import { services } from '../services';
 import { uiIcon } from './icon';
-
 import { uiImproveOsmComments } from './improveOSM_comments';
 import { uiImproveOsmDetails } from './improveOSM_details';
 import { uiImproveOsmHeader } from './improveOSM_header';
-
 import { utilNoAuto, utilRebind } from '../util';
 
+
 export function uiImproveOsmEditor(context) {
+  const improveosm = context.services.get('improveOSM');
   const dispatch = d3_dispatch('change');
   const qaDetails = uiImproveOsmDetails(context);
   const qaComments = uiImproveOsmComments(context);
   const qaHeader = uiImproveOsmHeader(context);
-
   let _qaItem;
 
-  function improveOsmEditor(selection) {
 
+  function improveOsmEditor(selection) {
     const headerEnter = selection.selectAll('.header')
       .data([0])
       .enter()
@@ -35,7 +32,7 @@ export function uiImproveOsmEditor(context) {
 
     headerEnter
       .append('h3')
-        .html(t.html('QA.improveOSM.title'));
+        .html(context.tHtml('QA.improveOSM.title'));
 
     let body = selection.selectAll('.body')
       .data([0]);
@@ -80,12 +77,12 @@ export function uiImproveOsmEditor(context) {
     saveSectionEnter
       .append('h4')
         .attr('class', '.qa-save-header')
-        .html(t.html('note.newComment'));
+        .html(context.tHtml('note.newComment'));
 
     saveSectionEnter
       .append('textarea')
         .attr('class', 'new-comment-input')
-        .attr('placeholder', t('QA.keepRight.comment_placeholder'))
+        .attr('placeholder', context.t('QA.keepRight.comment_placeholder'))
         .attr('maxlength', 1000)
         .property('value', d => d.newComment)
         .call(utilNoAuto)
@@ -95,7 +92,7 @@ export function uiImproveOsmEditor(context) {
     // update
     saveSection = saveSectionEnter
       .merge(saveSection)
-        .call(qaSaveButtons);
+      .call(qaSaveButtons);
 
     function changeInput() {
       const input = d3_select(this);
@@ -108,9 +105,8 @@ export function uiImproveOsmEditor(context) {
       // store the unsaved comment with the issue itself
       _qaItem = _qaItem.update({ newComment: val });
 
-      const qaService = services.improveOSM;
-      if (qaService) {
-        qaService.replaceItem(_qaItem);
+      if (improveosm) {
+        improveosm.replaceItem(_qaItem);
       }
 
       saveSection
@@ -136,7 +132,7 @@ export function uiImproveOsmEditor(context) {
     buttonEnter
       .append('button')
         .attr('class', 'button comment-button action')
-        .html(t.html('QA.keepRight.save_comment'));
+        .html(context.tHtml('QA.keepRight.save_comment'));
 
     buttonEnter
       .append('button')
@@ -153,38 +149,35 @@ export function uiImproveOsmEditor(context) {
     buttonSection.select('.comment-button')
       .attr('disabled', d => d.newComment ? null : true)
       .on('click.comment', function(d3_event, d) {
-        this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.improveOSM;
-        if (qaService) {
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+        this.blur();    // avoid keeping focus on the button - iD#4641
+        if (improveosm) {
+          improveosm.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
 
     buttonSection.select('.close-button')
       .html(d => {
         const andComment = (d.newComment ? '_comment' : '');
-        return t.html(`QA.keepRight.close${andComment}`);
+        return context.tHtml(`QA.keepRight.close${andComment}`);
       })
       .on('click.close', function(d3_event, d) {
-        this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.improveOSM;
-        if (qaService) {
+        this.blur();    // avoid keeping focus on the button - iD#4641
+        if (improveosm) {
           d.newStatus = 'SOLVED';
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+          improveosm.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
 
     buttonSection.select('.ignore-button')
       .html(d => {
         const andComment = (d.newComment ? '_comment' : '');
-        return t.html(`QA.keepRight.ignore${andComment}`);
+        return context.tHtml(`QA.keepRight.ignore${andComment}`);
       })
       .on('click.ignore', function(d3_event, d) {
-        this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.improveOSM;
-        if (qaService) {
+        this.blur();    // avoid keeping focus on the button - iD#4641
+        if (improveosm) {
           d.newStatus = 'INVALID';
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+          improveosm.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
   }
diff --git a/modules/ui/improveOSM_header.js b/modules/ui/improveOSM_header.js
index 9c5293e33b..311fb103df 100644
--- a/modules/ui/improveOSM_header.js
+++ b/modules/ui/improveOSM_header.js
@@ -1,26 +1,23 @@
-import * as PIXI from 'pixi.js';
+import { Color } from 'pixi.js';
 
-import { services } from '../services';
-import { t } from '../core/localizer';
 
-
-export function uiImproveOsmHeader() {
+export function uiImproveOsmHeader(context) {
   let _qaItem;
 
 
   function issueTitle(d) {
     const issueKey = d.issueKey;
     d.replacements = d.replacements || {};
-    d.replacements.default = t.html('inspector.unknown');  // special key `default` works as a fallback string
-    return t.html(`QA.improveOSM.error_types.${issueKey}.title`, d.replacements);
+    d.replacements.default = context.tHtml('inspector.unknown');  // special key `default` works as a fallback string
+    return context.tHtml(`QA.improveOSM.error_types.${issueKey}.title`, d.replacements);
   }
 
 
   function improveOsmHeader(selection) {
     let iconFill = 0xffffff;
-    const service = services.improveOSM;
-    if (service) {
-      iconFill = service.getColor(_qaItem?.itemType);
+    const improveosm = context.services.get('improveOSM');
+    if (improveosm) {
+      iconFill = improveosm.getColor(_qaItem?.itemType);
     }
 
     const header = selection.selectAll('.qa-header')
@@ -47,7 +44,7 @@ export function uiImproveOsmHeader() {
 
     svgEnter
       .append('polygon')
-      .attr('fill', PIXI.utils.hex2string(iconFill))
+      .attr('fill', new Color(iconFill).toHex())
       .attr('stroke', '#333')
       .attr('points', '16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6');
 
diff --git a/modules/ui/index.js b/modules/ui/index.js
index ebf059dc8d..7c183fd065 100644
--- a/modules/ui/index.js
+++ b/modules/ui/index.js
@@ -1,4 +1,3 @@
-export { uiInit } from './init';
 export { uiAccount } from './account';
 export { uiAttribution } from './attribution';
 export { uiChangesetEditor } from './changeset_editor';
@@ -17,7 +16,7 @@ export { uiEditMenu } from './edit_menu';
 export { uiEntityEditor } from './entity_editor';
 export { uiFeatureInfo } from './feature_info';
 export { uiFeatureList } from './feature_list';
-export { uiField } from './field';
+export { UiField } from './UiField';
 // export { uiFieldHelp } from './field_help';
 export { uiFlash } from './flash';
 export { uiFormFields } from './form_fields';
@@ -28,6 +27,7 @@ export { uiImproveOsmComments } from './improveOSM_comments';
 export { uiImproveOsmDetails } from './improveOSM_details';
 export { uiImproveOsmEditor } from './improveOSM_editor';
 export { uiImproveOsmHeader } from './improveOSM_header';
+export { uiIntro } from './intro/intro';
 export { uiInfo } from './info';
 export { uiInspector } from './inspector';
 export { uiIssuesInfo } from './issues_info';
@@ -35,17 +35,34 @@ export { uiKeepRightDetails } from './keepRight_details';
 export { uiKeepRightEditor } from './keepRight_editor';
 export { uiKeepRightHeader } from './keepRight_header';
 export { uiLoading } from './loading';
+export { uiMap3dViewer } from './map3d_viewer';
 export { uiMapInMap } from './map_in_map';
 export { uiModal } from './modal';
 export { uiNoteComments } from './note_comments';
 export { uiNoteEditor } from './note_editor';
 export { uiNoteHeader } from './note_header';
 export { uiNoteReport } from './note_report';
+export { uiOsmoseDetails } from './osmose_details';
+export { uiOsmoseEditor } from './osmose_editor';
+export { uiOsmoseHeader } from './osmose_header';
+export { uiPane } from './pane';
+export { uiPhotoViewer } from './photo_viewer';
 export { uiPopover } from './popover';
 export { uiPresetIcon } from './preset_icon';
 export { uiPresetList } from './preset_list';
+export { uiRapidColorpicker } from './rapid_colorpicker';
+export { uiRapidFeatureInspector } from './rapid_feature_inspector';
+export { uiRapidFeatureToggleDialog } from './rapid_feature_toggle_dialog';
+export { uiRapidFirstEditDialog } from './rapid_first_edit_dialog';
+export { uiRapidPowerUserFeaturesDialog } from './rapid_poweruser_features_dialog';
+export { uiRapidServiceLicense } from './rapid_service_license';
+export { uiRapidSplash } from './rapid_splash';
+export { uiRapidViewManageDatasets } from './rapid_view_manage_datasets';
+export { uiRapidWhatsNew } from './rapid_whatsnew';
 export { uiRestore } from './restore';
 export { uiScale } from './scale';
+export { uiSection } from './section';
+export { uiShortcuts } from './shortcuts';
 export { uiSidebar } from './sidebar';
 export { uiSourceSwitch } from './source_switch';
 export { uiSpinner } from './spinner';
@@ -55,17 +72,10 @@ export { uiSuccess } from './success';
 export { uiTagReference } from './tag_reference';
 export { uiToggle } from './toggle';
 export { uiTooltip } from './tooltip';
+export { uiTopToolbar } from './top_toolbar';
 export { uiVersion } from './version';
-export { uiViewOnOSM } from './view_on_osm';
 export { uiViewOnKeepRight } from './view_on_keepRight';
+export { uiViewOnOSM } from './view_on_osm';
+export { uiViewOnOsmose } from './view_on_osmose';
 export { uiZoom } from './zoom';
-
-export { uiRapidColorpicker } from './rapid_colorpicker';
-export { uiRapidFeatureInspector } from './rapid_feature_inspector';
-export { uiRapidFirstEditDialog } from './rapid_first_edit_dialog';
-export { uiRapidFeatureToggleDialog } from './rapid_feature_toggle_dialog';
-export { uiRapidPowerUserFeaturesDialog } from './rapid_poweruser_features_dialog';
-export { uiRapidServiceLicense } from './rapid_service_license';
-export { uiRapidSplash } from './rapid_splash';
-export { uiRapidWhatsNew } from './rapid_whatsnew';
-export { uiRapidViewManageDatasets } from './rapid_view_manage_datasets';
+export { uiZoomToSelection } from './zoom_to_selection';
diff --git a/modules/ui/info.js b/modules/ui/info.js
index 32ea5a67bb..f284164d2e 100644
--- a/modules/ui/info.js
+++ b/modules/ui/info.js
@@ -1,6 +1,5 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 import { uiCmd } from './cmd';
 
@@ -138,7 +137,7 @@ export function uiInfo(context) {
 
     // bind ⌘I to show/hide all panels
     context.keybinding()
-      .on(uiCmd('⌘' + t('info_panels.key')), e => {
+      .on(uiCmd('⌘' + context.t('info_panels.key')), e => {
         e.stopImmediatePropagation();
         e.preventDefault();
         info.toggle();
@@ -146,7 +145,7 @@ export function uiInfo(context) {
 
     // bind keys to show/hide individual panels
     panelIDs.forEach(k => {
-      const key = t(`info_panels.${k}.key`, { default: null });
+      const key = context.t(`info_panels.${k}.key`, { default: null });
       if (!key) return;
 
       context.keybinding()
diff --git a/modules/ui/inspector.js b/modules/ui/inspector.js
index 3673670b7b..db6ac11a11 100644
--- a/modules/ui/inspector.js
+++ b/modules/ui/inspector.js
@@ -74,7 +74,7 @@ export function uiInspector(context) {
             if (context.graph().parentRelations(entity).length) return false;
 
             // show vertex issues if there are any
-            if (context.validator().getEntityIssues(entityID).length) return false;
+            if (context.validationSystem().getEntityIssues(entityID).length) return false;
 
             // show turn retriction editor for junction vertices
             if (entity.isHighwayIntersection(context.graph())) return false;
diff --git a/modules/ui/intro/UiCurtain.js b/modules/ui/intro/UiCurtain.js
index 74ea390a61..dc00e711ac 100644
--- a/modules/ui/intro/UiCurtain.js
+++ b/modules/ui/intro/UiCurtain.js
@@ -2,7 +2,6 @@ import { Extent, vecAdd } from '@rapid-sdk/math';
 import { easeLinear as d3_easeLinear } from 'd3-ease';
 import { select as d3_select } from 'd3-selection';
 
-import { localizer } from '../../core/localizer';
 import { uiToggle } from '../toggle';
 
 function clamp(num, min, max) {
@@ -82,7 +81,7 @@ export class UiCurtain {
 
     // register event handlers
     d3_select(window).on('resize.curtain', this.resize);
-    this.context.map().on('move', this.redraw);
+    this.context.mapSystem().on('move', this.redraw);
 
     this.resize();   // get the width/height
   }
@@ -109,7 +108,7 @@ export class UiCurtain {
 
     // unregister event handlers
     d3_select(window).on('resize.curtain', null);
-    this.context.map().off('move', this.redraw);
+    this.context.mapSystem().off('move', this.redraw);
   }
 
 
@@ -390,7 +389,7 @@ export class UiCurtain {
       } else {   // tooltip to the side of the reveal..
         tipY = reveal.top + (reveal.height / 2) - (tip.height / 2);
 
-        if (localizer.textDirection() === 'rtl') {
+        if (this.context.localizationSystem().textDirection() === 'rtl') {
           if (reveal.left - tip.width - ARROW < 70) {
             placement = 'right';
             tipX = reveal.right + ARROW;
diff --git a/modules/ui/intro/area.js b/modules/ui/intro/area.js
index 6729b1a2b9..14b65ff01f 100644
--- a/modules/ui/intro/area.js
+++ b/modules/ui/intro/area.js
@@ -2,9 +2,6 @@ import { Extent } from '@rapid-sdk/math';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { interpolateNumber as d3_interpolateNumber } from 'd3-interpolate';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
-import { modeSelect } from '../../modes/select';
 import { utilRebind } from '../../util/rebind';
 import { delayAsync, eventCancel, helpHtml, icon, showEntityEditor, showPresetList, transitionTime } from './helper';
 
@@ -13,16 +10,19 @@ export function uiIntroArea(context, curtain) {
   const dispatch = d3_dispatch('done');
   const chapter = { title: 'intro.areas.title' };
   const container = context.container();
-  const history = context.history();
-  const map = context.map();
+  const editSystem = context.editSystem();
+  const mapSystem = context.mapSystem();
+  const presetSystem = context.presetSystem();
 
   const playgroundExtent = new Extent([-85.63575, 41.94137], [-85.63526, 41.94180]);
-  const playgroundPreset = presetManager.item('leisure/playground');
-  const nameField = presetManager.field('name');
-  const descriptionField = presetManager.field('description');
+  const playgroundPreset = presetSystem.item('leisure/playground');
+  const nameField = presetSystem.field('name');
+  const descriptionField = presetSystem.field('description');
 
   let _chapterCancelled = false;
   let _rejectStep = null;
+  let _onModeChange = null;
+  let _onEditChange = null;
   let _areaID = null;
 
 
@@ -32,7 +32,7 @@ export function uiIntroArea(context, curtain) {
   }
 
   function _isAreaSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === _areaID;
   }
@@ -55,20 +55,22 @@ export function uiIntroArea(context, curtain) {
   // Click "Add Area" button to advance
   function addAreaAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
     _areaID = null;
 
     const loc = playgroundExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19.5, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onModeChange = () => resolve(startPlaygroundAsync);
+
         const tooltip = curtain.reveal({
           revealSelector: 'button.draw-area',
-          tipHtml: helpHtml('intro.areas.add_playground')
+          tipHtml: helpHtml(context, 'intro.areas.add_playground')
         });
 
         tooltip.selectAll('.popover-inner')
@@ -76,11 +78,9 @@ export function uiIntroArea(context, curtain) {
           .attr('class', 'tooltip-illustration')
           .append('use')
           .attr('xlink:href', '#rapid-graphic-areas');
-
-        context.on('enter.intro', () => resolve(startPlaygroundAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -93,17 +93,8 @@ export function uiIntroArea(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      const textID = (context.lastPointerType() === 'mouse') ? 'click' : 'tap';
-      const startDrawString = helpHtml('intro.areas.start_playground') +
-        helpHtml(`intro.areas.starting_node_${textID}`);
-
-      curtain.reveal({
-        revealExtent: playgroundExtent,
-        tipHtml: startDrawString
-      });
-
-      history.on('change.intro', difference => {
+      _onModeChange = reject;  // disallow mode change
+      _onEditChange = (difference) => {
         if (!difference) return;
         for (const entity of difference.created()) {  // created a node and a way
           if (entity.type === 'way') {
@@ -111,13 +102,20 @@ export function uiIntroArea(context, curtain) {
             resolve(continuePlaygroundAsync);
           }
         }
-      });
+      };
 
-      context.on('enter.intro', reject);   // disallow mode change
+      const textID = (context.lastPointerType === 'mouse') ? 'click' : 'tap';
+      const startDrawString = helpHtml(context, 'intro.areas.start_playground') +
+        helpHtml(context, `intro.areas.starting_node_${textID}`);
+
+      curtain.reveal({
+        revealExtent: playgroundExtent,
+        tipHtml: startDrawString
+      });
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -129,26 +127,24 @@ export function uiIntroArea(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      curtain.reveal({
-        revealExtent: playgroundExtent,
-        tipHtml: helpHtml('intro.areas.continue_playground')
-      });
-
-      history.on('change.intro', difference => {
+      _onModeChange = reject;  // disallow mode change
+      _onEditChange = (difference) => {
         if (!difference) return;
         for (const entity of difference.modified()) {  // modified the way
           if (entity.id === _areaID && entity.nodes.length > 5) {
             resolve(finishPlaygroundAsync);
           }
         }
-      });
+      };
 
-      context.on('enter.intro', reject);   // disallow mode change
+      curtain.reveal({
+        revealExtent: playgroundExtent,
+        tipHtml: helpHtml(context, 'intro.areas.continue_playground')
+      });
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -160,20 +156,19 @@ export function uiIntroArea(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(searchPresetAsync);
 
-      const textID = (context.lastPointerType() === 'mouse') ? 'click' : 'tap';
-      const finishString = helpHtml(`intro.areas.finish_area_${textID}`) +
-        helpHtml('intro.areas.finish_playground');
+      const textID = (context.lastPointerType === 'mouse') ? 'click' : 'tap';
+      const finishString = helpHtml(context, `intro.areas.finish_area_${textID}`) +
+        helpHtml(context, 'intro.areas.finish_playground');
 
       curtain.reveal({
         revealExtent: playgroundExtent,
         tipHtml: finishString
       });
-
-      context.on('enter.intro', () => resolve(searchPresetAsync));
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -184,14 +179,27 @@ export function uiIntroArea(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesAreaExist()) { resolve(addAreaAsync); return; }
-        if (!_isAreaSelected()) context.enter(modeSelect(context, [_areaID]));
+        if (!_isAreaSelected()) context.enter('select-osm', { selectedIDs: [_areaID] });
+
+        _onModeChange = reject;   // disallow mode change;
+        _onEditChange = (difference) => {
+          if (!difference) return;
+          const modified = difference.modified();
+          if (modified.length === 1) {
+            if (presetSystem.match(modified[0], context.graph()) === playgroundPreset) {
+              resolve(clickAddFieldAsync);
+            } else {
+              reject();  // didn't pick playground
+            }
+          }
+        };
 
         showPresetList(container);
         container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
 
         curtain.reveal({
           revealSelector: '.preset-search-input',
-          tipHtml: helpHtml('intro.areas.search_playground', { preset: playgroundPreset.name() })
+          tipHtml: helpHtml(context, 'intro.areas.search_playground', { preset: playgroundPreset.name() })
         });
 
         container.select('.preset-search-input')
@@ -207,31 +215,17 @@ export function uiIntroArea(context, curtain) {
           curtain.reveal({
             revealNode: first.select('.preset-list-button').node(),
             revealPadding: 5,
-            tipHtml: helpHtml('intro.areas.search_playground', { preset: playgroundPreset.name() })
+            tipHtml: helpHtml(context, 'intro.areas.search_playground', { preset: playgroundPreset.name() })
           });
 
           container.select('.preset-search-input')
             .on('keydown.intro', eventCancel, true)   // no more typing
             .on('keyup.intro', null);
         }
-
-        history.on('change.intro', difference => {
-          if (!difference) return;
-          const modified = difference.modified();
-          if (modified.length === 1) {
-            if (presetManager.match(modified[0], context.graph()) === playgroundPreset) {
-              resolve(clickAddFieldAsync);
-            } else {
-              reject();  // didn't pick playground
-            }
-          }
-        });
-
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
         container.select('.preset-search-input').on('keydown.intro keyup.intro', null);
       });
@@ -246,16 +240,13 @@ export function uiIntroArea(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesAreaExist()) { resolve(addAreaAsync); return; }
-        if (!_isAreaSelected()) context.enter(modeSelect(context, [_areaID]));
+        if (!_isAreaSelected()) context.enter('select-osm', { selectedIDs: [_areaID] });
 
         if (!container.select('.form-field-description').empty()) {  // has description field already
           resolve(describePlaygroundAsync);
           return;
         }
 
-        showEntityEditor(container);
-        container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
-
         // It's possible for the user to add a description in a previous step..
         // If they did this already, just complete this chapter
         const entity = context.entity(_areaID);
@@ -264,6 +255,11 @@ export function uiIntroArea(context, curtain) {
           return;
         }
 
+        _onModeChange = reject;   // disallow mode change;
+
+        showEntityEditor(container);
+        container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
+
         // scroll "Add field" into view
         const box = container.select('.more-fields').node().getBoundingClientRect();
         if (box.top > 300) {
@@ -287,7 +283,7 @@ export function uiIntroArea(context, curtain) {
           curtain.reveal({
             revealSelector: '.more-fields .combobox-input',
             revealPadding: 5,
-            tipHtml: helpHtml('intro.areas.add_field', {
+            tipHtml: helpHtml(context, 'intro.areas.add_field', {
               name: nameField.label(),
               description: descriptionField.label()
             })
@@ -305,10 +301,9 @@ export function uiIntroArea(context, curtain) {
             });
         }, 300);  // after "Add Field" visible
 
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
         container.select('.more-fields .combobox-input').on('click.intro', null);
       });
@@ -333,6 +328,7 @@ export function uiIntroArea(context, curtain) {
     let watcher;
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change;
 
       // Watch for the combobox to close..
       watcher = window.setInterval(() => {
@@ -353,14 +349,13 @@ export function uiIntroArea(context, curtain) {
       curtain.reveal({
         revealSelector: 'div.combobox',
         revealPadding: 5,
-        tipHtml: helpHtml('intro.areas.choose_field', { field: descriptionField.label() })
+        tipHtml: helpHtml(context, 'intro.areas.choose_field', { field: descriptionField.label() })
       });
 
-      context.on('enter.intro', reject);   // disallow mode change
     })
     .finally(() => {
+      _onModeChange = null;
       if (watcher) window.clearInterval(watcher);
-      context.on('enter.intro', null);
     });
   }
 
@@ -377,17 +372,17 @@ export function uiIntroArea(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(playAsync);
+
       showEntityEditor(container);
 
       curtain.reveal({
         revealSelector: '.entity-editor-pane',
-        tipHtml: helpHtml('intro.areas.describe_playground', { button: icon('#rapid-icon-close', 'inline') })
+        tipHtml: helpHtml(context, 'intro.areas.describe_playground', { button: icon('#rapid-icon-close', 'inline') })
       });
-
-      context.on('enter.intro', () => resolve(playAsync));
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -400,19 +395,18 @@ export function uiIntroArea(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change;
       showEntityEditor(container);
 
       curtain.reveal({
         revealSelector: '.entity-editor-pane',
-        tipHtml: helpHtml('intro.areas.retry_add_field', { field: descriptionField.label() }),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.areas.retry_add_field', { field: descriptionField.label() }),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(clickAddFieldAsync)
       });
-
-      context.on('enter.intro', reject);   // disallow mode change
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -424,8 +418,8 @@ export function uiIntroArea(context, curtain) {
     curtain.reveal({
       revealSelector: '.ideditor',
       tipSelector: '.intro-nav-wrap .chapter-line',
-      tipHtml: helpHtml('intro.areas.play', { next: t('intro.lines.title') }),
-      buttonText: t.html('intro.ok'),
+      tipHtml: helpHtml(context, 'intro.areas.play', { next: context.t('intro.lines.title') }),
+      buttonText: context.tHtml('intro.ok'),
       buttonCallback: () => curtain.reveal({ revealSelector: '.ideditor' })  // re-reveal but without the tooltip
     });
     return Promise.resolve();
@@ -435,9 +429,25 @@ export function uiIntroArea(context, curtain) {
   chapter.enter = () => {
     _chapterCancelled = false;
     _rejectStep = null;
+    _onModeChange = null;
+    _onEditChange = null;
+
+    context.on('modechange', _modeChangeListener);
+    editSystem.on('change', _editChangeListener);
 
     runAsync(addAreaAsync)
-      .catch(e => { if (e instanceof Error) console.error(e); });  // eslint-disable-line no-console
+      .catch(e => { if (e instanceof Error) console.error(e); })   // eslint-disable-line no-console
+      .finally(() => {
+        context.off('modechange', _modeChangeListener);
+        editSystem.off('change', _editChangeListener);
+      });
+
+    function _modeChangeListener(mode) {
+      if (typeof _onModeChange === 'function') _onModeChange(mode);
+    }
+    function _editChangeListener(difference) {
+      if (typeof _onEditChange === 'function') _onEditChange(difference);
+    }
   };
 
 
diff --git a/modules/ui/intro/building.js b/modules/ui/intro/building.js
index a23832ce61..00f7463492 100644
--- a/modules/ui/intro/building.js
+++ b/modules/ui/intro/building.js
@@ -2,10 +2,7 @@ import { Extent } from '@rapid-sdk/math';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { utilArrayUniq } from '@rapid-sdk/util';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
 import { actionChangePreset } from '../../actions/change_preset';
-import { modeSelect } from '../../modes/select';
 import { utilRebind } from '../../util';
 import { delayAsync, eventCancel, helpHtml, isMostlySquare, showPresetList, transitionTime } from './helper';
 
@@ -15,17 +12,21 @@ export function uiIntroBuilding(context, curtain) {
   const chapter = { title: 'intro.buildings.title' };
   const editMenu = context.ui().editMenu();
   const container = context.container();
-  const history = context.history();
-  const map = context.map();
+  const editSystem = context.editSystem();
+  const mapSystem = context.mapSystem();
+  const presetSystem = context.presetSystem();
 
   const houseExtent = new Extent([-85.62836, 41.95622], [-85.62791, 41.95654]);
   const tankExtent = new Extent([-85.62766, 41.95324], [-85.62695, 41.95372]);
-  const buildingCatetory = presetManager.item('category-building');
-  const housePreset = presetManager.item('building/house');
-  const tankPreset = presetManager.item('man_made/storage_tank');
+  const buildingCatetory = presetSystem.item('category-building');
+  const housePreset = presetSystem.item('building/house');
+  const tankPreset = presetSystem.item('man_made/storage_tank');
 
   let _chapterCancelled = false;
   let _rejectStep = null;
+  let _onMapMove = null;
+  let _onModeChange = null;
+  let _onEditChange = null;
   let _houseID = null;
   let _tankID = null;
 
@@ -36,7 +37,7 @@ export function uiIntroBuilding(context, curtain) {
   }
 
   function _isHouseSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === _houseID;
   }
@@ -46,7 +47,7 @@ export function uiIntroBuilding(context, curtain) {
   }
 
   function _isTankSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === _tankID;
   }
@@ -69,20 +70,22 @@ export function uiIntroBuilding(context, curtain) {
   // Click Add Area to advance
   function addHouseAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
     _houseID = null;
 
     const loc = houseExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onModeChange = () => resolve(startHouseAsync);
+
         const tooltip = curtain.reveal({
           revealSelector: 'button.draw-area',
-          tipHtml: helpHtml('intro.buildings.add_building')
+          tipHtml: helpHtml(context, 'intro.buildings.add_building')
         });
 
         tooltip.selectAll('.popover-inner')
@@ -90,11 +93,9 @@ export function uiIntroBuilding(context, curtain) {
           .attr('class', 'tooltip-illustration')
           .append('use')
           .attr('xlink:href', '#rapid-graphic-buildings');
-
-        context.on('enter.intro', () => resolve(startHouseAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -104,22 +105,14 @@ export function uiIntroBuilding(context, curtain) {
   function startHouseAsync() {
     _houseID = null;
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(houseExtent.center(), 20, 200)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (context.mode().id !== 'draw-area') { resolve(addHouseAsync); return; }
 
-        const textID = (context.lastPointerType() === 'mouse') ? 'click' : 'tap';
-        const startString = helpHtml('intro.buildings.start_building') +
-          helpHtml(`intro.buildings.building_corner_${textID}`);
-
-        curtain.reveal({
-          revealExtent: houseExtent,
-          tipHtml: startString
-        });
-
-        history.on('change.intro', difference => {
+        _onModeChange = reject;   // disallow mode change
+        _onEditChange = (difference) => {
           if (!difference) return;
           for (const entity of difference.created()) {  // created a node and a way
             if (entity.type === 'way') {
@@ -127,13 +120,21 @@ export function uiIntroBuilding(context, curtain) {
               resolve(continueHouseAsync);
             }
           }
+        };
+
+        const textID = (context.lastPointerType === 'mouse') ? 'click' : 'tap';
+        const startString = helpHtml(context, 'intro.buildings.start_building') +
+          helpHtml(context, `intro.buildings.building_corner_${textID}`);
+
+        curtain.reveal({
+          revealExtent: houseExtent,
+          tipHtml: startString
         });
 
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
       });
   }
 
@@ -145,17 +146,7 @@ export function uiIntroBuilding(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      const textID = (context.lastPointerType() === 'mouse') ? 'click' : 'tap';
-      const continueString = helpHtml('intro.buildings.continue_building') + '{br}' +
-        helpHtml(`intro.areas.finish_area_${textID}`) + helpHtml('intro.buildings.finish_building');
-
-      curtain.reveal({
-        revealExtent: houseExtent,
-        tipHtml: continueString
-      });
-
-      context.on('enter.intro', () => {
+      _onModeChange = () => {
         if (_doesHouseExist() && _isHouseSelected()) {
           const graph = context.graph();
           const way = context.entity(_houseID);
@@ -171,10 +162,20 @@ export function uiIntroBuilding(context, curtain) {
         } else {
           reject();  // disallow mode change
         }
+      };
+
+      const textID = (context.lastPointerType === 'mouse') ? 'click' : 'tap';
+      const continueString = helpHtml(context, 'intro.buildings.continue_building') + '{br}' +
+        helpHtml(context, `intro.areas.finish_area_${textID}`) + helpHtml(context, 'intro.buildings.finish_building');
+
+      curtain.reveal({
+        revealExtent: houseExtent,
+        tipHtml: continueString
       });
+
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -187,8 +188,8 @@ export function uiIntroBuilding(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: houseExtent,
-        tipHtml: helpHtml('intro.buildings.retry_building'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.buildings.retry_building'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(addHouseAsync)
       });
     });
@@ -201,8 +202,11 @@ export function uiIntroBuilding(context, curtain) {
     return delayAsync()  // after preset pane visible
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+
         if (!_doesHouseExist()) { resolve(addHouseAsync); return; }
-        if (!_isHouseSelected()) context.enter(modeSelect(context, [_houseID]));
+        if (!_isHouseSelected()) context.enter('select-osm', { selectedIDs: [_houseID] });
+
+        _onModeChange = reject;   // disallow mode change
 
         showPresetList(container);
         container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
@@ -211,17 +215,15 @@ export function uiIntroBuilding(context, curtain) {
         curtain.reveal({
           revealNode: button.node(),
           revealPadding: 5,
-          tipHtml: helpHtml('intro.buildings.choose_category_building', { category: buildingCatetory.name() })
+          tipHtml: helpHtml(context, 'intro.buildings.choose_category_building', { category: buildingCatetory.name() })
         });
 
         button.on('click.intro', () => resolve(choosePresetHouse));
-
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
+        _onModeChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
         container.select('.preset-list-button').on('click.intro', null);
-        context.on('enter.intro', null);
       });
   }
 
@@ -232,38 +234,39 @@ export function uiIntroBuilding(context, curtain) {
     return delayAsync()  // after preset pane visible
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
-        if (!_doesHouseExist()) { resolve(addHouseAsync); return; }
-        if (!_isHouseSelected()) context.enter(modeSelect(context, [_houseID]));
-
-        showPresetList(container);
-        container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
 
-        const button = container.select('.preset-building-house .preset-list-button');
-        curtain.reveal({
-          revealNode: button.node(),
-          revealPadding: 5,
-          tipHtml: helpHtml('intro.buildings.choose_preset_house', { preset: housePreset.name() })
-        });
+        if (!_doesHouseExist()) { resolve(addHouseAsync); return; }
+        if (!_isHouseSelected()) context.enter('select-osm', { selectedIDs: [_houseID] });
 
-        history.on('change.intro', difference => {
+        _onModeChange = reject;   // disallow mode change
+        _onEditChange = (difference) => {
           if (!difference) return;
           const modified = difference.modified();
           if (modified.length === 1) {
-            if (presetManager.match(modified[0], context.graph()) === housePreset) {
+            if (presetSystem.match(modified[0], context.graph()) === housePreset) {
               resolve(hasHouseAsync);
             } else {
               resolve(chooseCategoryBuildingAsync);  // didn't pick house, retry
             }
           }
+        };
+
+        showPresetList(container);
+        container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
+
+        const button = container.select('.preset-building-house .preset-list-button');
+        curtain.reveal({
+          revealNode: button.node(),
+          revealPadding: 5,
+          tipHtml: helpHtml(context, 'intro.buildings.choose_preset_house', { preset: housePreset.name() })
         });
 
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
+        _onModeChange = null;
+        _onEditChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
         container.select('.preset-list-button').on('click.intro', null);
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
       });
   }
 
@@ -274,10 +277,10 @@ export function uiIntroBuilding(context, curtain) {
 
     // Make sure it's still a house, in case user somehow changed it..
     const entity = context.entity(_houseID);
-    const oldPreset = presetManager.match(entity, context.graph());
+    const oldPreset = presetSystem.match(entity, context.graph());
     context.replace(actionChangePreset(_houseID, oldPreset, housePreset));
 
-    history.checkpoint('hasHouse');
+    editSystem.setCheckpoint('hasHouse');
     return Promise.resolve(rightClickHouseAsync);  // advance
   }
 
@@ -285,32 +288,31 @@ export function uiIntroBuilding(context, curtain) {
   // "Right-click to select the building you created and show the edit menu."
   // Open the edit menu to advance
   function rightClickHouseAsync() {
-    if (!['browse', 'select'].includes(context.mode().id)) context.enter('browse');
-    history.reset('hasHouse');
+    if (!['browse', 'select-osm'].includes(context.mode().id)) context.enter('browse');
+    editSystem.resetToCheckpoint('hasHouse');
 
     // make sure user is zoomed in enough to actually see orthagonalize do something
-    const setZoom = Math.max(map.zoom(), 20);
+    const setZoom = Math.max(mapSystem.zoom(), 20);
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(houseExtent.center(), setZoom, 100)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onEditChange = reject;  // disallow doing anything else
 
-        const textID = (context.lastPointerType() === 'mouse') ? 'rightclick_building' : 'edit_menu_building_touch';
+        const textID = (context.lastPointerType === 'mouse') ? 'rightclick_building' : 'edit_menu_building_touch';
         curtain.reveal({
           revealExtent: houseExtent,
-          tipHtml: helpHtml(`intro.buildings.${textID}`)
+          tipHtml: helpHtml(context, `intro.buildings.${textID}`)
         });
 
         editMenu.on('toggled.intro', open => {
           if (open) resolve(clickSquareAsync);
         });
-
-        history.on('change.intro', reject);  // disallow doing anything else
       }))
       .finally(() => {
+        _onEditChange = null;
         editMenu.on('toggled.intro', null);
-        history.on('change.intro', null);
       });
   }
 
@@ -322,51 +324,49 @@ export function uiIntroBuilding(context, curtain) {
     const buttonNode = container.select('.edit-menu-item-orthogonalize').node();
     if (!buttonNode) return Promise.resolve(rightClickHouseAsync);   // no Square button, try again
 
-    let revealEditMenu;
-
     return delayAsync()  // after edit menu fully visible
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesHouseExist() || !_isHouseSelected()) { resolve(rightClickHouseAsync); return; }
 
-        revealEditMenu = (duration = 0) => {
+        const revealEditMenu = (duration = 0) => {
           const menuNode = container.select('.edit-menu').node();
           if (menuNode) {
             curtain.reveal({
               duration: duration,
               revealNode: menuNode,
               revealPadding: 50,
-              tipHtml: helpHtml('intro.buildings.square_building')
+              tipHtml: helpHtml(context, 'intro.buildings.square_building')
             });
           } else {
             reject();   // menu has gone away - user scrolled it offscreen?
           }
         };
 
-        revealEditMenu(250);             // first time revealing menu, transition curtain to the menu
-        map.on('move', revealEditMenu);  // on map moves, have the curtain follow the menu immediately
-
-        history.on('change.intro', () => {
-          map.off('move', revealEditMenu);
-          history.on('change.intro', null);
+        _onModeChange = reject;   // disallow mode change
+        _onEditChange = () => {
+          _onEditChange = null;
+          _onMapMove = null;
           curtain.reveal({ revealExtent: houseExtent });  // watch it change
           resolve();
-        });
+        };
+        _onMapMove = revealEditMenu;     // on map moves, have the curtain follow the menu immediately
+
+        revealEditMenu(250);             // first time revealing menu, transition curtain to the menu
 
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .then(delayAsync)   // wait for orthogonalize transtion to complete
       .then(() => {       // then check undo annotation to see what the user did
-        if (history.undoAnnotation() === t('operations.orthogonalize.annotation.feature', { n: 1 })) {
+        if (editSystem.undoAnnotation() === context.t('operations.orthogonalize.annotation.feature', { n: 1 })) {
           return doneSquareAsync;
         } else {
           return retryClickSquareAsync;
         }
       })
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
-        if (revealEditMenu) map.off('move', revealEditMenu);
+        _onMapMove = null;
+        _onModeChange = null;
+        _onEditChange = null;
       });
   }
 
@@ -380,8 +380,8 @@ export function uiIntroBuilding(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: houseExtent,
-        tipHtml: helpHtml('intro.buildings.retry_square'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.buildings.retry_square'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(rightClickHouseAsync)
       });
     });
@@ -391,14 +391,14 @@ export function uiIntroBuilding(context, curtain) {
   // "See how the corners of the building moved into place? Let's learn another useful trick."
   // Click Ok to advance
   function doneSquareAsync() {
-    history.checkpoint('doneSquare');
+    editSystem.setCheckpoint('doneSquare');
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: houseExtent,
-        tipHtml: helpHtml('intro.buildings.done_square'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.buildings.done_square'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(addTankAsync)
       });
     });
@@ -409,25 +409,26 @@ export function uiIntroBuilding(context, curtain) {
   // Click Add Area to advance
   function addTankAsync() {
     context.enter('browse');
-    history.reset('doneSquare');
+    editSystem.resetToCheckpoint('doneSquare');
     _tankID = null;
 
     const loc = tankExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19.5, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onModeChange = () => resolve(startTankAsync);
+
         curtain.reveal({
           revealSelector: 'button.draw-area',
-          tipHtml: helpHtml('intro.buildings.add_tank')
+          tipHtml: helpHtml(context, 'intro.buildings.add_tank')
         });
-        context.on('enter.intro', () => resolve(startTankAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -440,17 +441,8 @@ export function uiIntroBuilding(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      const textID = context.lastPointerType() === 'mouse' ? 'click' : 'tap';
-      const startString = helpHtml('intro.buildings.start_tank') +
-        helpHtml(`intro.buildings.tank_edge_${textID}`);
-
-      curtain.reveal({
-        revealExtent: tankExtent,
-        tipHtml: startString
-      });
-
-      history.on('change.intro', difference => {
+      _onModeChange = reject;   // disallow mode change
+      _onEditChange = (difference) => {
         if (!difference) return;
         for (const entity of difference.created()) {  // created a node and a way
           if (entity.type === 'way') {
@@ -458,13 +450,20 @@ export function uiIntroBuilding(context, curtain) {
             resolve(continueTankAsync);
           }
         }
-      });
+      };
 
-      context.on('enter.intro', reject);   // disallow mode change
+      const textID = context.lastPointerType === 'mouse' ? 'click' : 'tap';
+      const startString = helpHtml(context, 'intro.buildings.start_tank') +
+        helpHtml(context, `intro.buildings.tank_edge_${textID}`);
+
+      curtain.reveal({
+        revealExtent: tankExtent,
+        tipHtml: startString
+      });
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -476,26 +475,25 @@ export function uiIntroBuilding(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      const textID = context.lastPointerType() === 'mouse' ? 'click' : 'tap';
-      const continueString = helpHtml('intro.buildings.continue_tank') + '{br}' +
-        helpHtml(`intro.areas.finish_area_${textID}`) + helpHtml('intro.buildings.finish_tank');
-
-      curtain.reveal({
-        revealExtent: tankExtent,
-        tipHtml: continueString
-      });
-
-      context.on('enter.intro', () => {
+      _onModeChange = () => {
         if (_doesTankExist() && _isTankSelected()) {
           resolve(searchPresetTankAsync);
         } else {
           reject();
         }
+      };
+
+      const textID = context.lastPointerType === 'mouse' ? 'click' : 'tap';
+      const continueString = helpHtml(context, 'intro.buildings.continue_tank') + '{br}' +
+        helpHtml(context, `intro.areas.finish_area_${textID}`) + helpHtml(context, 'intro.buildings.finish_tank');
+
+      curtain.reveal({
+        revealExtent: tankExtent,
+        tipHtml: continueString
       });
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -508,7 +506,20 @@ export function uiIntroBuilding(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesTankExist()) { resolve(addTankAsync); return; }
-        if (!_isTankSelected()) context.enter(modeSelect(context, [_tankID]));
+        if (!_isTankSelected()) context.enter('select-osm', { selectedIDs: [_tankID] });
+
+        _onModeChange = reject;   // disallow mode change
+        _onEditChange = (difference) => {
+          if (!difference) return;
+          const modified = difference.modified();
+          if (modified.length === 1) {
+            if (presetSystem.match(modified[0], context.graph()) === tankPreset) {
+              resolve(hasTankAsync);
+            } else {
+              reject();  // didn't pick tank
+            }
+          }
+        };
 
         container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
 
@@ -516,7 +527,7 @@ export function uiIntroBuilding(context, curtain) {
 
         curtain.reveal({
           revealSelector: '.preset-search-input',
-          tipHtml: helpHtml('intro.buildings.search_tank', { preset: tankPreset.name() })
+          tipHtml: helpHtml(context, 'intro.buildings.search_tank', { preset: tankPreset.name() })
         });
 
         container.select('.preset-search-input')
@@ -532,31 +543,17 @@ export function uiIntroBuilding(context, curtain) {
           curtain.reveal({
             revealNode: first.select('.preset-list-button').node(),
             revealPadding: 5,
-            tipHtml: helpHtml('intro.buildings.choose_tank', { preset: tankPreset.name() })
+            tipHtml: helpHtml(context, 'intro.buildings.choose_tank', { preset: tankPreset.name() })
           });
 
           container.select('.preset-search-input')
             .on('keydown.intro', eventCancel, true)   // no more typing
             .on('keyup.intro', null);
         }
-
-        history.on('change.intro', difference => {
-          if (!difference) return;
-          const modified = difference.modified();
-          if (modified.length === 1) {
-            if (presetManager.match(modified[0], context.graph()) === tankPreset) {
-              resolve(hasTankAsync);
-            } else {
-              reject();  // didn't pick tank
-            }
-          }
-        });
-
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
         container.select('.preset-search-input').on('keydown.intro keyup.intro', null);
       });
@@ -569,10 +566,10 @@ export function uiIntroBuilding(context, curtain) {
 
     // Make sure it's still a tank, in case user somehow changed it..
     const entity = context.entity(_tankID);
-    const oldPreset = presetManager.match(entity, context.graph());
+    const oldPreset = presetSystem.match(entity, context.graph());
     context.replace(actionChangePreset(_tankID, oldPreset, tankPreset));
 
-    history.checkpoint('hasTank');
+    editSystem.setCheckpoint('hasTank');
     return Promise.resolve(rightClickTankAsync);  // advance
   }
 
@@ -580,27 +577,26 @@ export function uiIntroBuilding(context, curtain) {
   // "Right-click to select the storage tank you created and show the edit menu."
   // Open the edit menu to advance
   function rightClickTankAsync() {
-    if (!['browse', 'select'].includes(context.mode().id)) context.enter('browse');
-    history.reset('hasTank');
+    if (!['browse', 'select-osm'].includes(context.mode().id)) context.enter('browse');
+    editSystem.resetToCheckpoint('hasTank');
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onEditChange = reject;  // disallow doing anything else
 
-      const textID = (context.lastPointerType() === 'mouse') ? 'rightclick_tank' : 'edit_menu_tank_touch';
+      const textID = (context.lastPointerType === 'mouse') ? 'rightclick_tank' : 'edit_menu_tank_touch';
       curtain.reveal({
         revealExtent: tankExtent,
-        tipHtml: helpHtml(`intro.buildings.${textID}`)
+        tipHtml: helpHtml(context, `intro.buildings.${textID}`)
       });
 
       editMenu.on('toggled.intro', open => {
         if (open) resolve(clickCircleAsync);
       });
-
-      history.on('change.intro', reject);  // disallow doing anything else
     })
     .finally(() => {
+      _onEditChange = null;
       editMenu.on('toggled.intro', null);
-      history.on('change.intro', null);
     });
   }
 
@@ -611,51 +607,50 @@ export function uiIntroBuilding(context, curtain) {
     const buttonNode = container.select('.edit-menu-item-circularize').node();
     if (!buttonNode) return Promise.resolve(rightClickTankAsync);   // no Circularize button, try again
 
-    let revealEditMenu;
-
     return delayAsync()  // after edit menu fully visible
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesTankExist() || !_isTankSelected()) { resolve(rightClickTankAsync); return; }
 
-        revealEditMenu = (duration = 0) => {
+        _onModeChange = reject;   // disallow mode change
+
+        const revealEditMenu = (duration = 0) => {
           const menuNode = container.select('.edit-menu').node();
           if (menuNode) {
             curtain.reveal({
               duration: duration,
               revealNode: menuNode,
               revealPadding: 50,
-              tipHtml: helpHtml('intro.buildings.circle_tank')
+              tipHtml: helpHtml(context, 'intro.buildings.circle_tank')
             });
           } else {
             reject();   // menu has gone away - user scrolled it offscreen?
           }
         };
 
-        revealEditMenu(250);             // first time revealing menu, transition curtain to the menu
-        map.on('move', revealEditMenu);  // on map moves, have the curtain follow the menu immediately
-
-        history.on('change.intro', () => {
-          map.off('move', revealEditMenu);
-          history.on('change.intro', null);
+        _onEditChange = () => {
+          _onMapMove = null;
+          _onEditChange = null;
           curtain.reveal({ revealExtent: tankExtent });  // watch it change
           resolve();
-        });
+        };
+
+        _onMapMove = revealEditMenu;     // on map moves, have the curtain follow the menu immediately
+        revealEditMenu(250);             // first time revealing menu, transition curtain to the menu
 
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .then(delayAsync)   // wait for circularize transtion to complete
       .then(() => {       // then check undo annotation to see what the user did
-        if (history.undoAnnotation() === t('operations.circularize.annotation.feature', { n: 1 })) {
+        if (editSystem.undoAnnotation() === context.t('operations.circularize.annotation.feature', { n: 1 })) {
           return playAsync;
         } else {
           return retryClickCircleAsync;
         }
       })
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
-        if (revealEditMenu) map.off('move', revealEditMenu);
+        _onMapMove = null;
+        _onModeChange = null;
+        _onEditChange = null;
       });
   }
 
@@ -669,8 +664,8 @@ export function uiIntroBuilding(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: tankExtent,
-        tipHtml: helpHtml('intro.buildings.retry_circle'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.buildings.retry_circle'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(rightClickTankAsync)
       });
     });
@@ -684,8 +679,8 @@ export function uiIntroBuilding(context, curtain) {
     curtain.reveal({
       revealSelector: '.ideditor',
       tipSelector: '.intro-nav-wrap .chapter-rapid',
-      tipHtml: helpHtml('intro.buildings.play', { next: t('intro.rapid.title') }),
-      buttonText: t.html('intro.ok'),
+      tipHtml: helpHtml(context, 'intro.buildings.play', { next: context.t('intro.rapid.title') }),
+      buttonText: context.tHtml('intro.ok'),
       buttonCallback: () => curtain.reveal({ revealSelector: '.ideditor' })  // re-reveal but without the tooltip
     });
     return Promise.resolve();
@@ -695,9 +690,31 @@ export function uiIntroBuilding(context, curtain) {
   chapter.enter = () => {
     _chapterCancelled = false;
     _rejectStep = null;
+    _onMapMove = null;
+    _onModeChange = null;
+    _onEditChange = null;
+
+    context.on('modechange', _modeChangeListener);
+    mapSystem.on('move', _mapMoveListener);
+    editSystem.on('change', _editChangeListener);
 
     runAsync(addHouseAsync)
-      .catch(e => { if (e instanceof Error) console.error(e); });  // eslint-disable-line no-console
+      .catch(e => { if (e instanceof Error) console.error(e); })   // eslint-disable-line no-console
+      .finally(() => {
+        context.off('modechange', _modeChangeListener);
+        mapSystem.off('move', _mapMoveListener);
+        editSystem.off('change', _editChangeListener);
+      });
+
+    function _mapMoveListener() {
+      if (typeof _onMapMove === 'function') _onMapMove();
+    }
+    function _modeChangeListener(mode) {
+      if (typeof _onModeChange === 'function') _onModeChange(mode);
+    }
+    function _editChangeListener(difference) {
+      if (typeof _onEditChange === 'function') _onEditChange(difference);
+    }
   };
 
 
diff --git a/modules/ui/intro/helper.js b/modules/ui/intro/helper.js
index 81ec6899ac..2b9ee96909 100644
--- a/modules/ui/intro/helper.js
+++ b/modules/ui/intro/helper.js
@@ -1,14 +1,12 @@
-import { t, localizer } from '../../core/localizer';
 import { geoSphericalDistance, vecNormalizedDot } from '@rapid-sdk/math';
 import { uiCmd } from '../cmd';
 
 /**
  * insert an icon
  */
-export function icon(name, svgklass, useklass) {
-  return '<svg class="icon ' + (svgklass || '') + '">' +
-    '<use xlink:href="' + name + '"' +
-    (useklass ? ' class="' + useklass + '"' : '') + '></use></svg>';
+export function icon(name, klass) {
+  const svgklass = 'icon' + (klass ? ` ${klass}` : '');
+  return `<svg class="${svgklass}"><use xlink:href="${name}"></use></svg>`;
 }
 
 
@@ -25,7 +23,10 @@ export function eventCancel(d3_event) {
 // label replacements suitable for tutorials and documentation. Optionally supplemented
 // with custom `replacements`
 let helpStringReplacements;
-export function helpHtml(id, replacements) {
+export function helpHtml(context, id, replacements) {
+  const l10n = context.localizationSystem();
+  const isRTL = l10n.isRTL();
+
   // only load these the first time
   if (!helpStringReplacements) {
     helpStringReplacements = {
@@ -40,8 +41,8 @@ export function helpHtml(id, replacements) {
       data_icon: icon('#rapid-icon-data', 'inline'),
       inspect: icon('#rapid-icon-inspect', 'inline'),
       help_icon: icon('#rapid-icon-help', 'inline'),
-      undo_icon: icon(localizer.textDirection() === 'rtl' ? '#rapid-icon-redo' : '#rapid-icon-undo', 'inline'),
-      redo_icon: icon(localizer.textDirection() === 'rtl' ? '#rapid-icon-undo' : '#rapid-icon-redo', 'inline'),
+      undo_icon: icon(isRTL ? '#rapid-icon-redo' : '#rapid-icon-undo', 'inline'),
+      redo_icon: icon(isRTL ? '#rapid-icon-undo' : '#rapid-icon-redo', 'inline'),
       save_icon: icon('#rapid-icon-save', 'inline'),
 
       // operation icons
@@ -74,66 +75,66 @@ export function helpHtml(id, replacements) {
       pinch_icon: icon('#rapid-walkthrough-pinch-apart', 'inline operation'),
 
       // insert keys; may be localized and platform-dependent
-      shift: uiCmd.display('⇧'),
-      alt: uiCmd.display('⌥'),
-      return: uiCmd.display('↵'),
-      esc: t.html('shortcuts.key.esc'),
-      space: t.html('shortcuts.key.space'),
-      add_note_key: t.html('modes.add_note.key'),
-      help_key: t.html('help.key'),
-      shortcuts_key: t.html('shortcuts.toggle.key'),
+      shift: uiCmd.display(context, '⇧'),
+      alt: uiCmd.display(context, '⌥'),
+      return: uiCmd.display(context, '↵'),
+      esc: l10n.tHtml('shortcuts.key.esc'),
+      space: l10n.tHtml('shortcuts.key.space'),
+      add_note_key: l10n.tHtml('modes.add_note.key'),
+      help_key: l10n.tHtml('help.key'),
+      shortcuts_key: l10n.tHtml('shortcuts.toggle.key'),
 
       // reference localized UI labels directly so that they'll always match
-      save: t.html('save.title'),
-      undo: t.html('undo.title'),
-      redo: t.html('redo.title'),
-      upload: t.html('commit.save'),
-      point: t.html('modes.add_point.title'),
-      line: t.html('modes.add_line.title'),
-      area: t.html('modes.add_area.title'),
-      note: t.html('modes.add_note.label'),
-
-      circularize: t.html('operations.circularize.title'),
-      continue: t.html('operations.continue.title'),
-      copy: t.html('operations.copy.title'),
-      delete: t.html('operations.delete.title'),
-      disconnect: t.html('operations.disconnect.title'),
-      downgrade: t.html('operations.downgrade.title'),
-      extract: t.html('operations.extract.title'),
-      merge: t.html('operations.merge.title'),
-      move: t.html('operations.move.title'),
-      orthogonalize: t.html('operations.orthogonalize.title'),
-      paste: t.html('operations.paste.title'),
-      reflect_long: t.html('operations.reflect.title.long'),
-      reflect_short: t.html('operations.reflect.title.short'),
-      reverse: t.html('operations.reverse.title'),
-      rotate: t.html('operations.rotate.title'),
-      split: t.html('operations.split.title'),
-      straighten: t.html('operations.straighten.title'),
-
-      map_data: t.html('map_data.title'),
-      osm_notes: t.html('map_data.layers.notes.title'),
-      fields: t.html('inspector.fields'),
-      tags: t.html('inspector.tags'),
-      relations: t.html('inspector.relations'),
-      new_relation: t.html('inspector.new_relation'),
-      turn_restrictions: t.html('_tagging.presets.fields.restrictions.label'),
-      background_settings: t.html('background.description'),
-      imagery_offset: t.html('background.fix_misalignment'),
-      start_the_walkthrough: t.html('splash.walkthrough'),
-      help: t.html('help.title'),
-      ok: t.html('intro.ok')
+      save: l10n.tHtml('save.title'),
+      undo: l10n.tHtml('undo.title'),
+      redo: l10n.tHtml('redo.title'),
+      upload: l10n.tHtml('commit.save'),
+      point: l10n.tHtml('modes.add_point.title'),
+      line: l10n.tHtml('modes.add_line.title'),
+      area: l10n.tHtml('modes.add_area.title'),
+      note: l10n.tHtml('modes.add_note.label'),
+
+      circularize: l10n.tHtml('operations.circularize.title'),
+      continue: l10n.tHtml('operations.continue.title'),
+      copy: l10n.tHtml('operations.copy.title'),
+      delete: l10n.tHtml('operations.delete.title'),
+      disconnect: l10n.tHtml('operations.disconnect.title'),
+      downgrade: l10n.tHtml('operations.downgrade.title'),
+      extract: l10n.tHtml('operations.extract.title'),
+      merge: l10n.tHtml('operations.merge.title'),
+      move: l10n.tHtml('operations.move.title'),
+      orthogonalize: l10n.tHtml('operations.orthogonalize.title'),
+      paste: l10n.tHtml('operations.paste.title'),
+      reflect_long: l10n.tHtml('operations.reflect.title.long'),
+      reflect_short: l10n.tHtml('operations.reflect.title.short'),
+      reverse: l10n.tHtml('operations.reverse.title'),
+      rotate: l10n.tHtml('operations.rotate.title'),
+      split: l10n.tHtml('operations.split.title'),
+      straighten: l10n.tHtml('operations.straighten.title'),
+
+      map_data: l10n.tHtml('map_data.title'),
+      osm_notes: l10n.tHtml('map_data.layers.notes.title'),
+      fields: l10n.tHtml('inspector.fields'),
+      tags: l10n.tHtml('inspector.tags'),
+      relations: l10n.tHtml('inspector.relations'),
+      new_relation: l10n.tHtml('inspector.new_relation'),
+      turn_restrictions: l10n.tHtml('_tagging.presets.fields.restrictions.label'),
+      background_settings: l10n.tHtml('background.description'),
+      imagery_offset: l10n.tHtml('background.fix_misalignment'),
+      start_the_walkthrough: l10n.tHtml('splash.walkthrough'),
+      help: l10n.tHtml('help.title'),
+      ok: l10n.tHtml('intro.ok')
     };
   }
 
-  var reps;
+  let reps;
   if (replacements) {
     reps = Object.assign(replacements, helpStringReplacements);
   } else {
     reps = helpStringReplacements;
   }
 
-  return t.html(id, reps).replace(/\`(.*?)\`/g, '<kbd>$1</kbd>');   // use keyboard key styling for shortcuts
+  return l10n.tHtml(id, reps).replace(/\`(.*?)\`/g, '<kbd>$1</kbd>');   // use keyboard key styling for shortcuts
 }
 
 
@@ -159,8 +160,9 @@ export let missingStrings = {};
  * @param  key
  * @param  text
  */
-function _checkKey(key, text) {
-  if (t(key, { default: undefined }) === undefined) {
+function _checkKey(context, key, text) {
+  const l10n = context.localizationSystem();
+  if (l10n.t(key, { default: undefined }) === undefined) {
     if (missingStrings.hasOwnProperty(key)) return;  // warn once
     missingStrings[key] = text;
     const missing = `${key}: ${text}`;
@@ -173,34 +175,36 @@ function _checkKey(key, text) {
  * Localize the given walkthrough entity
  * @param  obj
  */
-export function localize(obj) {
+export function localize(context, obj) {
+  const l10n = context.localizationSystem();
   let key;
 
   // Assign name if entity has one..
   let name = obj.tags && obj.tags.name;
   if (name) {
     key = 'intro.graph.name.' + slugify(name);
-    obj.tags.name = t(key, { default: name });
-    _checkKey(key, name);
+    obj.tags.name = l10n.t(key, { default: name });
+    _checkKey(context, key, name);
   }
 
   // Assign street name if entity has one..
   let street = obj.tags && obj.tags['addr:street'];
   if (street) {
     key = 'intro.graph.name.' + slugify(street);
-    obj.tags['addr:street'] = t(key, { default: street });
-    _checkKey(key, street);
+    obj.tags['addr:street'] = l10n.t(key, { default: street });
+    _checkKey(context, key, street);
 
     // Add address details common across walkthrough..
-    const ADDR_TAGS = [
+    const addrTags = [
       'block_number', 'city', 'county', 'district', 'hamlet', 'neighbourhood',
       'postcode', 'province', 'quarter', 'state', 'subdistrict', 'suburb'
     ];
-    ADDR_TAGS.forEach(k => {
+
+    for (const k of addrTags) {
       const key = `intro.graph.${k}`;
       const tag = `addr:${k}`;
       const val = obj.tags && obj.tags[tag];
-      const str = t(key, { default: val });
+      const str = l10n.t(key, { default: val });
 
       if (str) {
         if (str.match(/^<.*>$/) !== null) {
@@ -209,7 +213,7 @@ export function localize(obj) {
           obj.tags[tag] = str;
         }
       }
-    });
+    }
   }
 
   return obj;
diff --git a/modules/ui/intro/index.js b/modules/ui/intro/index.js
deleted file mode 100644
index babe9d5c09..0000000000
--- a/modules/ui/intro/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { uiIntro } from './intro';
diff --git a/modules/ui/intro/intro.js b/modules/ui/intro/intro.js
index 0b9ea9f4ab..827af1b75e 100644
--- a/modules/ui/intro/intro.js
+++ b/modules/ui/intro/intro.js
@@ -1,11 +1,7 @@
 import { utilArrayDifference, utilArrayUniq } from '@rapid-sdk/util';
 
-import { t, localizer } from '../../core/localizer';
 import { localize } from './helper';
-import { prefs } from '../../core/preferences';
-import { fileFetcher } from '../../core/file_fetcher';
 import { osmEntity } from '../../osm/entity';
-import { services } from '../../services';
 import { uiIcon } from '../icon';
 
 import { UiCurtain } from './UiCurtain';
@@ -18,6 +14,7 @@ import { uiIntroBuilding } from './building';
 import { uiIntroStartEditing } from './start_editing';
 import { uiIntroRapid } from './rapid';
 
+
 const chapterUi = {
   welcome: uiIntroWelcome,
   navigation: uiIntroNavigation,
@@ -49,22 +46,23 @@ export function uiIntro(context, skipToRapid) {
 
 
   function intro(selection) {
+    const dataLoaderSystem = context.dataLoaderSystem();
     Promise.all([
-      fileFetcher.get('intro_rapid_graph'),
-      fileFetcher.get('intro_graph')
+      dataLoaderSystem.get('intro_rapid_graph'),
+      dataLoaderSystem.get('intro_graph')
     ])
     .then(values => {
       const rapidData = values[0];
       const introData = values[1];
 
-      for (const id in rapidData) {
+      for (const [id, data] of Object.entries(rapidData)) {
         if (!_rapidGraph[id]) {
-          _rapidGraph[id] = osmEntity(localize(rapidData[id]));
+          _rapidGraph[id] = osmEntity(localize(context, data));
         }
       }
-      for (const id in introData) {
+      for (const [id, data] of Object.entries(introData)) {
         if (!_introGraph[id]) {
-          _introGraph[id] = osmEntity(localize(introData[id]));
+          _introGraph[id] = osmEntity(localize(context, data));
         }
       }
 
@@ -74,32 +72,40 @@ export function uiIntro(context, skipToRapid) {
 
 
   function startIntro(selection) {
-    context.inIntro(true);
+    const edits = context.editSystem();
+    const imagery = context.imagerySystem();
+    const l10n = context.localizationSystem();
+    const mapwithai = context.services.get('mapwithai');
+    const osm = context.services.get('osm');
+    const prefs = context.storageSystem();
+    const rapid = context.rapidSystem();
+    const urlhash = context.urlHashSystem();
+
+    urlhash.disable();
+    context.inIntro = true;
     context.enter('browse');
 
-    const osm = context.connection();
-    const imagery = context.imagery();
-    const history = context.history();
-
     // Save current state
     const original = {
       hash: window.location.hash,
-      transform: context.map().transform(),
+      transform: context.mapSystem().transform(),
       brightness: imagery.brightness,
       baseLayer: imagery.baseLayerSource(),
       overlayLayers: imagery.overlayLayerSources(),
-      layerEnabled: new Map(),  // Map(layerID -> Boolean)
-      historyJSON: history.toJSON()
+      layersEnabled: new Set(),     // Set(layerID)
+      datasetsEnabled: new Set(),   // Set(datasetID)
+      edits: edits.toJSON()
     };
 
     // Remember which layers were enabled before, enable only certain ones in the walkthrough.
     for (const [layerID, layer] of context.scene().layers) {
-      original.layerEnabled.set(layerID, layer.enabled);
+      if (layer.enabled) {
+        original.layersEnabled.add(layerID);
+      }
     }
-    context.scene().onlyLayers(['background','osm','labels']);
+    context.scene().onlyLayers(['background', 'osm', 'labels']);
 
     // Show sidebar and disable the sidebar resizing button
-    // (this needs to be before `context.inIntro(true)`)
     context.ui().sidebar.expand();
     context.container().selectAll('button.sidebar-toggle').classed('disabled', true);
 
@@ -109,9 +115,9 @@ export function uiIntro(context, skipToRapid) {
     }
 
     // Load walkthrough data
-    history.reset();
-    history.merge(Object.values(_introGraph));
-    history.checkpoint('initial');
+    edits.reset();
+    edits.merge(Object.values(_introGraph));
+    edits.setCheckpoint('initial');
 
     // Setup imagery
     const introSource = imagery.findSource(INTRO_IMAGERY) || imagery.findSource('Bing');
@@ -120,34 +126,37 @@ export function uiIntro(context, skipToRapid) {
     imagery.brightness = 1;
 
     // Setup Rapid Walkthrough dataset and disable service
-    let rapidDatasets = context.rapidContext().datasets();
-    const rapidDatasetsCopy = JSON.parse(JSON.stringify(rapidDatasets));   // deep copy
-    Object.keys(rapidDatasets).forEach(id => rapidDatasets[id].enabled = false);
+    for (const [datasetID, dataset] of rapid.datasets) {
+      if (dataset.enabled) {
+        original.datasetsEnabled.add(datasetID);
+        dataset.enabled = false;
+      }
+    }
 
-    rapidDatasets.rapid_intro_graph = {
+    rapid.datasets.set('rapid_intro_graph', {
       id: 'rapid_intro_graph',
       beta: false,
       added: true,
       enabled: true,
       conflated: false,
-      service: 'fbml',
+      service: 'mapwithai',
       color: '#da26d3',
       label: 'Rapid Walkthrough'
-    };
+    });
 
-    if (services.fbMLRoads) {
-      services.fbMLRoads.toggle(false);    // disable network
-      services.fbMLRoads.merge('rapid_intro_graph', Object.values(_rapidGraph));
+    if (mapwithai) {
+      mapwithai.toggle(false);    // disable network
+      mapwithai.merge('rapid_intro_graph', Object.values(_rapidGraph));
     }
 
     const curtain = new UiCurtain(context);
     selection.call(curtain.enable);
 
     // Store that the user started the walkthrough..
-    prefs('walkthrough_started', 'yes');
+    prefs.setItem('walkthrough_started', 'yes');
 
     // Restore previous walkthrough progress..
-    const storedProgress = prefs('walkthrough_progress') || '';
+    const storedProgress = prefs.getItem('walkthrough_progress') || '';
     let progress = storedProgress.split(';').filter(Boolean);
 
     let chapters = chapterFlow.map((chapter, i) => {
@@ -165,7 +174,7 @@ export function uiIntro(context, skipToRapid) {
 
           // Store walkthrough progress..
           progress.push(chapter);
-          prefs('walkthrough_progress', utilArrayUniq(progress).join(';'));
+          prefs.setItem('walkthrough_progress', utilArrayUniq(progress).join(';'));
         });
       return s;
     });
@@ -174,21 +183,22 @@ export function uiIntro(context, skipToRapid) {
     chapters[chapters.length - 1].on('startEditing', () => {
       // Store walkthrough progress..
       progress.push('startEditing');
-      prefs('walkthrough_progress', utilArrayUniq(progress).join(';'));
+      prefs.setItem('walkthrough_progress', utilArrayUniq(progress).join(';'));
 
       // Store if walkthrough is completed..
       const incomplete = utilArrayDifference(chapterFlow, progress);
       if (!incomplete.length) {
-        prefs('walkthrough_completed', 'yes');
+        prefs.setItem('walkthrough_completed', 'yes');
       }
 
       // Restore Rapid datasets and service
-      let rapidDatasets = context.rapidContext().datasets();
-      delete rapidDatasets.rapid_intro_graph;
-      Object.keys(rapidDatasetsCopy).forEach(id => rapidDatasets[id].enabled = rapidDatasetsCopy[id].enabled);
-      Object.assign(rapidDatasets, rapidDatasetsCopy);
-      if (services.fbMLRoads) {
-        services.fbMLRoads.toggle(true);
+      for (const [datasetID, dataset] of rapid.datasets) {
+        dataset.enabled = original.datasetsEnabled.has(datasetID);
+      }
+      rapid.datasets.delete('rapid_intro_graph');
+
+      if (mapwithai) {
+        mapwithai.toggle(true);
       }
 
       curtain.disable();
@@ -197,18 +207,18 @@ export function uiIntro(context, skipToRapid) {
 
       // Restore Map State
       for (const [layerID, layer] of context.scene().layers) {
-        layer.enabled = original.layerEnabled.get(layerID);
+        layer.enabled = original.layersEnabled.has(layerID);
       }
       imagery.baseLayerSource(original.baseLayer);
       original.overlayLayers.forEach(d => imagery.toggleOverlayLayer(d));
       imagery.brightness = original.brightness;
-      context.map().transform(original.transform);
+      context.mapSystem().transform(original.transform);
       window.location.replace(original.hash);
 
-      // Restore History and Edits
-      history.reset();
-      if (original.historyJSON) {
-        history.fromJSON(original.historyJSON, true);
+      // Restore Edits
+      edits.reset();
+      if (original.edits) {
+        edits.fromJSON(original.edits, true);
       }
 
       // Enable OSM
@@ -216,7 +226,8 @@ export function uiIntro(context, skipToRapid) {
         osm.toggle(true).reset();
       }
 
-      context.inIntro(false);
+      context.inIntro = false;
+      urlhash.enable();
     });
 
 
@@ -244,12 +255,12 @@ export function uiIntro(context, skipToRapid) {
 
     buttons
       .append('span')
-      .html(d => t.html(d.title));
+      .html(d => l10n.tHtml(d.title));
 
     buttons
       .append('span')
       .attr('class', 'status')
-      .call(uiIcon((localizer.textDirection() === 'rtl' ? '#rapid-icon-backward' : '#rapid-icon-forward'), 'inline'));
+      .call(uiIcon(l10n.isRTL() ? '#rapid-icon-backward' : '#rapid-icon-forward', 'inline'));
 
     _enterChapter(null, chapters[skipToRapid ? 6 : 0]);
 
diff --git a/modules/ui/intro/line.js b/modules/ui/intro/line.js
index 6ea0e47cd0..9b9b048f83 100644
--- a/modules/ui/intro/line.js
+++ b/modules/ui/intro/line.js
@@ -1,9 +1,6 @@
 import { Extent, geoSphericalDistance } from '@rapid-sdk/math';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
-import { modeSelect } from '../../modes/select';
 import { utilRebind } from '../../util/rebind';
 import { delayAsync, eventCancel, helpHtml, icon, showEntityEditor, showPresetList, transitionTime } from './helper';
 
@@ -13,15 +10,17 @@ export function uiIntroLine(context, curtain) {
   const chapter = { title: 'intro.lines.title' };
   const editMenu = context.ui().editMenu();
   const container = context.container();
-  const history = context.history();
-  const map = context.map();
+  const dragBehavior = context.behaviors.get('drag');
+  const editSystem = context.editSystem();
+  const mapSystem = context.mapSystem();
+  const presetSystem = context.presetSystem();
 
   const flowerStreetID = 'w646';
   const tulipRoadStartExtent = new Extent([-85.63016, 41.95749], [-85.62937, 41.95843]);
   const tulipRoadMidExtent = new Extent([-85.63044, 41.95686], [-85.62900, 41.95843]);
   const tulipRoadIntersection = [-85.629745, 41.95742];
-  const roadCategory = presetManager.item('category-road_minor');
-  const residentialPreset = presetManager.item('highway/residential');
+  const roadCategory = presetSystem.item('category-road_minor');
+  const residentialPreset = presetSystem.item('highway/residential');
 
   const woodStreetID = 'w525';
   const woodStreetEndID = 'n2862';
@@ -38,6 +37,9 @@ export function uiIntroLine(context, curtain) {
 
   let _chapterCancelled = false;
   let _rejectStep = null;
+  let _onMapMove = null;
+  let _onModeChange = null;
+  let _onEditChange = null;
   let _washingtonSegmentID = null;
   let _lineID = null;
 
@@ -48,7 +50,7 @@ export function uiIntroLine(context, curtain) {
   }
 
   function _isLineSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === _lineID;
   }
@@ -71,7 +73,7 @@ export function uiIntroLine(context, curtain) {
   }
 
   function _isWoodStreetSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === woodStreetID;
   }
@@ -85,7 +87,7 @@ export function uiIntroLine(context, curtain) {
   }
 
   function _is11thAveEndSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === eleventhAvenueEndID;
   }
@@ -110,20 +112,22 @@ export function uiIntroLine(context, curtain) {
   // Click "Add Line" button to advance
   function addLineAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
     _lineID = null;
 
     const loc = tulipRoadStartExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 18.5, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onModeChange = () => resolve(startLineAsync);
+
         const tooltip = curtain.reveal({
           revealSelector: 'button.draw-line',
-          tipHtml: helpHtml('intro.lines.add_line')
+          tipHtml: helpHtml(context, 'intro.lines.add_line')
         });
 
         tooltip.selectAll('.popover-inner')
@@ -131,11 +135,9 @@ export function uiIntroLine(context, curtain) {
           .attr('class', 'tooltip-illustration')
           .append('use')
           .attr('xlink:href', '#rapid-graphic-lines');
-
-        context.on('enter.intro', () => resolve(startLineAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -148,17 +150,8 @@ export function uiIntroLine(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      const textID = context.lastPointerType() === 'mouse' ? 'start_line' : 'start_line_tap';
-      const startLineString = helpHtml('intro.lines.missing_road') + '{br}' +
-        helpHtml('intro.lines.line_draw_info') + helpHtml(`intro.lines.${textID}`);
-
-      curtain.reveal({
-        revealExtent: tulipRoadStartExtent,
-        tipHtml: startLineString
-      });
-
-      history.on('change.intro', difference => {
+      _onModeChange = reject;   // disallow mode change
+      _onEditChange = (difference) => {
         if (!difference) return;
         for (const entity of difference.created()) {  // created a node and a way
           if (entity.type === 'way') {
@@ -166,13 +159,20 @@ export function uiIntroLine(context, curtain) {
             resolve(drawLineAsync);
           }
         }
-      });
+      };
+
+      const textID = context.lastPointerType === 'mouse' ? 'start_line' : 'start_line_tap';
+      const startLineString = helpHtml(context, 'intro.lines.missing_road') + '{br}' +
+        helpHtml(context, 'intro.lines.line_draw_info') + helpHtml(context, `intro.lines.${textID}`);
 
-      context.on('enter.intro', reject);   // disallow mode change
+      curtain.reveal({
+        revealExtent: tulipRoadStartExtent,
+        tipHtml: startLineString
+      });
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -181,28 +181,27 @@ export function uiIntroLine(context, curtain) {
   // "Place an intersection node on {name} to connect the two lines."
   function drawLineAsync() {
     const loc = tulipRoadMidExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 18.5, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesLineExist() || context.mode().id !== 'draw-line') { resolve(addLineAsync); return; }
 
+        _onModeChange = () => resolve(retryIntersectAsync);
+        _onEditChange = () => {
+          if (_isLineConnected()) resolve(finishLineAsync);
+        };
+
         curtain.reveal({
           revealExtent: tulipRoadMidExtent,
-          tipHtml: helpHtml('intro.lines.intersect', { name: t('intro.graph.name.flower-street') })
+          tipHtml: helpHtml(context, 'intro.lines.intersect', { name: context.t('intro.graph.name.flower-street') })
         });
-
-        history.on('change.intro', () => {
-          if (_isLineConnected()) resolve(finishLineAsync);
-        });
-
-        context.on('enter.intro', () => resolve(retryIntersectAsync));
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
       });
   }
 
@@ -214,8 +213,8 @@ export function uiIntroLine(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: new Extent(tulipRoadIntersection).padByMeters(15),
-        tipHtml: helpHtml('intro.lines.retry_intersect', { name: t('intro.graph.name.flower-street') }),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.lines.retry_intersect', { name: context.t('intro.graph.name.flower-street') }),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(addLineAsync)
       });
     });
@@ -227,27 +226,27 @@ export function uiIntroLine(context, curtain) {
   // Finish the road to advance
   function finishLineAsync() {
     const loc = tulipRoadMidExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 18.5, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesLineExist() || context.mode().id !== 'draw-line') { resolve(addLineAsync); return; }
 
-        const textID = (context.lastPointerType() === 'mouse') ? 'click' : 'tap';
-        const continueLineText = helpHtml('intro.lines.continue_line') + '{br}' +
-          helpHtml(`intro.lines.finish_line_${textID}`) + helpHtml('intro.lines.finish_road');
+        _onModeChange = () => resolve(chooseCategoryRoadAsync);
+
+        const textID = (context.lastPointerType === 'mouse') ? 'click' : 'tap';
+        const continueLineText = helpHtml(context, 'intro.lines.continue_line') + '{br}' +
+          helpHtml(context, `intro.lines.finish_line_${textID}`) + helpHtml(context, 'intro.lines.finish_road');
 
         curtain.reveal({
           revealSelector: '.main-map',
           tipHtml: continueLineText
         });
-
-        context.on('enter.intro', () => resolve(chooseCategoryRoadAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -261,7 +260,9 @@ export function uiIntroLine(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesLineExist()) { resolve(addLineAsync); return; }
-        if (!_isLineSelected()) context.enter(modeSelect(context, [_lineID]));
+        if (!_isLineSelected()) context.enter('select-osm', { selectedIDs: [_lineID] });
+
+        _onModeChange = reject;   // disallow mode change
 
         showPresetList(container);
         container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
@@ -279,16 +280,15 @@ export function uiIntroLine(context, curtain) {
         curtain.reveal({
           revealNode: categoryButton.node(),
           revealPadding: 5,
-          tipHtml: helpHtml('intro.lines.choose_category_road', { category: roadCategory.name() })
+          tipHtml: helpHtml(context, 'intro.lines.choose_category_road', { category: roadCategory.name() })
         });
 
         categoryButton.on('click.intro', () => resolve(choosePresetResidentialAsync));
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
+        _onModeChange = null;
         if (categoryButton) categoryButton.on('click.intro', null);
         container.select('.inspector-wrap').on('wheel.intro', null);
-        context.on('enter.intro', null);
       });
   }
 
@@ -300,7 +300,7 @@ export function uiIntroLine(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesLineExist()) { resolve(addLineAsync); return; }
-        if (!_isLineSelected()) context.enter(modeSelect(context, [_lineID]));
+        if (!_isLineSelected()) context.enter('select-osm', { selectedIDs: [_lineID] });
 
         showPresetList(container);
         container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
@@ -321,30 +321,30 @@ export function uiIntroLine(context, curtain) {
           return;
         }
 
-        curtain.reveal({
-          revealNode: subgrid.node(),
-          revealPadding: 5,
-          tipSelector: '.preset-highway-residential .preset-list-button',
-          tipHtml: helpHtml('intro.lines.choose_preset_residential', { preset: residentialPreset.name() })
-        });
+        _onModeChange = reject;   // disallow mode change
 
-        history.on('change.intro', difference => {
+        _onEditChange = (difference) => {
           if (!difference) return;
           const modified = difference.modified();
           if (modified.length === 1) {
-            if (presetManager.match(modified[0], context.graph()) === residentialPreset) {
+            if (presetSystem.match(modified[0], context.graph()) === residentialPreset) {
               resolve(nameRoadAsync);
             } else {
               resolve(retryPresetResidentialAsync);  // didn't pick residential, retry
             }
           }
-        });
+        };
 
-        context.on('enter.intro', reject);   // disallow mode change
+        curtain.reveal({
+          revealNode: subgrid.node(),
+          revealPadding: 5,
+          tipSelector: '.preset-highway-residential .preset-list-button',
+          tipHtml: helpHtml(context, 'intro.lines.choose_preset_residential', { preset: residentialPreset.name() })
+        });
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
       });
   }
@@ -357,7 +357,7 @@ export function uiIntroLine(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesLineExist()) { resolve(addLineAsync); return; }
-        if (!_isLineSelected()) context.enter(modeSelect(context, [_lineID]));
+        if (!_isLineSelected()) context.enter('select-osm', { selectedIDs: [_lineID] });
 
         showPresetList(container);
         container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
@@ -378,29 +378,28 @@ export function uiIntroLine(context, curtain) {
           return;
         }
 
-        curtain.reveal({
-          revealNode: presetButton.node(),
-          revealPadding: 5,
-          tipHtml: helpHtml('intro.lines.retry_preset_residential', { preset: residentialPreset.name() })
-        });
-
-        history.on('change.intro', difference => {
+        _onModeChange = reject;   // disallow mode change
+        _onEditChange = (difference) => {
           if (!difference) return;
           const modified = difference.modified();
           if (modified.length === 1) {
-            if (presetManager.match(modified[0], context.graph()) === residentialPreset) {
+            if (presetSystem.match(modified[0], context.graph()) === residentialPreset) {
               resolve(nameRoadAsync);
             } else {
               resolve(chooseCategoryRoadAsync);  // didn't pick residential, retry
             }
           }
-        });
+        };
 
-        context.on('enter.intro', reject);   // disallow mode change
+        curtain.reveal({
+          revealNode: presetButton.node(),
+          revealPadding: 5,
+          tipHtml: helpHtml(context, 'intro.lines.retry_preset_residential', { preset: residentialPreset.name() })
+        });
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
       });
   }
@@ -413,20 +412,20 @@ export function uiIntroLine(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesLineExist()) { resolve(addLineAsync); return; }
-        if (!_isLineSelected()) context.enter(modeSelect(context, [_lineID]));
+        if (!_isLineSelected()) context.enter('select-osm', { selectedIDs: [_lineID] });
+
+        _onModeChange = () => resolve(didNameRoadAsync);
 
         showEntityEditor(container);
 
         curtain.reveal({
           revealSelector: '.entity-editor-pane',
-          tipHtml: helpHtml('intro.lines.name_road', { button: icon('#rapid-icon-close', 'inline') }),
+          tipHtml: helpHtml(context, 'intro.lines.name_road', { button: icon('#rapid-icon-close', 'inline') }),
           tooltipClass: 'intro-lines-name_road'
         });
-
-        context.on('enter.intro', () => resolve(didNameRoadAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -435,14 +434,14 @@ export function uiIntroLine(context, curtain) {
   // Click Ok to advance
   function didNameRoadAsync() {
     if (!_doesLineExist()) return Promise.resolve(addLineAsync);
-    history.checkpoint('doneAddLine');
+    editSystem.setCheckpoint('doneAddLine');
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.main-map',
-        tipHtml: helpHtml('intro.lines.did_name_road'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.lines.did_name_road'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(updateLineAsync)
       });
     });
@@ -455,24 +454,24 @@ export function uiIntroLine(context, curtain) {
   // Click Ok to advance
   function updateLineAsync() {
     context.enter('browse');
-    history.reset('doneAddLine');
+    editSystem.resetToCheckpoint('doneAddLine');
 
     // It's remotely possible that in an earlier step,
     // the user scrolled over here and deleted some stuff we need.
-    if (!_hasWoodStreetParts()) history.reset('initial');
+    if (!_hasWoodStreetParts()) editSystem.resetToCheckpoint('initial');
 
     const loc = woodStreetExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         curtain.reveal({
           revealExtent: woodStreetExtent,
-          tipHtml: helpHtml('intro.lines.update_line'),
-          buttonText: t.html('intro.ok'),
+          tipHtml: helpHtml(context, 'intro.lines.update_line'),
+          buttonText: context.tHtml('intro.ok'),
           buttonCallback: () => resolve(addNodeAsync)
         });
       }));
@@ -489,27 +488,26 @@ export function uiIntroLine(context, curtain) {
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
 
-      const textID = (context.lastPointerType() === 'mouse') ? '' : '_touch';
-      curtain.reveal({
-        revealExtent: new Extent(woodStreetAddNode).padByMeters(15),
-        tipHtml: helpHtml(`intro.lines.add_node${textID}`)
-      });
-
-      history.on('change.intro', difference => {
+      _onModeChange = (mode) => {
+        if (!['browse', 'select-osm'].includes(mode.id)) reject();
+      };
+      _onEditChange = (difference) => {
         if (difference && difference.created().length === 1) {   // expect to create 1 node
           resolve(startDragEndpointAsync);
         } else {
           reject();
         }
-      });
+      };
 
-      context.on('enter.intro', mode => {
-        if (mode.id !== 'browse' && mode.id !== 'select') reject();
+      const textID = (context.lastPointerType === 'mouse') ? '' : '_touch';
+      curtain.reveal({
+        revealExtent: new Extent(woodStreetAddNode).padByMeters(15),
+        tipHtml: helpHtml(context, `intro.lines.add_node${textID}`)
       });
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -524,9 +522,9 @@ export function uiIntroLine(context, curtain) {
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
 
-      const textID = context.lastPointerType() === 'mouse' ? '' : '_touch';
-      const startDragString = helpHtml(`intro.lines.start_drag_endpoint${textID}`) +
-        helpHtml('intro.lines.drag_to_intersection');
+      const textID = context.lastPointerType === 'mouse' ? '' : '_touch';
+      const startDragString = helpHtml(context, `intro.lines.start_drag_endpoint${textID}`) +
+        helpHtml(context, 'intro.lines.drag_to_intersection');
 
       curtain.reveal({
         revealExtent: new Extent(woodStreetDragEndpoint).padByMeters(20),
@@ -543,10 +541,10 @@ export function uiIntroLine(context, curtain) {
           }
         }
       };
-      context.behaviors.get('drag').on('move', checkDrag);
+      dragBehavior.on('move', checkDrag);
     })
     .finally(() => {
-      if (checkDrag) context.behaviors.get('drag').off('move', checkDrag);
+      if (checkDrag) dragBehavior.off('move', checkDrag);
     });
   }
 
@@ -560,18 +558,17 @@ export function uiIntroLine(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(startDragMidpointAsync);
 
-      const textID = context.lastPointerType() === 'mouse' ? '' : '_touch';
-      const finishDragString = helpHtml('intro.lines.spot_looks_good') +
-        helpHtml(`intro.lines.finish_drag_endpoint${textID}`);
+      const textID = context.lastPointerType === 'mouse' ? '' : '_touch';
+      const finishDragString = helpHtml(context, 'intro.lines.spot_looks_good') +
+        helpHtml(context, `intro.lines.finish_drag_endpoint${textID}`);
 
       curtain.reveal({
         revealExtent: new Extent(woodStreetDragEndpoint).padByMeters(20),
         tipHtml: finishDragString
       });
 
-      context.on('enter.intro', () => resolve(startDragMidpointAsync));
-
       checkDrag = () => {
         if (!_hasWoodStreetParts()) {
           reject();
@@ -582,11 +579,11 @@ export function uiIntroLine(context, curtain) {
           }
         }
       };
-      context.behaviors.get('drag').on('move', checkDrag);
+      dragBehavior.on('move', checkDrag);
     })
     .finally(() => {
-      context.on('enter.intro', null);
-      if (checkDrag) context.behaviors.get('drag').off('move', checkDrag);
+      _onModeChange = null;
+      if (checkDrag) dragBehavior.off('move', checkDrag);
     });
   }
 
@@ -596,27 +593,25 @@ export function uiIntroLine(context, curtain) {
   // Create a node on Wood Street to advance
   function startDragMidpointAsync() {
     if (!_hasWoodStreetParts()) return Promise.resolve(updateLineAsync);
-    if (!_isWoodStreetSelected()) context.enter(modeSelect(context, [woodStreetID]));
+    if (!_isWoodStreetSelected()) context.enter('select-osm', { selectedIDs: [woodStreetID] });
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      curtain.reveal({
-        revealExtent: new Extent(woodStreetDragMidpoint).padByMeters(20),
-        tipHtml: helpHtml('intro.lines.start_drag_midpoint')
-      });
-
-      history.on('change.intro', difference => {
+      _onModeChange = reject;   // disallow mode change
+      _onEditChange = (difference) => {
         if (difference && difference.created().length === 1) {
           resolve(continueDragMidpointAsync);
         }
-      });
+      };
 
-      context.on('enter.intro', reject);   // disallow mode change
+      curtain.reveal({
+        revealExtent: new Extent(woodStreetDragMidpoint).padByMeters(20),
+        tipHtml: helpHtml(context, 'intro.lines.start_drag_midpoint')
+      });
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -632,10 +627,10 @@ export function uiIntroLine(context, curtain) {
 
       curtain.reveal({
         revealExtent: woodStreetExtent,
-        tipHtml: helpHtml('intro.lines.continue_drag_midpoint'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.lines.continue_drag_midpoint'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => {
-          history.checkpoint('doneUpdateLine');
+          editSystem.setCheckpoint('doneUpdateLine');
           resolve(deleteLinesAsync);
         }
       });
@@ -649,24 +644,24 @@ export function uiIntroLine(context, curtain) {
   // Click Ok to advance
   function deleteLinesAsync() {
     context.enter('browse');
-    history.reset('doneUpdateLine');
+    editSystem.resetToCheckpoint('doneUpdateLine');
 
     // It's remotely possible that in an earlier step,
     // the user scrolled over here and deleted some stuff we need.
-    if (!_has12thAvenueParts()) history.reset('initial');
+    if (!_has12thAvenueParts()) editSystem.resetToCheckpoint('initial');
 
     const loc = deleteLinesExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 18, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         curtain.reveal({
           revealExtent: deleteLinesExtent,
-          tipHtml: helpHtml('intro.lines.delete_lines', { street: t('intro.graph.name.12th-avenue') }),
-          buttonText: t.html('intro.ok'),
+          tipHtml: helpHtml(context, 'intro.lines.delete_lines', { street: context.t('intro.graph.name.12th-avenue') }),
+          buttonText: context.tHtml('intro.ok'),
           buttonCallback: () => resolve(rightClickIntersectionAsync)
         });
       }));
@@ -677,22 +672,23 @@ export function uiIntroLine(context, curtain) {
   // Select point with edit menu open to advance
   function rightClickIntersectionAsync() {
     context.enter('browse');
-    history.reset('doneUpdateLine');
+    editSystem.resetToCheckpoint('doneUpdateLine');
 
     // It's remotely possible that in an earlier step,
     // the user scrolled over here and deleted some stuff we need.
-    if (!_has12thAvenueParts()) history.reset('initial');
+    if (!_has12thAvenueParts()) editSystem.resetToCheckpoint('initial');
 
     _washingtonSegmentID = null;
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onEditChange = reject;  // disallow doing anything else
 
-      const textID = (context.lastPointerType() === 'mouse') ? 'rightclick_intersection' : 'edit_menu_intersection_touch';
-      const rightClickString = helpHtml('intro.lines.split_street', {
-        street1: t('intro.graph.name.11th-avenue'),
-        street2: t('intro.graph.name.washington-street')
-      }) + helpHtml(`intro.lines.${textID}`);
+      const textID = (context.lastPointerType === 'mouse') ? 'rightclick_intersection' : 'edit_menu_intersection_touch';
+      const rightClickString = helpHtml(context, 'intro.lines.split_street', {
+        street1: context.t('intro.graph.name.11th-avenue'),
+        street2: context.t('intro.graph.name.washington-street')
+      }) + helpHtml(context, `intro.lines.${textID}`);
 
       curtain.reveal({
         revealExtent: new Extent(eleventhAvenueEnd).padByMeters(10),
@@ -702,12 +698,10 @@ export function uiIntroLine(context, curtain) {
       editMenu.on('toggled.intro', open => {
         if (open) resolve(splitIntersectionAsync);
       });
-
-      history.on('change.intro', reject);  // disallow doing anything else
     })
     .finally(() => {
+      _onEditChange = null;
       editMenu.on('toggled.intro', null);
-      history.on('change.intro', null);
     });
   }
 
@@ -718,57 +712,56 @@ export function uiIntroLine(context, curtain) {
     const buttonNode = container.select('.edit-menu-item-split').node();
     if (!buttonNode) return Promise.resolve(rightClickIntersectionAsync);   // no Split button, try again
 
-    let revealEditMenu;
     _washingtonSegmentID = null;
 
     return delayAsync()  // after edit menu fully visible
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_has12thAvenueParts()) { resolve(deleteLinesAsync); return; }
-        if (!_is11thAveEndSelected()) context.enter(modeSelect(context, [eleventhAvenueEndID]));
+        if (!_is11thAveEndSelected()) context.enter('select-osm', { selectedIDs: [eleventhAvenueEndID] });
 
-        revealEditMenu = (duration = 0) => {
+        const revealEditMenu = (duration = 0) => {
           const menuNode = container.select('.edit-menu').node();
           if (menuNode) {
             curtain.reveal({
               duration: duration,
               revealNode: menuNode,
               revealPadding: 50,
-              tipHtml: helpHtml('intro.lines.split_intersection', { street: t('intro.graph.name.washington-street') })
+              tipHtml: helpHtml(context, 'intro.lines.split_intersection', { street: context.t('intro.graph.name.washington-street') })
             });
           } else {
             reject();   // menu has gone away - user scrolled it offscreen?
           }
         };
 
-        revealEditMenu(250);             // first time revealing menu, transition curtain to the menu
-        map.on('move', revealEditMenu);  // on map moves, have the curtain follow the menu immediately
+        _onModeChange = reject;   // disallow mode change
 
-        history.on('change.intro', difference => {
-          map.off('move', revealEditMenu);
-          history.on('change.intro', null);
+        _onEditChange = (difference) => {
+          _onMapMove = null;
+          _onEditChange = null;
           if (difference && difference.created()) {
             _washingtonSegmentID = difference.created()[0].id;
             resolve();
           } else {
             reject();
           }
-        });
+        };
 
-        context.on('enter.intro', reject);   // disallow mode change
+        _onMapMove = revealEditMenu;  // on map moves, have the curtain follow the menu immediately
+        revealEditMenu(250);          // first time revealing menu, transition curtain to the menu
       }))
       .then(delayAsync)   // wait for any transtion to complete
       .then(() => {       // then check undo annotation to see what the user did
-        if (history.undoAnnotation() === t('operations.split.annotation.line', { n: 1 })) {
+        if (editSystem.undoAnnotation() === context.t('operations.split.annotation.line', { n: 1 })) {
           return didSplitAsync;
         } else {
           return retrySplitAsync;
         }
       })
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
-        if (revealEditMenu) map.off('move', revealEditMenu);
+        _onModeChange = null;
+        _onEditChange = null;
+        _onMapMove = null;
       });
   }
 
@@ -782,8 +775,8 @@ export function uiIntroLine(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: deleteLinesExtent,
-        tipHtml: helpHtml('intro.lines.retry_split'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.lines.retry_split'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(rightClickIntersectionAsync)
       });
     });
@@ -800,22 +793,21 @@ export function uiIntroLine(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(multiSelectAsync);
+      _onEditChange = reject;  // disallow doing anything else
 
       const ids = context.selectedIDs();
       const string = 'intro.lines.did_split_' + (ids.length > 1 ? 'multi' : 'single');
-      const street = t('intro.graph.name.washington-street');
+      const street = context.t('intro.graph.name.washington-street');
 
       curtain.reveal({
         revealExtent: deleteLinesExtent,
-        tipHtml: helpHtml(string, { street1: street, street2: street })
+        tipHtml: helpHtml(context, string, { street1: street, street2: street })
       });
-
-      context.on('enter.intro', () => resolve(multiSelectAsync));
-      history.on('change.intro', reject);  // disallow doing anything else
-    })
+   })
     .finally(() => {
-      context.on('enter.intro', null);
-      history.on('change.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -841,17 +833,17 @@ export function uiIntroLine(context, curtain) {
 
     let selected, other;
     if (hasWashington) {
-      selected = t('intro.graph.name.washington-street');
-      other = t('intro.graph.name.12th-avenue');
+      selected = context.t('intro.graph.name.washington-street');
+      other = context.t('intro.graph.name.12th-avenue');
     } else {
-      selected = t('intro.graph.name.12th-avenue');
-      other = t('intro.graph.name.washington-street');
+      selected = context.t('intro.graph.name.12th-avenue');
+      other = context.t('intro.graph.name.washington-street');
     }
 
-    const textID = (context.lastPointerType() === 'mouse') ? 'click' : 'touch';
+    const textID = (context.lastPointerType === 'mouse') ? 'click' : 'touch';
     const string =
-      helpHtml('intro.lines.multi_select', { selected: selected, other1: other }) + ' ' +
-      helpHtml(`intro.lines.add_to_selection_${textID}`, { selected: selected, other2: other });
+      helpHtml(context, 'intro.lines.multi_select', { selected: selected, other1: other }) + ' ' +
+      helpHtml(context, `intro.lines.add_to_selection_${textID}`, { selected: selected, other2: other });
 
     curtain.reveal({
       revealExtent: deleteLinesExtent,
@@ -860,12 +852,12 @@ export function uiIntroLine(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-      context.on('enter.intro', reject);   // reject will retry this step, which is what we want
-      history.on('change.intro', reject);  // disallow doing anything else
+      _onModeChange = reject;  // reject will retry this step, which is what we want
+      _onEditChange = reject;  // disallow doing anything else
     })
     .finally(() => {
-      context.on('enter.intro', null);
-      history.on('change.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -886,9 +878,11 @@ export function uiIntroLine(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change
+      _onEditChange = reject;   // disallow doing anything else
 
-      const textID = context.lastPointerType() === 'mouse' ? 'rightclick' : 'edit_menu_touch';
-      const rightClickString = helpHtml('intro.lines.multi_select_success') + helpHtml(`intro.lines.multi_${textID}`);
+      const textID = context.lastPointerType === 'mouse' ? 'rightclick' : 'edit_menu_touch';
+      const rightClickString = helpHtml(context, 'intro.lines.multi_select_success') + helpHtml(context, `intro.lines.multi_${textID}`);
 
       curtain.reveal({
         revealExtent: deleteLinesExtent,
@@ -898,14 +892,11 @@ export function uiIntroLine(context, curtain) {
       editMenu.on('toggled.intro', open => {
         if (open) resolve(multiDeleteAsync);
       });
-
-      history.on('change.intro', reject);  // disallow doing anything else
-      context.on('enter.intro', reject);   // disallow mode change
     })
     .finally(() => {
+      _onModeChange = null;
+      _onEditChange = null;
       editMenu.on('toggled.intro', null);
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
     });
   }
 
@@ -916,8 +907,6 @@ export function uiIntroLine(context, curtain) {
     const buttonNode = container.select('.edit-menu-item-delete').node();
     if (!buttonNode) return Promise.resolve(multiSelectAsync);   // no Delete button, try again
 
-    let revealEditMenu;
-
     return delayAsync()  // after edit menu fully visible
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
@@ -932,49 +921,51 @@ export function uiIntroLine(context, curtain) {
           return;
         }
 
-        revealEditMenu = (duration = 0) => {
+        const revealEditMenu = (duration = 0) => {
           const menuNode = container.select('.edit-menu').node();
           if (menuNode) {
             curtain.reveal({
               duration: duration,
               revealNode: menuNode,
               revealPadding: 50,
-              tipHtml: helpHtml('intro.lines.multi_delete')
+              tipHtml: helpHtml(context, 'intro.lines.multi_delete')
             });
           } else {
             reject();   // menu has gone away - user scrolled it offscreen?
           }
         };
 
-        revealEditMenu(250);             // first time revealing menu, transition curtain to the menu
-        map.on('move', revealEditMenu);  // on map moves, have the curtain follow the menu immediately
-
-        // In most cases we receive the history change event before the mode change event..
+        // In most cases we receive the edit change event before the mode change event..
         // In this case, we might get them the other way around, because the legacy modeSelect listens for
-        // history change and will switch to browse mode if the previously selected features go away.
+        // edit change and will switch to browse mode if the previously selected features go away.
         // To fix this, we'll listen to both events to see whether the road segments have been deleted.
-        history.on('change.intro', () => {
-          history.on('change.intro', null);
-          context.on('enter.intro', null);
-          if (!context.hasEntity(_washingtonSegmentID) && !context.hasEntity(twelfthAvenueID)) {
+
+        _onModeChange = (mode) => {
+          if (mode.id === 'browse' && !context.hasEntity(_washingtonSegmentID) && !context.hasEntity(twelfthAvenueID)) {
             resolve(playAsync);
           } else {
-            resolve(retryDeleteAsync);   // changed something but roads still exist - go back
+            resolve(multiSelectAsync);   // lost select mode - go back
           }
-        });
+        };
 
-        context.on('enter.intro', mode => {
-          if (mode.id === 'browse' && !context.hasEntity(_washingtonSegmentID) && !context.hasEntity(twelfthAvenueID)) {
+        _onEditChange = () => {
+          _onEditChange = null;
+          _onModeChange = null;
+          if (!context.hasEntity(_washingtonSegmentID) && !context.hasEntity(twelfthAvenueID)) {
             resolve(playAsync);
           } else {
-            resolve(multiSelectAsync);   // lost select mode - go back
+            resolve(retryDeleteAsync);   // changed something but roads still exist - go back
           }
-        });
+        };
+
+        _onMapMove = revealEditMenu;   // on map moves, have the curtain follow the menu immediately
+        revealEditMenu(250);           // first time revealing menu, transition curtain to the menu
+
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
-        if (revealEditMenu) map.off('move', revealEditMenu);
+        _onModeChange = null;
+        _onEditChange = null;
+        _onMapMove = null;
       });
   }
 
@@ -988,8 +979,8 @@ export function uiIntroLine(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: deleteLinesExtent,
-        tipHtml: helpHtml('intro.lines.retry_delete'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.lines.retry_delete'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(multiSelectAsync)
       });
     });
@@ -1003,8 +994,8 @@ export function uiIntroLine(context, curtain) {
     curtain.reveal({
       revealSelector: '.ideditor',
       tipSelector: '.intro-nav-wrap .chapter-building',
-      tipHtml: helpHtml('intro.lines.play', { next: t('intro.buildings.title') }),
-      buttonText: t.html('intro.ok'),
+      tipHtml: helpHtml(context, 'intro.lines.play', { next: context.t('intro.buildings.title') }),
+      buttonText: context.tHtml('intro.ok'),
       buttonCallback: () => curtain.reveal({ revealSelector: '.ideditor' })  // re-reveal but without the tooltip
     });
     return Promise.resolve();
@@ -1014,9 +1005,31 @@ export function uiIntroLine(context, curtain) {
   chapter.enter = () => {
     _chapterCancelled = false;
     _rejectStep = null;
+    _onMapMove = null;
+    _onModeChange = null;
+    _onEditChange = null;
+
+    context.on('modechange', _modeChangeListener);
+    mapSystem.on('move', _mapMoveListener);
+    editSystem.on('change', _editChangeListener);
 
     runAsync(addLineAsync)
-      .catch(e => { if (e instanceof Error) console.error(e); });  // eslint-disable-line no-console
+      .catch(e => { if (e instanceof Error) console.error(e); })   // eslint-disable-line no-console
+      .finally(() => {
+        context.off('modechange', _modeChangeListener);
+        mapSystem.off('move', _mapMoveListener);
+        editSystem.off('change', _editChangeListener);
+      });
+
+    function _mapMoveListener() {
+      if (typeof _onMapMove === 'function') _onMapMove();
+    }
+    function _modeChangeListener(mode) {
+      if (typeof _onModeChange === 'function') _onModeChange(mode);
+    }
+    function _editChangeListener(difference) {
+      if (typeof _onEditChange === 'function') _onEditChange(difference);
+    }
   };
 
 
diff --git a/modules/ui/intro/navigation.js b/modules/ui/intro/navigation.js
index a1828dd908..4e77076510 100644
--- a/modules/ui/intro/navigation.js
+++ b/modules/ui/intro/navigation.js
@@ -2,8 +2,6 @@ import { Extent, vecEqual } from '@rapid-sdk/math';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
 import { utilRebind } from '../../util/rebind';
 import { delayAsync, eventCancel, helpHtml, icon, showEntityEditor, transitionTime } from './helper';
 
@@ -12,24 +10,27 @@ export function uiIntroNavigation(context, curtain) {
   const dispatch = d3_dispatch('done');
   const chapter = { title: 'intro.navigation.title' };
   const container = context.container();
-  const history = context.history();
-  const map = context.map();
+  const editSystem = context.editSystem();
+  const mapSystem = context.mapSystem();
+  const presetSystem = context.presetSystem();
 
   const townHallID = 'n2061';
   const townHallExtent = new Extent([-85.63654, 41.94290], [-85.63632, 41.94307]);
   const springStreetID = 'w397';
   const springStreetExtent = new Extent([-85.63588, 41.94155], [-85.63574, 41.94278]);
-  const onewayField = presetManager.field('oneway');
-  const maxspeedField = presetManager.field('maxspeed');
+  const onewayField = presetSystem.field('oneway');
+  const maxspeedField = presetSystem.field('maxspeed');
 
   let _chapterCancelled = false;
   let _rejectStep = null;
+  let _onMapMove = null;
+  let _onModeChange = null;
 
 
   // Helper functions
   function _isTownHallSelected() {
     if (!context.hasEntity(townHallID)) return false;
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === townHallID;
   }
@@ -40,7 +41,7 @@ export function uiIntroNavigation(context, curtain) {
 
   function _isSpringStreetSelected() {
     if (!context.hasEntity(springStreetID)) return false;
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === springStreetID;
   }
@@ -80,23 +81,22 @@ export function uiIntroNavigation(context, curtain) {
   // Drag the map to advance
   function dragMapAsync() {
     context.enter('browse');
-    history.reset('initial');
-    let onMove;
+    editSystem.resetToCheckpoint('initial');
 
     const loc = townHallExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
-        const centerStart = map.center();
-        const textID = context.lastPointerType() === 'mouse' ? 'drag' : 'drag_touch';
-        const dragString = helpHtml('intro.navigation.map_info') + '{br}' + helpHtml(`intro.navigation.${textID}`);
+        const centerStart = mapSystem.center();
+        const textID = context.lastPointerType === 'mouse' ? 'drag' : 'drag_touch';
+        const dragString = helpHtml(context, 'intro.navigation.map_info') + '{br}' + helpHtml(context, `intro.navigation.${textID}`);
 
-        onMove = () => {
-          if (!vecEqual(centerStart, map.center())) {  // map moved
+        _onMapMove = () => {
+          if (!vecEqual(centerStart, mapSystem.center())) {  // map moved
             resolve(zoomMapAsync);
           }
         };
@@ -105,11 +105,9 @@ export function uiIntroNavigation(context, curtain) {
           revealSelector: '.main-map',
           tipHtml: dragString
         });
-
-        map.on('move', onMove);
       }))
       .finally(() => {
-        if (onMove) map.off('move', onMove);
+        _onMapMove = null;
       })
       .then(nextStep => delayAsync(2000).then(nextStep));
   }
@@ -117,16 +115,14 @@ export function uiIntroNavigation(context, curtain) {
 
   // Zoom the map to advance
   function zoomMapAsync() {
-    let onMove;
-
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-      const zoomStart = map.zoom();
-      const textID = context.lastPointerType() === 'mouse' ? 'zoom' : 'zoom_touch';
-      const zoomString = helpHtml(`intro.navigation.${textID}`);
+      const zoomStart = mapSystem.zoom();
+      const textID = context.lastPointerType === 'mouse' ? 'zoom' : 'zoom_touch';
+      const zoomString = helpHtml(context, `intro.navigation.${textID}`);
 
-      onMove = () => {
-        if (zoomStart !== map.zoom()) {  // map zoomed
+      _onMapMove = () => {
+        if (zoomStart !== mapSystem.zoom()) {  // map zoomed
           resolve(featuresAsync);
         }
       };
@@ -135,11 +131,9 @@ export function uiIntroNavigation(context, curtain) {
         revealSelector: '.main-map',
         tipHtml: zoomString
       });
-
-      map.on('move', onMove);
     })
     .finally(() => {
-      if (onMove) map.off('move', onMove);
+      _onMapMove = null;
     })
     .then(nextStep => delayAsync(2000).then(nextStep));
   }
@@ -152,8 +146,8 @@ export function uiIntroNavigation(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.main-map',
-        tipHtml: helpHtml('intro.navigation.features'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.navigation.features'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(pointsLinesAreasAsync)
       });
     });
@@ -167,8 +161,8 @@ export function uiIntroNavigation(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.main-map',
-        tipHtml: helpHtml('intro.navigation.points_lines_areas'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.navigation.points_lines_areas'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(nodesWaysAsync)
       });
     });
@@ -182,8 +176,8 @@ export function uiIntroNavigation(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.main-map',
-        tipHtml: helpHtml('intro.navigation.nodes_ways'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.navigation.nodes_ways'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(clickTownHallAsync)
       });
     });
@@ -193,27 +187,28 @@ export function uiIntroNavigation(context, curtain) {
   // Select the town hall to advance
   function clickTownHallAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
 
     const loc = townHallExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
 
-        const textID = context.lastPointerType() === 'mouse' ? 'click_townhall' : 'tap_townhall';
+        _onModeChange = () => resolve(selectedTownHallAsync);
+
+        const textID = context.lastPointerType === 'mouse' ? 'click_townhall' : 'tap_townhall';
         curtain.reveal({
           revealExtent: townHallExtent,
-          tipHtml: helpHtml(`intro.navigation.${textID}`)
+          tipHtml: helpHtml(context, `intro.navigation.${textID}`)
         });
 
-        context.on('enter.intro', () => resolve(selectedTownHallAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -225,18 +220,17 @@ export function uiIntroNavigation(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change
 
       curtain.reveal({
         revealExtent: townHallExtent,
-        tipHtml: helpHtml('intro.navigation.selected_townhall'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.navigation.selected_townhall'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(editorTownHallAsync)
       });
-
-      context.on('enter.intro', reject);   // disallow mode change
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -248,20 +242,20 @@ export function uiIntroNavigation(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change
+
       showEntityEditor(container);
       container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
 
       curtain.reveal({
         revealSelector: '.entity-editor-pane',
-        tipHtml: helpHtml('intro.navigation.editor_townhall'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.navigation.editor_townhall'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(presetTownHallAsync)
       });
-
-      context.on('enter.intro', reject);   // disallow mode change
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
       container.select('.inspector-wrap').on('wheel.intro', null);
     });
   }
@@ -274,25 +268,25 @@ export function uiIntroNavigation(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change
+
       showEntityEditor(container);
       container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
 
       // preset match, in case the user happened to change it.
       const entity = context.entity(context.selectedIDs()[0]);
-      const preset = presetManager.match(entity, context.graph());
+      const preset = presetSystem.match(entity, context.graph());
 
       curtain.reveal({
         revealSelector: '.entity-editor-pane .section-feature-type',
         revealPadding: 5,
-        tipHtml: helpHtml('intro.navigation.preset_townhall', { preset: preset.name() }),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.navigation.preset_townhall', { preset: preset.name() }),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(fieldsTownHallAsync)
       });
-
-      context.on('enter.intro', reject);   // disallow mode change
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
       container.select('.inspector-wrap').on('wheel.intro', null);
     });
   }
@@ -305,21 +299,21 @@ export function uiIntroNavigation(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change
+
       showEntityEditor(container);
       container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
 
       curtain.reveal({
         revealSelector: '.entity-editor-pane .section-preset-fields',
         revealPadding: 5,
-        tipHtml: helpHtml('intro.navigation.fields_townhall'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.navigation.fields_townhall'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(closeTownHallAsync)
       });
-
-      context.on('enter.intro', reject);   // disallow mode change
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
       container.select('.inspector-wrap').on('wheel.intro', null);
     });
   }
@@ -331,6 +325,8 @@ export function uiIntroNavigation(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(searchStreetAsync);
+
       showEntityEditor(container);
 
       const iconSelector = '.entity-editor-pane button.close svg use';
@@ -338,13 +334,11 @@ export function uiIntroNavigation(context, curtain) {
       curtain.reveal({
         revealSelector: '.entity-editor-pane',
         tipSelector: '.entity-editor-pane button.close',
-        tipHtml: helpHtml('intro.navigation.close_townhall', { button: icon(iconName, 'inline') })
+        tipHtml: helpHtml(context, 'intro.navigation.close_townhall', { button: icon(iconName, 'inline') })
       });
-
-      context.on('enter.intro', () => resolve(searchStreetAsync));
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -354,19 +348,19 @@ export function uiIntroNavigation(context, curtain) {
   // Type in the search box to advance
   function searchStreetAsync() {
     context.enter('browse');
-    history.reset('initial');  // ensure spring street exists
+    editSystem.resetToCheckpoint('initial');  // ensure spring street exists
 
     const loc = springStreetExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         curtain.reveal({
           revealSelector: '.search-header input',
-          tipHtml: helpHtml('intro.navigation.search_street', { name: t('intro.graph.name.spring-street') })
+          tipHtml: helpHtml(context, 'intro.navigation.search_street', { name: context.t('intro.graph.name.spring-street') })
         });
 
         container.select('.search-header input').on('keyup.intro', () => resolve(checkSearchResultAsync));
@@ -384,19 +378,18 @@ export function uiIntroNavigation(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      context.on('enter.intro', () => resolve(selectedStreetAsync));
+      _onModeChange = () => resolve(selectedStreetAsync);
 
       container.select('.search-header input').on('keyup.intro', () => {
         const first = container.select('.feature-list-item:nth-child(0n+2)');  // skip "No Results" item
         const firstName = first.select('.entity-name');
-        const name = t('intro.graph.name.spring-street');
+        const name = context.t('intro.graph.name.spring-street');
 
         if (!firstName.empty() && firstName.html() === name) {
           curtain.reveal({
             revealNode: first.node(),
             revealPadding: 5,
-            tipHtml: helpHtml('intro.navigation.choose_street', { name: name })
+            tipHtml: helpHtml(context, 'intro.navigation.choose_street', { name: name })
           });
           // no more typing
           container.select('.search-header input')
@@ -406,7 +399,7 @@ export function uiIntroNavigation(context, curtain) {
       });
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
       container.select('.search-header input')
         .on('keydown.intro', null)
         .on('keyup.intro', null);
@@ -423,24 +416,24 @@ export function uiIntroNavigation(context, curtain) {
     // to show only the `springStreetExtent` instead.
     const loc = springStreetExtent.center();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 19, 0 /* asap */)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onModeChange = reject;   // disallow mode change
+
         if (!_isSpringStreetSelected()) { resolve(searchStreetAsync); return; }
 
         curtain.reveal({
           revealExtent: springStreetExtent,
           revealPadding: 40,
-          tipHtml: helpHtml('intro.navigation.selected_street', { name: t('intro.graph.name.spring-street') }),
-          buttonText: t.html('intro.ok'),
+          tipHtml: helpHtml(context, 'intro.navigation.selected_street', { name: context.t('intro.graph.name.spring-street') }),
+          buttonText: context.tHtml('intro.ok'),
           buttonCallback: () => resolve(editorStreetAsync)
         });
-
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -452,11 +445,13 @@ export function uiIntroNavigation(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(playAsync);
+
       showEntityEditor(container);
       const iconSelector = '.entity-editor-pane button.close svg use';
       const iconName = d3_select(iconSelector).attr('href') || '#rapid-icon-close';
-      const tipHtml = helpHtml('intro.navigation.street_different_fields') + '{br}' +
-        helpHtml('intro.navigation.editor_street', {
+      const tipHtml = helpHtml(context, 'intro.navigation.street_different_fields') + '{br}' +
+        helpHtml(context, 'intro.navigation.editor_street', {
           button: icon(iconName, 'inline'),
           field1: onewayField.label(),
           field2: maxspeedField.label()
@@ -466,11 +461,9 @@ export function uiIntroNavigation(context, curtain) {
         revealSelector: '.entity-editor-pane',
         tipHtml: tipHtml
       });
-
-      context.on('enter.intro', () => resolve(playAsync));
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -482,8 +475,8 @@ export function uiIntroNavigation(context, curtain) {
     curtain.reveal({
       revealSelector: '.ideditor',
       tipSelector: '.intro-nav-wrap .chapter-point',
-      tipHtml: helpHtml('intro.navigation.play', { next: t('intro.points.title') }),
-      buttonText: t.html('intro.ok'),
+      tipHtml: helpHtml(context, 'intro.navigation.play', { next: context.t('intro.points.title') }),
+      buttonText: context.tHtml('intro.ok'),
       buttonCallback: () => curtain.reveal({ revealSelector: '.ideditor' })  // re-reveal but without the tooltip
     });
     return Promise.resolve();
@@ -493,9 +486,25 @@ export function uiIntroNavigation(context, curtain) {
   chapter.enter = () => {
     _chapterCancelled = false;
     _rejectStep = null;
+    _onMapMove = null;
+    _onModeChange = null;
+
+    context.on('modechange', _modeChangeListener);
+    mapSystem.on('move', _mapMoveListener);
 
     runAsync(dragMapAsync)
-      .catch(e => { if (e instanceof Error) console.error(e); });  // eslint-disable-line no-console
+      .catch(e => { if (e instanceof Error) console.error(e); })   // eslint-disable-line no-console
+      .finally(() => {
+        context.off('modechange', _modeChangeListener);
+        mapSystem.off('move', _mapMoveListener);
+      });
+
+    function _mapMoveListener() {
+      if (typeof _onMapMove === 'function') _onMapMove();
+    }
+    function _modeChangeListener(mode) {
+      if (typeof _onModeChange === 'function') _onModeChange(mode);
+    }
   };
 
 
diff --git a/modules/ui/intro/point.js b/modules/ui/intro/point.js
index 241c64c047..8bedbbe5ef 100644
--- a/modules/ui/intro/point.js
+++ b/modules/ui/intro/point.js
@@ -2,10 +2,7 @@ import { Extent } from '@rapid-sdk/math';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
 import { actionChangePreset } from '../../actions/change_preset';
-import { modeSelect } from '../../modes/select';
 import { utilRebind } from '../../util/rebind';
 import { delayAsync, eventCancel, helpHtml, icon, showEntityEditor, showPresetList, transitionTime } from './helper';
 
@@ -15,14 +12,17 @@ export function uiIntroPoint(context, curtain) {
   const chapter = { title: 'intro.points.title' };
   const editMenu = context.ui().editMenu();
   const container = context.container();
-  const history = context.history();
-  const map = context.map();
+  const editSystem = context.editSystem();
+  const mapSystem = context.mapSystem();
+  const presetSystem = context.presetSystem();
 
   const buildingExtent = new Extent([-85.63261, 41.94391], [-85.63222, 41.94419]);
-  const cafePreset = presetManager.item('amenity/cafe');
+  const cafePreset = presetSystem.item('amenity/cafe');
 
   let _chapterCancelled = false;
   let _rejectStep = null;
+  let _onModeChange = null;
+  let _onEditChange = null;
   let _pointID = null;
 
 
@@ -32,7 +32,7 @@ export function uiIntroPoint(context, curtain) {
   }
 
   function _isPointSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (context.mode().id !== 'select-osm') return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === _pointID;
   }
@@ -55,20 +55,22 @@ export function uiIntroPoint(context, curtain) {
   // Click "Add Point" button to advance
   function addPointAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
     _pointID = null;
 
     const loc = buildingExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 20, msec)   // bug: too hard to place a point in the building at z19 because of snapping to fill #719
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onModeChange = () => resolve(placePointAsync);
+
         const tooltip = curtain.reveal({
           revealSelector: 'button.add-point',
-          tipHtml: helpHtml('intro.points.points_info') + '{br}' + helpHtml('intro.points.add_point')
+          tipHtml: helpHtml(context, 'intro.points.points_info') + '{br}' + helpHtml(context, 'intro.points.add_point')
         });
 
         tooltip.selectAll('.popover-inner')
@@ -76,11 +78,9 @@ export function uiIntroPoint(context, curtain) {
           .attr('class', 'tooltip-illustration')
           .append('use')
           .attr('xlink:href', '#rapid-graphic-points');
-
-        context.on('enter.intro', () => resolve(placePointAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -92,26 +92,24 @@ export function uiIntroPoint(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
-
-      const textID = (context.lastPointerType() === 'mouse') ? 'place_point' : 'place_point_touch';
-      curtain.reveal({
-        revealExtent: buildingExtent,
-        tipHtml: helpHtml(`intro.points.${textID}`)
-      });
-
-      history.on('change.intro', difference => {
+      _onModeChange = () => resolve(searchPresetAsync);
+      _onEditChange = (difference) => {
         if (!difference) return;
         const created = difference.created();
         if (created.length === 1) {
           _pointID = created[0].id;
         }
-      });
+      };
 
-      context.on('enter.intro', () => resolve(searchPresetAsync));
+      const textID = (context.lastPointerType === 'mouse') ? 'place_point' : 'place_point_touch';
+      curtain.reveal({
+        revealExtent: buildingExtent,
+        tipHtml: helpHtml(context, `intro.points.${textID}`)
+      });
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
+      _onEditChange = null;
     });
   }
 
@@ -123,7 +121,20 @@ export function uiIntroPoint(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesPointExist()) { resolve(addPointAsync); return; }
-        if (!_isPointSelected()) context.enter(modeSelect(context, [_pointID]));
+        if (!_isPointSelected()) context.enter('select-osm', { selectedIDs: [_pointID] });
+
+        _onModeChange = reject;  // disallow mode change
+        _onEditChange = (difference) => {
+          if (!difference) return;
+          const modified = difference.modified();
+          if (modified.length === 1) {
+            if (presetSystem.match(modified[0], context.graph()) === cafePreset) {
+              resolve(aboutFeatureEditorAsync);
+            } else {
+              reject();  // didn't pick cafe
+            }
+          }
+        };
 
         container.select('.inspector-wrap').on('wheel.intro', eventCancel);   // prevent scrolling
 
@@ -131,7 +142,7 @@ export function uiIntroPoint(context, curtain) {
 
         curtain.reveal({
           revealSelector: '.preset-search-input',
-          tipHtml: helpHtml('intro.points.search_cafe', { preset: cafePreset.name() })
+          tipHtml: helpHtml(context, 'intro.points.search_cafe', { preset: cafePreset.name() })
         });
 
         container.select('.preset-search-input')
@@ -147,31 +158,17 @@ export function uiIntroPoint(context, curtain) {
           curtain.reveal({
             revealNode: first.select('.preset-list-button').node(),
             revealPadding: 5,
-            tipHtml: helpHtml('intro.points.choose_cafe', { preset: cafePreset.name() })
+            tipHtml: helpHtml(context, 'intro.points.choose_cafe', { preset: cafePreset.name() })
           });
 
           container.select('.preset-search-input')
             .on('keydown.intro', eventCancel, true)   // no more typing
             .on('keyup.intro', null);
         }
-
-        history.on('change.intro', difference => {
-          if (!difference) return;
-          const modified = difference.modified();
-          if (modified.length === 1) {
-            if (presetManager.match(modified[0], context.graph()) === cafePreset) {
-              resolve(aboutFeatureEditorAsync);
-            } else {
-              reject();  // didn't pick cafe
-            }
-          }
-        });
-
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
         container.select('.inspector-wrap').on('wheel.intro', null);
         container.select('.preset-search-input').on('keydown.intro keyup.intro', null);
       });
@@ -185,23 +182,23 @@ export function uiIntroPoint(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesPointExist()) { resolve(addPointAsync); return; }
-        if (!_isPointSelected()) context.enter(modeSelect(context, [_pointID]));
+        if (!_isPointSelected()) context.enter('select-osm', { selectedIDs: [_pointID] });
+
+        // If user leaves select mode here, just continue with the tutorial.
+        _onModeChange = () => resolve(addNameAsync);
 
         showEntityEditor(container);
 
         curtain.reveal({
           revealSelector: '.entity-editor-pane',
-          tipHtml: helpHtml('intro.points.feature_editor'),
+          tipHtml: helpHtml(context, 'intro.points.feature_editor'),
           tipClass: 'intro-points-describe',
-          buttonText: t.html('intro.ok'),
+          buttonText: context.tHtml('intro.ok'),
           buttonCallback: () => resolve(addNameAsync)
         });
-
-        // If user leaves select mode here, just continue with the tutorial.
-        context.on('enter.intro', () => resolve(addNameAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -213,7 +210,11 @@ export function uiIntroPoint(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_doesPointExist()) { resolve(addPointAsync); return; }
-        if (!_isPointSelected()) context.enter(modeSelect(context, [_pointID]));
+        if (!_isPointSelected()) context.enter('select-osm', { selectedIDs: [_pointID] });
+
+        // If user leaves select mode here, just continue with the tutorial.
+        _onModeChange = () => resolve(hasPointAsync);
+        _onEditChange = () => resolve(addCloseEditorAsync);
 
         showEntityEditor(container);
 
@@ -224,8 +225,8 @@ export function uiIntroPoint(context, curtain) {
         if (entity.tags.name) {
           const tooltip = curtain.reveal({
             revealSelector: '.entity-editor-pane',
-            tipHtml: helpHtml('intro.points.fields_info'),
-            buttonText: t.html('intro.ok'),
+            tipHtml: helpHtml(context, 'intro.points.fields_info'),
+            buttonText: context.tHtml('intro.ok'),
             buttonCallback: () => resolve(addCloseEditorAsync)
           });
 
@@ -234,19 +235,14 @@ export function uiIntroPoint(context, curtain) {
         } else {
           curtain.reveal({
             revealSelector: '.entity-editor-pane',
-            tipHtml: helpHtml('intro.points.fields_info') + '{br}' + helpHtml('intro.points.add_name'),
+            tipHtml: helpHtml(context, 'intro.points.fields_info') + '{br}' + helpHtml(context, 'intro.points.add_name'),
             tipClass: 'intro-points-describe'
           });
         }
-
-        history.on('change.intro', () => resolve(addCloseEditorAsync));
-
-        // If user leaves select mode here, just continue with the tutorial.
-        context.on('enter.intro', () => resolve(hasPointAsync));
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
       });
   }
 
@@ -255,39 +251,38 @@ export function uiIntroPoint(context, curtain) {
   // Close entity editor / leave select mode to advance
   function addCloseEditorAsync() {
     if (!_doesPointExist()) return Promise.resolve(addPointAsync);
-    if (!_isPointSelected()) context.enter(modeSelect(context, [_pointID]));
+    if (!_isPointSelected()) context.enter('select-osm', { selectedIDs: [_pointID] });
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(hasPointAsync);
+
       showEntityEditor(container);
 
       const iconSelector = '.entity-editor-pane button.close svg use';
       const iconName = d3_select(iconSelector).attr('href') || '#rapid-icon-close';
       curtain.reveal({
         revealSelector: '.entity-editor-pane',
-        tipHtml: helpHtml('intro.points.add_close', { button: icon(iconName, 'inline') })
+        tipHtml: helpHtml(context, 'intro.points.add_close', { button: icon(iconName, 'inline') })
       });
-
-      context.on('enter.intro', () => resolve(hasPointAsync));
     })
     .finally(() => {
-      history.on('change.intro', null);
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
 
-  // Set a history checkpoint here, so we can return back to it if needed
+  // Set a checkpoint here, so we can return back to it if needed
   // The point exists and it is a cafe and it probably has a name.
   function hasPointAsync() {
     if (!_doesPointExist()) return Promise.resolve(addPointAsync);
 
     // Make sure it's still a cafe, in case user somehow changed it..
     const entity = context.entity(_pointID);
-    const oldPreset = presetManager.match(entity, context.graph());
+    const oldPreset = presetSystem.match(entity, context.graph());
     context.replace(actionChangePreset(_pointID, oldPreset, cafePreset));
 
-    history.checkpoint('hasPoint');
+    editSystem.setCheckpoint('hasPoint');
     return Promise.resolve(reselectPointAsync);  // advance
   }
 
@@ -296,26 +291,25 @@ export function uiIntroPoint(context, curtain) {
   // Reselect the point to advance
   function reselectPointAsync() {
     context.enter('browse');
-    history.reset('hasPoint');
+    editSystem.resetToCheckpoint('hasPoint');
 
     const loc = buildingExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 20, msec)   // bug: too hard to place a point in the building at z19 because of snapping to fill #719
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
+        _onModeChange = () => resolve(updatePointAsync);
 
         curtain.reveal({
           revealExtent: buildingExtent,
-          tipHtml: helpHtml('intro.points.reselect')
+          tipHtml: helpHtml(context, 'intro.points.reselect')
         });
-
-        context.on('enter.intro', () => resolve(updatePointAsync));
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -328,20 +322,20 @@ export function uiIntroPoint(context, curtain) {
         _rejectStep = reject;
         if (!_doesPointExist() || !_isPointSelected()) { resolve(reselectPointAsync); return; }
 
+        _onModeChange = reject;   // disallow mode change
+        _onEditChange = () => resolve(updateCloseEditorAsync);
+
         showEntityEditor(container);
 
         curtain.reveal({
           revealSelector: '.entity-editor-pane',
-          tipHtml: helpHtml('intro.points.update'),
+          tipHtml: helpHtml(context, 'intro.points.update'),
           tipClass: 'intro-points-describe'
         });
-
-        history.on('change.intro', () => resolve(updateCloseEditorAsync));
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
       });
  }
 
@@ -353,17 +347,17 @@ export function uiIntroPoint(context, curtain) {
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(rightClickPointAsync);
+
       showEntityEditor(container);
 
       curtain.reveal({
         revealSelector: '.entity-editor-pane',
-        tipHtml: helpHtml('intro.points.update_close', { button: icon('#rapid-icon-close', 'inline') })
+        tipHtml: helpHtml(context, 'intro.points.update_close', { button: icon('#rapid-icon-close', 'inline') })
       });
-
-      context.on('enter.intro', () => resolve(rightClickPointAsync));
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
     });
   }
 
@@ -372,26 +366,25 @@ export function uiIntroPoint(context, curtain) {
   // Open the edit menu to advance
   function rightClickPointAsync() {
     if (!_doesPointExist()) return Promise.resolve(reselectPointAsync);
-    if (!['browse', 'select'].includes(context.mode().id)) context.enter('browse');
+    if (!['browse', 'select-osm'].includes(context.mode().id)) context.enter('browse');
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onEditChange = reject;  // disallow doing anything else
 
-      const textID = context.lastPointerType() === 'mouse' ? 'rightclick' : 'edit_menu_touch';
+      const textID = context.lastPointerType === 'mouse' ? 'rightclick' : 'edit_menu_touch';
       curtain.reveal({
         revealExtent: buildingExtent,
-        tipHtml: helpHtml(`intro.points.${textID}`)
+        tipHtml: helpHtml(context, `intro.points.${textID}`)
       });
 
       editMenu.on('toggled.intro', open => {
         if (open) resolve(enterDeleteAsync);
       });
-
-      history.on('change.intro', reject);  // disallow doing anything else
     })
     .finally(() => {
+      _onEditChange = null;
       editMenu.on('toggled.intro', null);
-      history.on('change.intro', null);
     });
   }
 
@@ -405,29 +398,28 @@ export function uiIntroPoint(context, curtain) {
     return delayAsync()  // after edit menu fully visible
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
-        if (!_doesPointExist() || !_isPointSelected()) { resolve(rightClickPointAsync); return; }
-
-        curtain.reveal({
-          revealSelector: '.edit-menu',
-          revealPadding: 50,
-          tipHtml: helpHtml('intro.points.delete')
-        });
-
-        history.on('change.intro', difference => {
+        _onModeChange = () => {
+          if (_doesPointExist()) reject();  // point still exists, try again
+        };
+        _onEditChange = (difference) => {
           if (!difference) return;
           const deleted = difference.deleted();
           if (deleted.length === 1 && deleted[0].id === _pointID) {
             resolve(undoAsync);
           }
-        });
+        };
 
-        context.on('enter.intro', () => {
-          if (_doesPointExist()) reject();  // point still exists, try again
+        if (!_doesPointExist() || !_isPointSelected()) { resolve(rightClickPointAsync); return; }
+
+        curtain.reveal({
+          revealSelector: '.edit-menu',
+          revealPadding: 50,
+          tipHtml: helpHtml(context, 'intro.points.delete')
         });
       }))
       .finally(() => {
-        history.on('change.intro', null);
-        context.on('enter.intro', null);
+        _onModeChange = null;
+        _onEditChange = null;
       });
   }
 
@@ -437,14 +429,14 @@ export function uiIntroPoint(context, curtain) {
   function undoAsync() {
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onEditChange = () => resolve(playAsync);
       curtain.reveal({
         revealSelector: '.top-toolbar button.undo-button',
-        tipHtml: helpHtml('intro.points.undo')
+        tipHtml: helpHtml(context, 'intro.points.undo')
       });
-      history.on('change.intro', () => resolve(playAsync));
     })
     .finally(() => {
-      history.on('change.intro', null);
+      _onEditChange = null;
     });
   }
 
@@ -456,8 +448,8 @@ export function uiIntroPoint(context, curtain) {
     curtain.reveal({
       revealSelector: '.ideditor',
       tipSelector: '.intro-nav-wrap .chapter-area',
-      tipHtml: helpHtml('intro.points.play', { next: t('intro.areas.title') }),
-      buttonText: t.html('intro.ok'),
+      tipHtml: helpHtml(context, 'intro.points.play', { next: context.t('intro.areas.title') }),
+      buttonText: context.tHtml('intro.ok'),
       buttonCallback: () => curtain.reveal({ revealSelector: '.ideditor' })  // re-reveal but without the tooltip
     });
     return Promise.resolve();
@@ -467,9 +459,25 @@ export function uiIntroPoint(context, curtain) {
   chapter.enter = () => {
     _chapterCancelled = false;
     _rejectStep = null;
+    _onModeChange = null;
+    _onEditChange = null;
+
+    context.on('modechange', _modeChangeListener);
+    editSystem.on('change', _editChangeListener);
 
     runAsync(addPointAsync)
-      .catch(e => { if (e instanceof Error) console.error(e); });  // eslint-disable-line no-console
+      .catch(e => { if (e instanceof Error) console.error(e); })   // eslint-disable-line no-console
+      .finally(() => {
+        context.off('modechange', _modeChangeListener);
+        editSystem.off('change', _editChangeListener);
+      });
+
+    function _modeChangeListener(mode) {
+      if (typeof _onModeChange === 'function') _onModeChange(mode);
+    }
+    function _editChangeListener(difference) {
+      if (typeof _onEditChange === 'function') _onEditChange(difference);
+    }
   };
 
 
diff --git a/modules/ui/intro/rapid.js b/modules/ui/intro/rapid.js
index 9ff436d4fa..fbe5ac8d6f 100644
--- a/modules/ui/intro/rapid.js
+++ b/modules/ui/intro/rapid.js
@@ -2,8 +2,6 @@ import { Extent } from '@rapid-sdk/math';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../../core/localizer';
-import { modeSelect } from '../../modes/select';
 import { utilRebind } from '../../util/rebind';
 import { delayAsync, eventCancel, helpHtml, icon, transitionTime } from './helper';
 
@@ -11,20 +9,21 @@ import { delayAsync, eventCancel, helpHtml, icon, transitionTime } from './helpe
 export function uiIntroRapid(context, curtain) {
   const dispatch = d3_dispatch('done');
   const chapter = { title: 'intro.rapid.title' };
-  const history = context.history();
-  const map = context.map();
+  const editSystem = context.editSystem();
+  const mapSystem = context.mapSystem();
 
   const tulipLaneID = 'w-516';
   const tulipLaneExtent = new Extent([-85.62991, 41.95568], [-85.62700, 41.95638]);
 
   let _chapterCancelled = false;
   let _rejectStep = null;
+  let _onModeChange = null;
 
 
   // Helper functions
   // (Note that this returns true whether the way lives in the Rapid graph or OSM graph)
   function _isTulipLaneSelected() {
-    if (context.mode().id !== 'select') return false;
+    if (['select', 'select-osm'].includes(context.mode().id))  return false;
     const ids = context.selectedIDs();
     return ids.length === 1 && ids[0] === tulipLaneID;
   }
@@ -51,20 +50,20 @@ export function uiIntroRapid(context, curtain) {
   // Click Ok to advance
   function welcomeAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
 
     const loc = tulipLaneExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 18.5, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         curtain.reveal({
           revealSelector: '.intro-nav-wrap .chapter-rapid',
-          tipHtml: helpHtml('intro.rapid.start', { rapid: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }),
-          buttonText: t.html('intro.ok'),
+          tipHtml: helpHtml(context, 'intro.rapid.start', { rapid: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }),
+          buttonText: context.tHtml('intro.ok'),
           buttonCallback: () => resolve(showHideRoadsAsync)
         });
       }));
@@ -78,8 +77,8 @@ export function uiIntroRapid(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: 'button.rapid-features',
-        tipHtml: helpHtml('intro.rapid.ai_roads', { rapid: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.rapid.ai_roads', { rapid: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(selectRoadAsync)
       });
     });
@@ -90,25 +89,24 @@ export function uiIntroRapid(context, curtain) {
   // Select Tulip Lane to advance
   function selectRoadAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
     context.scene().enableLayers('rapid');
     context.ui().togglePanes();   // close issue pane
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = () => resolve(acceptRoadAsync);
 
       d3_select('.inspector-wrap').on('wheel.intro', eventCancel);  // prevent scrolling
 
       curtain.reveal({
         revealExtent: tulipLaneExtent,
-        tipHtml: helpHtml('intro.rapid.select_road')
+        tipHtml: helpHtml(context, 'intro.rapid.select_road')
       });
-
-      context.on('enter.intro', () => resolve(acceptRoadAsync));
     })
     .finally(() => {
+      _onModeChange = null;
       d3_select('.inspector-wrap').on('wheel.intro', null);
-      context.on('enter.intro', null);
     });
   }
 
@@ -121,22 +119,21 @@ export function uiIntroRapid(context, curtain) {
         _rejectStep = reject;
         if (!_isTulipLaneSelected()) { resolve(); return; }
 
+        _onModeChange = resolve;
         curtain.reveal({
           revealSelector: '.rapid-inspector-choice-accept',
-          tipHtml: helpHtml('intro.rapid.add_road')
+          tipHtml: helpHtml(context, 'intro.rapid.add_road')
         });
-
-        context.on('enter.intro', resolve);
       }))
       .then(() => {    // check undo annotation to see what the user did
-        if (history.undoAnnotation()?.type === 'rapid_accept_feature') {
+        if (editSystem.undoAnnotation()?.type === 'rapid_accept_feature') {
           return roadAcceptedAsync;
         } else {
           return selectRoadAsync;
         }
       })
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -148,19 +145,19 @@ export function uiIntroRapid(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_isTulipLaneAccepted()) { resolve(selectRoadAsync); return; }
-        if (!_isTulipLaneSelected()) context.enter(modeSelect(context, [tulipLaneID]));
+        if (!_isTulipLaneSelected()) context.enter('select-osm', { selectedIDs: [tulipLaneID] });
+
+        _onModeChange = reject;   // disallow mode change
 
         curtain.reveal({
           revealExtent: tulipLaneExtent,
-          tipHtml: helpHtml('intro.rapid.add_road_not_saved_yet', { rapid: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }),
-          buttonText: t('intro.ok'),
+          tipHtml: helpHtml(context, 'intro.rapid.add_road_not_saved_yet', { rapid: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }),
+          buttonText: context.t('intro.ok'),
           buttonCallback: () => resolve(showIssuesButtonAsync)
         });
-
-        context.on('enter.intro', reject);   // disallow mode change
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -169,21 +166,22 @@ export function uiIntroRapid(context, curtain) {
   // Open Issues panel to advance
   function showIssuesButtonAsync() {
     if (!_isTulipLaneAccepted()) return Promise.resolve(selectRoadAsync);
-    if (!_isTulipLaneSelected()) context.enter(modeSelect(context, [tulipLaneID]));
+    if (!_isTulipLaneSelected()) context.enter('select-osm', { selectedIDs: [tulipLaneID] });
 
     const issuesButton = d3_select('div.map-control.issues-control > button');
 
     return new Promise((resolve, reject) => {
       _rejectStep = reject;
+      _onModeChange = reject;   // disallow mode change
+
       curtain.reveal({
         revealNode: issuesButton.node(),
-        tipHtml: helpHtml('intro.rapid.open_issues')
+        tipHtml: helpHtml(context, 'intro.rapid.open_issues')
       });
-      context.on('enter.intro', reject);   // disallow mode change
       issuesButton.on('click.intro', () => resolve(showLintAsync));
     })
     .finally(() => {
-      context.on('enter.intro', null);
+      _onModeChange = null;
       issuesButton.on('click.intro', null);
     });
   }
@@ -196,14 +194,14 @@ export function uiIntroRapid(context, curtain) {
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         if (!_isTulipLaneAccepted()) { resolve(selectRoadAsync); return; }
-        if (!_isTulipLaneSelected()) context.enter(modeSelect(context, [tulipLaneID]));
+        if (!_isTulipLaneSelected()) context.enter('select-osm', { selectedIDs: [tulipLaneID] });
 
         const label = d3_select('li.issue.severity-warning');
         curtain.reveal({
           revealNode: label.node(),   // "connect these features" is expected to be the first child
           revealPadding: 5,
-          tipHtml: helpHtml('intro.rapid.new_lints'),
-          buttonText: t('intro.ok'),
+          tipHtml: helpHtml(context, 'intro.rapid.new_lints'),
+          buttonText: context.t('intro.ok'),
           buttonCallback: () => resolve(undoRoadAddAsync)
         });
       }));
@@ -214,7 +212,7 @@ export function uiIntroRapid(context, curtain) {
   // Click Undo to advance
   function undoRoadAddAsync() {
     if (!_isTulipLaneAccepted()) return Promise.resolve(selectRoadAsync);
-    if (!_isTulipLaneSelected()) context.enter(modeSelect(context, [tulipLaneID]));
+    if (!_isTulipLaneSelected()) context.enter('select-osm', { selectedIDs: [tulipLaneID] });
 
     const undoButton = d3_select('.top-toolbar button.undo-button');
 
@@ -222,7 +220,7 @@ export function uiIntroRapid(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealNode: undoButton.node(),
-        tipHtml: helpHtml('intro.rapid.undo_road_add', { button: icon('#rapid-icon-undo', 'pre-text') })
+        tipHtml: helpHtml(context, 'intro.rapid.undo_road_add', { button: icon('#rapid-icon-undo', 'pre-text') })
       });
       undoButton.on('click.intro', () => resolve(afterUndoRoadAddAsync));
     })
@@ -243,8 +241,8 @@ export function uiIntroRapid(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealExtent: tulipLaneExtent,
-        tipHtml: helpHtml('intro.rapid.undo_road_add_aftermath'),
-        buttonText: t('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.rapid.undo_road_add_aftermath'),
+        buttonText: context.t('intro.ok'),
         buttonCallback: () => resolve(selectRoadAgainAsync)
       });
     });
@@ -255,28 +253,29 @@ export function uiIntroRapid(context, curtain) {
   // Select Tulip Lane to advance
   function selectRoadAgainAsync() {
     context.enter('browse');
-    history.reset('initial');
+    editSystem.resetToCheckpoint('initial');
 
     const loc = tulipLaneExtent.center();
-    const msec = transitionTime(loc, map.center());
+    const msec = transitionTime(loc, mapSystem.center());
     if (msec > 0) curtain.hide();
 
-    return map
+    return mapSystem
       .setCenterZoomAsync(loc, 18.5, msec)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
-        curtain.reveal({
-          revealExtent: tulipLaneExtent,
-          tipHtml: helpHtml('intro.rapid.select_road_again')
-        });
 
-        context.on('enter.intro', () => {
-          if (context.selectedIDs().indexOf(tulipLaneID) === -1) return;
+        _onModeChange = () => {
+          if (!context.selectedIDs().includes(tulipLaneID)) return;
           resolve(ignoreRoadAsync);
+        };
+
+        curtain.reveal({
+          revealExtent: tulipLaneExtent,
+          tipHtml: helpHtml(context, 'intro.rapid.select_road_again')
         });
       }))
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -289,22 +288,22 @@ export function uiIntroRapid(context, curtain) {
         _rejectStep = reject;
         if (!_isTulipLaneSelected()) { resolve(); return; }
 
+        _onModeChange = resolve;
+
         curtain.reveal({
           revealSelector: '.rapid-inspector-choice-ignore',
-          tipHtml: helpHtml('intro.rapid.ignore_road')
+          tipHtml: helpHtml(context, 'intro.rapid.ignore_road')
         });
-
-        context.on('enter.intro', resolve);
       }))
       .then(() => {    // check undo annotation to see what the user did
-        if (history.undoAnnotation()?.type === 'rapid_ignore_feature') {
+        if (editSystem.undoAnnotation()?.type === 'rapid_ignore_feature') {
           return showHelpAsync;
         } else {
           return selectRoadAgainAsync;
         }
       })
       .finally(() => {
-        context.on('enter.intro', null);
+        _onModeChange = null;
       });
   }
 
@@ -316,12 +315,12 @@ export function uiIntroRapid(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.map-control.help-control',
-        tipHtml: helpHtml('intro.rapid.help', {
+        tipHtml: helpHtml(context, 'intro.rapid.help', {
           rapid: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid'),
           button: icon('#rapid-icon-help', 'pre-text'),
-          key: t('help.key')
+          key: context.t('help.key')
         }),
-        buttonText: t('intro.ok'),
+        buttonText: context.t('intro.ok'),
         buttonCallback: () => resolve(playAsync)
       });
     });
@@ -335,8 +334,8 @@ export function uiIntroRapid(context, curtain) {
     curtain.reveal({
       revealSelector: '.ideditor',
       tipSelector: '.intro-nav-wrap .chapter-startEditing',
-      tipHtml: helpHtml('intro.rapid.done', { next: t('intro.startediting.title') }),
-      buttonText: t.html('intro.ok'),
+      tipHtml: helpHtml(context, 'intro.rapid.done', { next: context.t('intro.startediting.title') }),
+      buttonText: context.tHtml('intro.ok'),
       buttonCallback: () => curtain.reveal({ revealSelector: '.ideditor' })  // re-reveal but without the tooltip
     });
     return Promise.resolve();
@@ -347,9 +346,19 @@ export function uiIntroRapid(context, curtain) {
     context.scene().enableLayers('rapid');
     _chapterCancelled = false;
     _rejectStep = null;
+    _onModeChange = null;
+
+    context.on('modechange', _modeChangeListener);
 
     runAsync(welcomeAsync)
-      .catch(e => { if (e instanceof Error) console.error(e); });  // eslint-disable-line no-console
+      .catch(e => { if (e instanceof Error) console.error(e); })  // eslint-disable-line no-console
+      .finally(() => {
+        context.off('modechange', _modeChangeListener);
+      });
+
+    function _modeChangeListener(mode) {
+      if (typeof _onModeChange === 'function') _onModeChange(mode);
+    }
   };
 
 
diff --git a/modules/ui/intro/start_editing.js b/modules/ui/intro/start_editing.js
index a93de4b78a..2005315539 100644
--- a/modules/ui/intro/start_editing.js
+++ b/modules/ui/intro/start_editing.js
@@ -1,6 +1,5 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
-import { t } from '../../core/localizer';
 import { helpHtml } from './helper';
 import { uiModal } from '../modal';
 import { utilRebind } from '../../util/rebind';
@@ -36,8 +35,8 @@ export function uiIntroStartEditing(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.map-control.help-control',
-        tipHtml: helpHtml('intro.startediting.help'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.startediting.help'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(shortcutsAsync)
       });
     });
@@ -51,8 +50,8 @@ export function uiIntroStartEditing(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.map-control.help-control',
-        tipHtml: helpHtml('intro.startediting.shortcuts'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.startediting.shortcuts'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(showSaveAsync)
       });
     });
@@ -68,8 +67,8 @@ export function uiIntroStartEditing(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.top-toolbar button.save',
-        tipHtml: helpHtml('intro.startediting.save'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.startediting.save'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(showStartMappingAsync)
       });
     });
@@ -103,7 +102,7 @@ export function uiIntroStartEditing(context, curtain) {
 
       startbutton
         .append('h2')
-        .html(t.html('intro.startediting.start'));
+        .html(context.tHtml('intro.startediting.start'));
     })
     .finally(() => {
       modalSelection.remove();
diff --git a/modules/ui/intro/welcome.js b/modules/ui/intro/welcome.js
index f7c0957ad7..d0b715e87b 100644
--- a/modules/ui/intro/welcome.js
+++ b/modules/ui/intro/welcome.js
@@ -2,7 +2,6 @@ import { Extent } from '@rapid-sdk/math';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import { helpHtml } from './helper';
-import { t } from '../../core/localizer';
 import { utilRebind } from '../../util/rebind';
 
 
@@ -31,14 +30,14 @@ export function uiIntroWelcome(context, curtain) {
   // "Welcome! This walkthrough will teach you the basics of editing on OpenStreetMap."
   // Click Ok to advance
   function welcomeAsync() {
-    return context.map()
+    return context.mapSystem()
       .setCenterZoomAsync(townHallExtent.center(), 19)
       .then(() => new Promise((resolve, reject) => {
         _rejectStep = reject;
         curtain.reveal({
           revealSelector: '.intro-nav-wrap .chapter-welcome',
-          tipHtml: helpHtml('intro.welcome.welcome'),
-          buttonText: t.html('intro.ok'),
+          tipHtml: helpHtml(context, 'intro.welcome.welcome'),
+          buttonText: context.tHtml('intro.ok'),
           buttonCallback: () => resolve(practiceAsync)
         });
       }));
@@ -51,8 +50,8 @@ export function uiIntroWelcome(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.intro-nav-wrap .chapter-welcome',
-        tipHtml: helpHtml('intro.welcome.practice'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.welcome.practice'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(wordsAsync)
       });
     });
@@ -65,8 +64,8 @@ export function uiIntroWelcome(context, curtain) {
       _rejectStep = reject;
       curtain.reveal({
         revealSelector: '.intro-nav-wrap .chapter-welcome',
-        tipHtml: helpHtml('intro.welcome.words'),
-        buttonText: t.html('intro.ok'),
+        tipHtml: helpHtml(context, 'intro.welcome.words'),
+        buttonText: context.tHtml('intro.ok'),
         buttonCallback: () => resolve(chaptersAsync)
       });
     });
@@ -78,7 +77,7 @@ export function uiIntroWelcome(context, curtain) {
     dispatch.call('done');
     curtain.reveal({
       revealSelector: '.intro-nav-wrap .chapter-navigation',
-      tipHtml: helpHtml('intro.welcome.chapters', { next: t('intro.navigation.title') })
+      tipHtml: helpHtml(context, 'intro.welcome.chapters', { next: context.t('intro.navigation.title') })
     });
     return Promise.resolve();
   }
diff --git a/modules/ui/issues_info.js b/modules/ui/issues_info.js
index e08c36a9af..5b55a168cd 100644
--- a/modules/ui/issues_info.js
+++ b/modules/ui/issues_info.js
@@ -1,99 +1,86 @@
 import { select as d3_select } from 'd3-selection';
 
-import { prefs } from '../core/preferences';
 import { uiIcon } from './icon';
-import { t } from '../core/localizer';
 import { uiTooltip } from './tooltip';
 
 
 export function uiIssuesInfo(context) {
+  const validator = context.validationSystem();
+  const prefs = context.storageSystem();
+
+  let warningsItem = {
+    id: 'warnings',
+    count: 0,
+    iconID: 'rapid-icon-alert',
+    descriptionID: 'issues.warnings_and_errors'
+  };
+
+  let resolvedItem = {
+    id: 'resolved',
+    count: 0,
+    iconID: 'rapid-icon-apply',
+    descriptionID: 'issues.user_resolved_issues'
+  };
+
+
+  function update(selection) {
+    let shownItems = [];
+    let liveIssues = validator.getIssues({
+      what: prefs.getItem('validate-what') ?? 'edited',
+      where: prefs.getItem('validate-where') ?? 'all'
+    });
+    if (liveIssues.length) {
+      warningsItem.count = liveIssues.length;
+      shownItems.push(warningsItem);
+    }
 
-    var warningsItem = {
-        id: 'warnings',
-        count: 0,
-        iconID: 'rapid-icon-alert',
-        descriptionID: 'issues.warnings_and_errors'
-    };
-
-    var resolvedItem = {
-        id: 'resolved',
-        count: 0,
-        iconID: 'rapid-icon-apply',
-        descriptionID: 'issues.user_resolved_issues'
-    };
-
-    function update(selection) {
-
-        var shownItems = [];
-
-        var liveIssues = context.validator().getIssues({
-            what: prefs('validate-what') || 'edited',
-            where: prefs('validate-where') || 'all'
-        });
-        if (liveIssues.length) {
-            warningsItem.count = liveIssues.length;
-            shownItems.push(warningsItem);
-        }
-
-        if (prefs('validate-what') === 'all') {
-            var resolvedIssues = context.validator().getResolvedIssues();
-            if (resolvedIssues.length) {
-                resolvedItem.count = resolvedIssues.length;
-                shownItems.push(resolvedItem);
-            }
-        }
-
-        var chips = selection.selectAll('.chip')
-            .data(shownItems, function(d) {
-                return d.id;
-            });
-
-        chips.exit().remove();
-
-        var enter = chips.enter()
-            .append('a')
-            .attr('class', function(d) {
-                return 'chip ' + d.id + '-count';
-            })
-            .attr('href', '#')
-            .each(function(d) {
-
-                var chipSelection = d3_select(this);
-
-                var tooltipBehavior = uiTooltip()
-                    .placement('top')
-                    .title(t.html(d.descriptionID));
-
-                chipSelection
-                    .call(tooltipBehavior)
-                    .on('click', function(d3_event) {
-                        d3_event.preventDefault();
-
-                        tooltipBehavior.hide(d3_select(this));
-                        // open the Issues pane
-                        context.ui().togglePanes(context.container().select('.map-panes .issues-pane'));
-                    });
-
-                chipSelection.call(uiIcon('#' + d.iconID));
-
-            });
-
-        enter.append('span')
-            .attr('class', 'count');
-
-        enter.merge(chips)
-            .selectAll('span.count')
-            .html(function(d) {
-                return d.count.toString();
-            });
+    if (prefs.getItem('validate-what') === 'all') {
+      let resolvedIssues = validator.getResolvedIssues();
+      if (resolvedIssues.length) {
+        resolvedItem.count = resolvedIssues.length;
+        shownItems.push(resolvedItem);
+      }
     }
 
+    let chips = selection.selectAll('.chip')
+      .data(shownItems, d => d.id);
+
+    chips.exit().remove();
+
+    let enter = chips.enter()
+      .append('a')
+      .attr('class', d => `chip ${d.id}-count`)
+      .attr('href', '#')
+      .each((d, i, nodes) => {
+        let chipSelection = d3_select(nodes[i]);
+
+        let tooltip = uiTooltip(context)
+          .placement('top')
+          .title(context.tHtml(d.descriptionID));
+
+        chipSelection
+          .call(tooltip)
+          .on('click', d3_event => {
+            d3_event.preventDefault();
+            tooltip.hide();
+            // open the Issues pane
+            context.ui().togglePanes(context.container().select('.map-panes .issues-pane'));
+          });
+
+        chipSelection.call(uiIcon(`#${d.iconID}`));
+      });
+
+    enter.append('span')
+      .attr('class', 'count');
+
+    enter.merge(chips)
+      .selectAll('span.count')
+      .text(d => d.count.toString());
+  }
 
-    return function(selection) {
-        update(selection);
 
-        context.validator().on('validated.infobox', function() {
-            update(selection);
-        });
-    };
+  return function render(selection) {
+    update(selection);
+    validator.on('validated', () => update(selection));
+  };
 }
diff --git a/modules/ui/keepRight_details.js b/modules/ui/keepRight_details.js
index 9fdfca9bb9..33f855c961 100644
--- a/modules/ui/keepRight_details.js
+++ b/modules/ui/keepRight_details.js
@@ -1,24 +1,22 @@
 import { select as d3_select } from 'd3-selection';
 
-import { presetManager } from '../presets';
-import { modeSelect } from '../modes/select';
-import { t } from '../core/localizer';
-import { utilDisplayName, utilHighlightEntities } from '../util';
+import { utilHighlightEntities } from '../util';
 
 
 export function uiKeepRightDetails(context) {
+  const l10n = context.localizationSystem();
   let _qaItem;
 
 
   function issueDetail(d) {
     const { itemType, parentIssueType } = d;
-    const unknown = t.html('inspector.unknown');
+    const unknown = l10n.tHtml('inspector.unknown');
     let replacements = d.replacements || {};
     replacements.default = unknown;  // special key `default` works as a fallback string
 
-    let detail = t.html(`QA.keepRight.errorTypes.${itemType}.description`, replacements);
+    let detail = l10n.tHtml(`QA.keepRight.errorTypes.${itemType}.description`, replacements);
     if (detail === unknown) {
-      detail = t.html(`QA.keepRight.errorTypes.${parentIssueType}.description`, replacements);
+      detail = l10n.tHtml(`QA.keepRight.errorTypes.${parentIssueType}.description`, replacements);
     }
     return detail;
   }
@@ -36,30 +34,31 @@ export function uiKeepRightDetails(context) {
 
     const detailsEnter = details.enter()
       .append('div')
-        .attr('class', 'error-details qa-details-container');
+      .attr('class', 'error-details qa-details-container');
 
     // description
     const descriptionEnter = detailsEnter
       .append('div')
-        .attr('class', 'qa-details-subsection');
+      .attr('class', 'qa-details-subsection');
 
     descriptionEnter
       .append('h4')
-        .html(t.html('QA.keepRight.detail_description'));
+      .html(l10n.tHtml('QA.keepRight.detail_description'));
 
     descriptionEnter
       .append('div')
-        .attr('class', 'qa-details-description-text')
-        .html(issueDetail);
+      .attr('class', 'qa-details-description-text')
+      .html(issueDetail);
 
     // If there are entity links in the error message..
     let relatedEntities = [];
     descriptionEnter.selectAll('.error_entity_link, .error_object_link')
       .attr('href', '#')
-      .each(function() {
-        const link = d3_select(this);
+      .each((d, i, nodes) => {
+        const node = nodes[i];
+        const link = d3_select(node);
         const isObjectLink = link.classed('error_object_link');
-        const entityID = isObjectLink ? (_qaItem.objectType.charAt(0) + _qaItem.objectId) : this.textContent;
+        const entityID = isObjectLink ? (_qaItem.objectType.charAt(0) + _qaItem.objectId) : node.textContent;
         const entity = context.hasEntity(entityID);
 
         relatedEntities.push(entityID);
@@ -72,21 +71,23 @@ export function uiKeepRightDetails(context) {
           .on('mouseleave', () => {
             utilHighlightEntities([entityID], false, context);
           })
-          .on('click', (d3_event) => {
+          .on('click', d3_event => {
             d3_event.preventDefault();
 
             utilHighlightEntities([entityID], false, context);
 
             context.scene().enableLayers('osm');  // make sure osm layer is even on
-            context.map().centerZoomEase(_qaItem.loc, 20);
+            context.mapSystem().centerZoomEase(_qaItem.loc, 20);
 
             if (entity) {
-              context.enter(modeSelect(context, [entityID]));
+              context.enter('select-osm', { selectedIDs: [entityID] });
             } else {
               context.loadEntity(entityID, (err, result) => {
                 if (err) return;
                 const entity = result.data.find(e => e.id === entityID);
-                if (entity) context.enter(modeSelect(context, [entityID]));
+                if (entity) {
+                  context.enter('select-osm', { selectedIDs: [entityID] });
+                }
               });
             }
           });
@@ -94,24 +95,25 @@ export function uiKeepRightDetails(context) {
         // Replace with friendly name if possible
         // (The entity may not yet be loaded into the graph)
         if (entity) {
-          let name = utilDisplayName(entity);  // try to use common name
-
+          let name = l10n.displayName(entity);  // try to use common name
           if (!name && !isObjectLink) {
-            const preset = presetManager.match(entity, context.graph());
+            const presetSystem = context.presetSystem();
+            const preset = presetSystem.match(entity, context.graph());
             name = preset && !preset.isFallback() && preset.name();  // fallback to preset name
           }
 
           if (name) {
-            this.innerText = name;
+            node.innerText = name;
           }
         }
       });
 
-    // Don't hide entities related to this issue - #5880
-    context.features().forceVisible(relatedEntities);
-    context.map().immediateRedraw();
+    // Don't hide entities related to this issue - iD#5880
+    context.filterSystem().forceVisible(relatedEntities);
+    context.mapSystem().immediateRedraw();
   }
 
+
   keepRightDetails.issue = function(val) {
     if (!arguments.length) return _qaItem;
     _qaItem = val;
diff --git a/modules/ui/keepRight_editor.js b/modules/ui/keepRight_editor.js
index f50da6d51b..3e7ea9fab9 100644
--- a/modules/ui/keepRight_editor.js
+++ b/modules/ui/keepRight_editor.js
@@ -1,17 +1,15 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../core/localizer';
-import { services } from '../services';
 import { uiIcon } from './icon';
-
 import { uiKeepRightDetails } from './keepRight_details';
 import { uiKeepRightHeader } from './keepRight_header';
 import { uiViewOnKeepRight } from './view_on_keepRight';
-
 import { utilNoAuto, utilRebind } from '../util';
 
+
 export function uiKeepRightEditor(context) {
+  const keepright = context.services.get('keepRight');
   const dispatch = d3_dispatch('change');
   const qaDetails = uiKeepRightDetails(context);
   const qaHeader = uiKeepRightHeader(context);
@@ -19,7 +17,6 @@ export function uiKeepRightEditor(context) {
   let _qaItem;
 
   function keepRightEditor(selection) {
-
     const headerEnter = selection.selectAll('.header')
       .data([0])
       .enter()
@@ -34,7 +31,7 @@ export function uiKeepRightEditor(context) {
 
     headerEnter
       .append('h3')
-        .html(t.html('QA.keepRight.title'));
+        .html(context.tHtml('QA.keepRight.title'));
 
 
     let body = selection.selectAll('.body')
@@ -90,12 +87,12 @@ export function uiKeepRightEditor(context) {
     saveSectionEnter
       .append('h4')
         .attr('class', '.qa-save-header')
-        .html(t.html('QA.keepRight.comment'));
+        .html(context.tHtml('QA.keepRight.comment'));
 
     saveSectionEnter
       .append('textarea')
         .attr('class', 'new-comment-input')
-        .attr('placeholder', t('QA.keepRight.comment_placeholder'))
+        .attr('placeholder', context.t('QA.keepRight.comment_placeholder'))
         .attr('maxlength', 1000)
         .property('value', d => d.newComment || d.comment)
         .call(utilNoAuto)
@@ -118,9 +115,8 @@ export function uiKeepRightEditor(context) {
       // store the unsaved comment with the issue itself
       _qaItem = _qaItem.update({ newComment: val });
 
-      const qaService = services.keepRight;
-      if (qaService) {
-        qaService.replaceItem(_qaItem);  // update keepright cache
+      if (keepright) {
+        keepright.replaceItem(_qaItem);  // update keepright cache
       }
 
       saveSection
@@ -147,7 +143,7 @@ export function uiKeepRightEditor(context) {
     buttonEnter
       .append('button')
         .attr('class', 'button comment-button action')
-        .html(t.html('QA.keepRight.save_comment'));
+        .html(context.tHtml('QA.keepRight.save_comment'));
 
     buttonEnter
       .append('button')
@@ -165,37 +161,34 @@ export function uiKeepRightEditor(context) {
       .attr('disabled', d => d.newComment ? null : true)
       .on('click.comment', function(d3_event, d) {
         this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.keepRight;
-        if (qaService) {
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+        if (keepright) {
+          keepright.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
 
     buttonSection.select('.close-button')   // select and propagate data
       .html(d => {
         const andComment = (d.newComment ? '_comment' : '');
-        return t.html(`QA.keepRight.close${andComment}`);
+        return context.tHtml(`QA.keepRight.close${andComment}`);
       })
       .on('click.close', function(d3_event, d) {
         this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.keepRight;
-        if (qaService) {
+        if (keepright) {
           d.newStatus = 'ignore_t';   // ignore temporarily (item fixed)
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+          keepright.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
 
     buttonSection.select('.ignore-button')   // select and propagate data
       .html(d => {
         const andComment = (d.newComment ? '_comment' : '');
-        return t.html(`QA.keepRight.ignore${andComment}`);
+        return context.tHtml(`QA.keepRight.ignore${andComment}`);
       })
       .on('click.ignore', function(d3_event, d) {
         this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.keepRight;
-        if (qaService) {
+        if (keepright) {
           d.newStatus = 'ignore';   // ignore permanently (false positive)
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+          keepright.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
   }
diff --git a/modules/ui/keepRight_header.js b/modules/ui/keepRight_header.js
index bcbdd855ab..9785221096 100644
--- a/modules/ui/keepRight_header.js
+++ b/modules/ui/keepRight_header.js
@@ -1,22 +1,20 @@
-import * as PIXI from 'pixi.js';
+import { Color } from 'pixi.js';
 
-import { services } from '../services';
 import { uiIcon } from './icon';
-import { t } from '../core/localizer';
 
 
-export function uiKeepRightHeader() {
+export function uiKeepRightHeader(context) {
   let _qaItem;
 
 
   function issueTitle(d) {
-    const unknown = t.html('inspector.unknown');
+    const unknown = context.tHtml('inspector.unknown');
     let replacements = d.replacements || {};
     replacements.default = unknown;  // special key `default` works as a fallback string
 
-    let title = t.html(`QA.keepRight.errorTypes.${d.itemType}.title`, replacements);
+    let title = context.tHtml(`QA.keepRight.errorTypes.${d.itemType}.title`, replacements);
     if (title === unknown) {
-      title = t.html(`QA.keepRight.errorTypes.${d.parentIssueType}.title`, replacements);
+      title = context.tHtml(`QA.keepRight.errorTypes.${d.parentIssueType}.title`, replacements);
     }
     return title;
   }
@@ -24,9 +22,9 @@ export function uiKeepRightHeader() {
 
   function keepRightHeader(selection) {
     let iconFill = 0xffffff;
-    const service = services.keepRight;
-    if (service) {
-      iconFill = service.getColor(_qaItem?.parentIssueType);
+    const keepright = context.services.get('keepRight');
+    if (keepright) {
+      iconFill = keepright.getColor(_qaItem?.parentIssueType);
     }
 
     const header = selection.selectAll('.qa-header')
@@ -57,7 +55,7 @@ export function uiKeepRightHeader() {
     headerEnter.selectAll('.qaItem svg.icon')
       .attr('stroke', '#333')
       .attr('stroke-width', '1.3px')
-      .attr('color', PIXI.utils.hex2string(iconFill));
+      .attr('color', new Color(iconFill).toHex());
   }
 
 
diff --git a/modules/ui/map3d_viewer.js b/modules/ui/map3d_viewer.js
new file mode 100644
index 0000000000..68769cfe8b
--- /dev/null
+++ b/modules/ui/map3d_viewer.js
@@ -0,0 +1,249 @@
+import { Color } from 'pixi.js';
+import { select as d3_select } from 'd3-selection';
+
+import { styleMatch } from '../pixi/styles';
+import { uiCmd } from './cmd';
+
+/*
+ * uiMap3dViewer is a ui panel containing a maplibre 3D Map for visualizing buildings, roads, and areas.
+ * @param {*} context
+ * @returns
+ */
+export function uiMap3dViewer(context) {
+
+  function render(selection) {
+    let wrap = d3_select(null);
+    let _isHidden = true; // start out hidden
+
+
+    function redraw() {
+      if (_isHidden) return;
+      updateProjection();
+      featuresToGeoJSON();
+    }
+
+
+    function updateProjection() {
+      // Since the bounds are intended to wrap a box around a perfectly orthogonal view,
+      // for a pitched, isometric view we need to enlarge the box a bit to display more buildings.
+      let extent = context.mapSystem().extent();
+      let center = extent.center();
+      extent.padByMeters(100);
+
+      context.map3dSystem().maplibre.jumpTo({
+        center: center,
+        bearing: 0,
+        zoom: context.mapSystem().zoom() - 3,
+      });
+    }
+
+
+    function featuresToGeoJSON() {
+      let mainmap = context.mapSystem();
+      const entities = context.editSystem().intersects(mainmap.extent());
+
+      const buildingEnts = entities.filter((ent) => {
+        const tags = Object.keys(ent.tags).filter((tagname) =>
+          tagname.startsWith('building')
+        );
+        return tags.length > 0;
+      });
+
+      const highwayEnts = entities.filter((ent) => {
+        const tags = Object.keys(ent.tags).filter((tagname) =>
+          tagname.startsWith('highway')
+        );
+        return tags.length > 0;
+      });
+
+      const areaEnts = entities.filter((ent) => {
+        const tags = Object.keys(ent.tags).filter(
+          (tagname) =>
+            tagname.startsWith('landuse') ||
+            tagname.startsWith('leisure') ||
+            tagname.startsWith('natural') ||
+            tagname.startsWith('area')
+        );
+        return tags.length > 0;
+      });
+
+      generateRoadLayer(highwayEnts);
+      generateBuildingLayer(buildingEnts);
+      generateAreaLayer(areaEnts);
+    }
+
+
+    function generateBuildingLayer(buildingEnts) {
+      let buildingFeatures = [];
+      const selectedIDs = context.selectedIDs();
+
+      for (const buildingEnt of buildingEnts) {
+        const gj = buildingEnt.asGeoJSON(context.graph());
+        if (gj.type !== 'Polygon' && gj.type !== 'MultiPolygon') continue;
+
+        const newFeature = {
+          type: 'Feature',
+          properties: {
+            extrude: true,
+            selected: selectedIDs.includes(buildingEnt.id).toString(),
+            min_height: buildingEnt.tags.min_height
+              ? parseFloat(buildingEnt.tags.min_height)
+              : 0,
+            height: parseFloat(
+              buildingEnt.tags.height ||
+                buildingEnt.tags['building:levels'] * 3 ||
+                0
+            ),
+          },
+          geometry: gj,
+        };
+
+        buildingFeatures.push(newFeature);
+      }
+
+      const maplibre = context.map3dSystem().maplibre;
+      const buildingSource = maplibre?.getSource('osmbuildings');
+
+      if (buildingSource) {
+        buildingSource.setData({
+          type: 'FeatureCollection',
+          features: buildingFeatures,
+        });
+      }
+    }
+
+
+    function generateAreaLayer(areaEnts) {
+      let areaFeatures = [];
+      const selectedIDs = context.selectedIDs();
+
+      for (const areaEnt of areaEnts) {
+        let gj = areaEnt.asGeoJSON(context.graph());
+        if (gj.type !== 'Polygon' && gj.type !== 'MultiPolygon') continue;
+
+        const style = styleMatch(areaEnt.tags);
+        const fillColor = new Color(style.fill.color).toHex();
+        const strokeColor = new Color(style.stroke.color).toHex();
+
+        const newFeature = {
+          type: 'Feature',
+          properties: {
+            selected: selectedIDs.includes(areaEnt.id).toString(),
+            fillcolor: fillColor,
+            strokecolor: strokeColor,
+          },
+          geometry: gj,
+        };
+
+        areaFeatures.push(newFeature);
+      }
+
+      const maplibre = context.map3dSystem().maplibre;
+      const areaSource = maplibre?.getSource('osmareas');
+
+      if (areaSource) {
+        areaSource.setData({
+          type: 'FeatureCollection',
+          features: areaFeatures,
+        });
+      }
+    }
+
+
+    function generateRoadLayer(roadEnts) {
+      let roadFeatures = [];
+      const selectedIDs = context.selectedIDs();
+
+      for (const roadEnt of roadEnts) {
+        const gj = roadEnt.asGeoJSON(context.graph());
+        if (gj.type !== 'LineString') continue;
+
+        const style = styleMatch(roadEnt.tags);
+        const casingColor = new Color(style.casing.color).toHex();
+        const strokeColor = new Color(style.stroke.color).toHex();
+
+        const newFeature = {
+          type: 'Feature',
+          properties: {
+            selected: selectedIDs.includes(roadEnt.id).toString(),
+            highway: roadEnt.tags.highway,
+            casingColor: casingColor,
+            strokeColor: strokeColor,
+          },
+          geometry: gj,
+        };
+
+        roadFeatures.push(newFeature);
+      }
+
+      const maplibre = context.map3dSystem().maplibre;
+      const roadSource = maplibre?.getSource('osmroads');
+
+      if (roadSource) {
+        roadSource.setData({
+          type: 'FeatureCollection',
+          features: roadFeatures,
+        });
+      }
+    }
+
+
+    function toggle(d3_event) {
+      if (d3_event) d3_event.preventDefault();
+
+      _isHidden = !_isHidden;
+
+      context
+        .container()
+        .select('.three-d-map-toggle-item')
+        .classed('active', !_isHidden)
+        .select('input')
+        .property('checked', !_isHidden);
+
+      if (_isHidden) {
+        wrap
+          .style('display', 'block')
+          .style('opacity', '1')
+          .transition()
+          .duration(200)
+          .style('opacity', '0')
+          .on('end', () =>
+            selection.selectAll('.three-d-map').style('display', 'none')
+          );
+      } else {
+        wrap
+          .style('display', 'block')
+          .style('opacity', '0')
+          .transition()
+          .duration(200)
+          .style('opacity', '1')
+          .on('end', () => redraw());
+      }
+    }
+
+    /* setup */
+    uiMap3dViewer.toggle = toggle;
+
+    wrap = selection.selectAll('.three-d-map').data([0]);
+
+    let wrapEnter = wrap
+      .enter()
+      .append('div')
+      .attr('class', 'three-d-map')
+      .attr('id', '3d-buildings')
+      .style('display', _isHidden ? 'none' : 'block');
+
+    wrap = wrapEnter.merge(wrap);
+
+//    context.mapSystem().on('draw', () => redraw());
+//    context.mapSystem().on('move', () => redraw());
+//    context.editSystem().on('change', () => featuresToGeoJSON());
+//    context.on('modechange', () => featuresToGeoJSON());
+//    context.keybinding().on([uiCmd('⌘' + context.t('background.3dmap.key'))], toggle);
+
+    redraw();
+  }
+
+  return render;
+}
+
diff --git a/modules/ui/map_in_map.js b/modules/ui/map_in_map.js
index e1cd9b15cb..d575a1be11 100644
--- a/modules/ui/map_in_map.js
+++ b/modules/ui/map_in_map.js
@@ -3,7 +3,6 @@ import { select as d3_select } from 'd3-selection';
 import { zoom as d3_zoom, zoomIdentity as d3_zoomIdentity } from 'd3-zoom';
 import { Projection, geoScaleToZoom, geoZoomToScale, vecScale, vecSubtract } from '@rapid-sdk/math';
 
-import { t } from '../core/localizer';
 import { utilSetTransform } from '../util';
 import { PixiLayerBackgroundTiles } from '../pixi/PixiLayerBackgroundTiles';
 
@@ -120,7 +119,7 @@ export function uiMapInMap(context) {
 
       updateProjection();
       _gesture = null;
-      context.map().center(projection.invert(_cMini)); // recenter main map..
+      context.mapSystem().center(projection.invert(_cMini)); // recenter main map..
     }
 
 
@@ -129,7 +128,7 @@ export function uiMapInMap(context) {
      * Update the minimap projection and d3-zoom transform
      */
     function updateProjection() {
-      const loc = context.map().center();
+      const loc = context.mapSystem().center();
       const tMain = context.projection.transform();
       const zMain = geoScaleToZoom(tMain.k);
       const zMini = Math.max(zMain - _zDiff, 0.5);
@@ -166,7 +165,7 @@ export function uiMapInMap(context) {
      * Recalculates the position and size of the bounding box rectangle on the minimap
      */
     function updateBoundingBox() {
-      const bbox = context.map().extent().bbox();
+      const bbox = context.mapSystem().extent().bbox();
       const topLeftPoint = projection.project([bbox.minX, bbox.maxY]);
       const bottomRightPoint = projection.project([bbox.maxX, bbox.minY]);
       const boxWidth = Math.abs(bottomRightPoint[0] - topLeftPoint[0]);
@@ -309,7 +308,7 @@ export function uiMapInMap(context) {
       stage.eventMode = 'none';
       stage.sortableChildren = false;
 
-      const mainRenderer = context.map().renderer;
+      const mainRenderer = context.mapSystem().renderer;
 
       // Construct the scene..
       const miniRenderer = {    // Mock Renderer
@@ -341,7 +340,7 @@ export function uiMapInMap(context) {
       _dMini = [width, height];
       _cMini = vecScale(_dMini, 0.5);
 
-      context.map().on('draw', () => updateMinimap());
+      context.mapSystem().on('draw', () => updateMinimap());
     }
 
     wrapEnter
@@ -357,7 +356,7 @@ export function uiMapInMap(context) {
 
     updateMinimap();
 
-    context.keybinding().on(t('background.minimap.key'), toggle);
+    context.keybinding().on(context.t('background.minimap.key'), toggle);
   }
 
   return mapInMap;
diff --git a/modules/ui/note_comments.js b/modules/ui/note_comments.js
index a112e8ff71..2d6d651f8b 100644
--- a/modules/ui/note_comments.js
+++ b/modules/ui/note_comments.js
@@ -1,123 +1,121 @@
 import { select as d3_select } from 'd3-selection';
 
-import { prefs } from '../core/preferences';
-import { t, localizer } from '../core/localizer';
 import { uiIcon } from './icon';
-import { services } from '../services';
-
-
-export function uiNoteComments() {
-    var _note;
-
-
-    function noteComments(selection) {
-        if (_note.isNew()) return; // don't draw .comments-container
-
-        var comments = selection.selectAll('.comments-container')
-            .data([0]);
-
-        comments = comments.enter()
-            .append('div')
-            .attr('class', 'comments-container')
-            .merge(comments);
-
-        var commentEnter = comments.selectAll('.comment')
-            .data(_note.comments)
-            .enter()
-            .append('div')
-            .attr('class', 'comment');
-
-        commentEnter
-            .append('div')
-            .attr('class', function(d) { return 'comment-avatar user-' + d.uid; })
-            .call(uiIcon('#rapid-icon-avatar', 'comment-avatar-icon'));
-
-        var mainEnter = commentEnter
-            .append('div')
-            .attr('class', 'comment-main');
-
-        var metadataEnter = mainEnter
-            .append('div')
-            .attr('class', 'comment-metadata');
-
-        metadataEnter
-            .append('div')
-            .attr('class', 'comment-author')
-            .each(function(d) {
-                var selection = d3_select(this);
-                var osm = services.osm;
-                if (osm && d.user) {
-                    selection = selection
-                        .append('a')
-                        .attr('class', 'comment-author-link')
-                        .attr('href', osm.userURL(d.user))
-                        .attr('target', '_blank');
-                }
-                selection
-                    .html(function(d) { return d.user || t.html('note.anonymous'); });
-            });
-
-        metadataEnter
-            .append('div')
-            .attr('class', 'comment-date')
-            .html(function(d) {
-                return t('note.status.' + d.action, { when: localeDateString(d.date) });
-            });
-
-        mainEnter
-            .append('div')
-            .attr('class', 'comment-text')
-            .html(function(d) { return d.html; })
-            .selectAll('a')
-                .attr('rel', 'noopener nofollow')
-                .attr('target', '_blank');
-
-        comments
-            .call(replaceAvatars);
-    }
 
 
-    function replaceAvatars(selection) {
-        var showThirdPartyIcons = prefs('preferences.privacy.thirdpartyicons') || 'true';
-        var osm = services.osm;
-        if (showThirdPartyIcons !== 'true' || !osm) return;
-
-        var uids = {};  // gather uids in the comment thread
-        _note.comments.forEach(function(d) {
-            if (d.uid) uids[d.uid] = true;
-        });
-
-        Object.keys(uids).forEach(function(uid) {
-            osm.loadUser(uid, function(err, user) {
-                if (!user || !user.image_url) return;
-
-                selection.selectAll('.comment-avatar.user-' + uid)
-                    .html('')
-                    .append('img')
-                    .attr('class', 'icon comment-avatar-icon')
-                    .attr('src', user.image_url)
-                    .attr('alt', user.display_name);
-            });
-        });
+export function uiNoteComments(context) {
+  let _note;
+
+
+  function noteComments(selection) {
+    if (_note.isNew()) return;  // new notes won't have a comment section
+
+    let comments = selection.selectAll('.comments-container')
+      .data([0]);
+
+    comments = comments.enter()
+      .append('div')
+      .attr('class', 'comments-container')
+      .merge(comments);
+
+    let commentEnter = comments.selectAll('.comment')
+      .data(_note.comments)
+      .enter()
+      .append('div')
+      .attr('class', 'comment');
+
+    commentEnter
+      .append('div')
+      .attr('class', d => `comment-avatar user-${d.uid}`)
+      .call(uiIcon('#rapid-icon-avatar', 'comment-avatar-icon'));
+
+    let mainEnter = commentEnter
+      .append('div')
+      .attr('class', 'comment-main');
+
+    let metadataEnter = mainEnter
+      .append('div')
+      .attr('class', 'comment-metadata');
+
+    metadataEnter
+      .append('div')
+      .attr('class', 'comment-author')
+      .each((d, i, nodes) => {
+        let selection = d3_select(nodes[i]);
+        const osm = context.services.get('osm');
+        if (osm && d.user) {
+          selection = selection
+            .append('a')
+            .attr('class', 'comment-author-link')
+            .attr('href', osm.userURL(d.user))
+            .attr('target', '_blank');
+        }
+        selection
+          .html(d => d.user || context.tHtml('note.anonymous'));
+      });
+
+    metadataEnter
+      .append('div')
+      .attr('class', 'comment-date')
+      .html(d => context.t(`note.status.${d.action}`, { when: localeDateString(d.date) }));
+
+    mainEnter
+      .append('div')
+      .attr('class', 'comment-text')
+      .html(d => d.html)
+      .selectAll('a')
+        .attr('rel', 'noopener nofollow')
+        .attr('target', '_blank');
+
+    comments
+      .call(replaceAvatars);
+  }
+
+
+  function replaceAvatars(selection) {
+    const storageSystem = context.storageSystem();
+    const showThirdPartyIcons = storageSystem.getItem('preferences.privacy.thirdpartyicons') ?? 'true';
+    const osm = context.services.get('osm');
+    if (showThirdPartyIcons !== 'true' || !osm) return;
+
+    const uids = new Set();  // gather uids in the comment thread
+    for (const d of _note.comments) {
+      if (d.uid) uids.add(d.uid);
     }
 
-
-    function localeDateString(s) {
-        if (!s) return null;
-        var options = { day: 'numeric', month: 'short', year: 'numeric' };
-        s = s.replace(/-/g, '/'); // fix browser-specific Date() issues
-        var d = new Date(s);
-        if (isNaN(d.getTime())) return null;
-        return d.toLocaleDateString(localizer.localeCode(), options);
+    for (const uid of uids) {
+      osm.loadUser(uid, (err, user) => {
+        if (!user || !user.image_url) return;
+
+        selection.selectAll(`.comment-avatar.user-${uid}`)
+          .html('')
+          .append('img')
+          .attr('class', 'icon comment-avatar-icon')
+          .attr('src', user.image_url)
+          .attr('alt', user.display_name);
+      });
     }
+  }
+
 
+  function localeDateString(s) {
+    if (!s) return null;
+    const options = { day: 'numeric', month: 'short', year: 'numeric' };
+    s = s.replace(/-/g, '/'); // fix browser-specific Date() issues
+    const d = new Date(s);
+    if (isNaN(d.getTime())) return null;
 
-    noteComments.note = function(val) {
-        if (!arguments.length) return _note;
-        _note = val;
-        return noteComments;
-    };
+    const localeCode = context.localizationSystem().localeCode();
+    return d.toLocaleDateString(localeCode, options);
+  }
 
 
+  noteComments.note = function(val) {
+    if (!arguments.length) return _note;
+    _note = val;
     return noteComments;
+  };
+
+
+  return noteComments;
 }
diff --git a/modules/ui/note_editor.js b/modules/ui/note_editor.js
index bf6e5ee598..8fb28d05f0 100644
--- a/modules/ui/note_editor.js
+++ b/modules/ui/note_editor.js
@@ -1,13 +1,8 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../core/localizer';
-import { services } from '../services';
 import { uiIcon } from './icon';
 
-// import { uiField } from './field';
-// import { uiFormFields } from './form_fields';
-
 import { uiNoteComments } from './note_comments';
 import { uiNoteHeader } from './note_header';
 import { uiNoteReport } from './note_report';
@@ -18,17 +13,12 @@ import { utilNoAuto, utilRebind } from '../util';
 export function uiNoteEditor(context) {
     var dispatch = d3_dispatch('change');
     var noteComments = uiNoteComments(context);
-    var noteHeader = uiNoteHeader();
-
-    // var formFields = uiFormFields(context);
-
+    var noteHeader = uiNoteHeader(context);
     var _note;
     var _newNote;
-    // var _fieldsArr;
 
 
     function noteEditor(selection) {
-
         var header = selection.selectAll('.header')
             .data([0]);
 
@@ -46,7 +36,7 @@ export function uiNoteEditor(context) {
 
         headerEnter
             .append('h3')
-            .html(t.html('note.title'));
+            .html(context.tHtml('note.title'));
 
 
         var body = selection.selectAll('.body')
@@ -80,9 +70,9 @@ export function uiNoteEditor(context) {
 
 
         // rerender the note editor on any auth change
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (osm) {
-            osm.on('change.note-save', function() {
+            osm.on('authchange', function() {
                 selection.call(noteEditor);
             });
         }
@@ -103,51 +93,17 @@ export function uiNoteEditor(context) {
             .append('div')
             .attr('class', 'note-save save-section cf');
 
-        // // if new note, show categories to pick from
-        // if (_note.isNew()) {
-        //     var presets = presetManager;
-
-        //     // NOTE: this key isn't a age and therefore there is no documentation (yet)
-        //     _fieldsArr = [
-        //         uiField(context, presets.field('category'), null, { show: true, revert: false }),
-        //     ];
-
-        //     _fieldsArr.forEach(function(field) {
-        //         field
-        //             .on('change', changeCategory);
-        //     });
-
-        //     noteSaveEnter
-        //         .append('div')
-        //         .attr('class', 'note-category')
-        //         .call(formFields.fieldsArr(_fieldsArr));
-        // }
-
-        // function changeCategory() {
-        //     // NOTE: perhaps there is a better way to get value
-        //     var val = context.container().select('input[name=\'category\']:checked').property('__data__') || undefined;
-
-        //     // store the unsaved category with the note itself
-        //     _note = _note.update({ newCategory: val });
-        //     var osm = services.osm;
-        //     if (osm) {
-        //         osm.replaceNote(_note);  // update note cache
-        //     }
-        //     noteSave
-        //         .call(noteSaveButtons);
-        // }
-
         noteSaveEnter
             .append('h4')
             .attr('class', '.note-save-header')
             .html(function() {
-                return _note.isNew() ? t('note.newDescription') : t('note.newComment');
+                return _note.isNew() ? context.t('note.newDescription') : context.t('note.newComment');
             });
 
         var commentTextarea = noteSaveEnter
             .append('textarea')
             .attr('class', 'new-comment-input')
-            .attr('placeholder', t('note.inputPlaceholder'))
+            .attr('placeholder', context.t('note.inputPlaceholder'))
             .attr('maxlength', 1000)
             .property('value', function(d) { return d.newComment; })
             .call(utilNoAuto)
@@ -172,7 +128,7 @@ export function uiNoteEditor(context) {
             if (!(d3_event.keyCode === 13 && // ↩ Return
                 d3_event.metaKey)) return;
 
-            var osm = services.osm;
+            var osm = context.services.get('osm');
             if (!osm) return;
 
             var hasAuth = osm.authenticated();
@@ -205,7 +161,7 @@ export function uiNoteEditor(context) {
             // store the unsaved comment with the note itself
             _note = _note.update({ newComment: val });
 
-            var osm = services.osm;
+            var osm = context.services.get('osm');
             if (osm) {
                 osm.replaceNote(_note);  // update note cache
             }
@@ -225,7 +181,7 @@ export function uiNoteEditor(context) {
             .attr('class', 'detail-section')
             .merge(detailSection);
 
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (!osm) return;
 
         // Add warning if user is not logged in
@@ -249,14 +205,14 @@ export function uiNoteEditor(context) {
 
         authEnter
             .append('span')
-            .html(t.html('note.login'));
+            .html(context.tHtml('note.login'));
 
         authEnter
             .append('a')
             .attr('target', '_blank')
             .call(uiIcon('#rapid-icon-out-link', 'inline'))
             .append('span')
-            .html(t.html('login'))
+            .html(context.tHtml('login'))
             .on('click.note-login', function(d3_event) {
                 d3_event.preventDefault();
                 osm.authenticate();
@@ -277,7 +233,7 @@ export function uiNoteEditor(context) {
         prose = prose.enter()
             .append('p')
             .attr('class', 'note-save-prose')
-            .html(t.html('note.upload_explanation'))
+            .html(context.tHtml('note.upload_explanation'))
             .merge(prose);
 
         osm.userDetails(function(err, user) {
@@ -300,13 +256,13 @@ export function uiNoteEditor(context) {
                 .attr('target', '_blank');
 
             prose
-                .html(t.html('note.upload_explanation_with_user', { user: userLink.html() }));
+                .html(context.tHtml('note.upload_explanation_with_user', { user: userLink.html() }));
         });
     }
 
 
     function noteSaveButtons(selection) {
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         var hasAuth = osm && osm.authenticated();
 
         var isSelected = (_note && _note.id === context.selectedIDs()[0]);
@@ -326,12 +282,12 @@ export function uiNoteEditor(context) {
             buttonEnter
                 .append('button')
                 .attr('class', 'button cancel-button secondary-action')
-                .html(t.html('confirm.cancel'));
+                .html(context.tHtml('confirm.cancel'));
 
             buttonEnter
                 .append('button')
                 .attr('class', 'button save-button action')
-                .html(t.html('note.save'));
+                .html(context.tHtml('note.save'));
 
         } else {
             buttonEnter
@@ -341,7 +297,7 @@ export function uiNoteEditor(context) {
             buttonEnter
                 .append('button')
                 .attr('class', 'button comment-button action')
-                .html(t.html('note.comment'));
+                .html(context.tHtml('note.comment'));
         }
 
 
@@ -361,7 +317,7 @@ export function uiNoteEditor(context) {
             .html(function(d) {
                 var action = (d.status === 'open' ? 'close' : 'open');
                 var andComment = (d.newComment ? '_comment' : '');
-                return t('note.' + action + andComment);
+                return context.t('note.' + action + andComment);
             })
             .on('click.status', clickStatus);
 
@@ -379,7 +335,7 @@ export function uiNoteEditor(context) {
 
     function clickCancel(d3_event, d) {
         this.blur();    // avoid keeping focus on the button - #4641
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (osm) {
             osm.removeNote(d);
         }
@@ -390,7 +346,7 @@ export function uiNoteEditor(context) {
 
     function clickSave(d3_event, d) {
         this.blur();    // avoid keeping focus on the button - #4641
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (osm) {
             osm.postNoteCreate(d, function(err, note) {
                 dispatch.call('change', note);
@@ -401,7 +357,7 @@ export function uiNoteEditor(context) {
 
     function clickStatus(d3_event, d) {
         this.blur();    // avoid keeping focus on the button - #4641
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (osm) {
             var setStatus = (d.status === 'open' ? 'closed' : 'open');
             osm.postNoteUpdate(d, setStatus, function(err, note) {
@@ -412,7 +368,7 @@ export function uiNoteEditor(context) {
 
     function clickComment(d3_event, d) {
         this.blur();    // avoid keeping focus on the button - #4641
-        var osm = services.osm;
+        var osm = context.services.get('osm');
         if (osm) {
             osm.postNoteUpdate(d, d.status, function(err, note) {
                 dispatch.call('change', note);
diff --git a/modules/ui/note_header.js b/modules/ui/note_header.js
index bf79cc8e32..9922612fcf 100644
--- a/modules/ui/note_header.js
+++ b/modules/ui/note_header.js
@@ -1,66 +1,66 @@
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 
 
-export function uiNoteHeader() {
-    var _note;
+export function uiNoteHeader(context) {
+  let _note;
 
 
-    function noteHeader(selection) {
-        var header = selection.selectAll('.note-header')
-            .data(
-                (_note ? [_note] : []),
-                function(d) { return d.status + d.id; }
-            );
+  function noteHeader(selection) {
+    let header = selection.selectAll('.note-header')
+      .data((_note ? [_note] : []), d => d.status + d.id );
 
-        header.exit()
-            .remove();
+    header.exit()
+      .remove();
 
-        var headerEnter = header.enter()
-            .append('div')
-            .attr('class', 'note-header');
+    let headerEnter = header.enter()
+      .append('div')
+      .attr('class', 'note-header');
 
-        var iconEnter = headerEnter
-            .append('div')
-            .attr('class', function(d) { return 'note-header-icon ' + d.status; })
-            .classed('new', function(d) { return d.id < 0; });
+    let iconEnter = headerEnter
+      .append('div')
+      .attr('class', d => `note-header-icon ${d.status}`)
+      .classed('new', d => d.id < 0);
 
-        iconEnter
-            .append('div')
-            .call(uiIcon('#rapid-icon-note', 'note-fill'));
+    iconEnter
+      .append('div')
+      .call(uiIcon('#rapid-icon-note', 'note-fill'));
 
-        iconEnter.each(function(d) {
-            var statusIcon;
-            if (d.id < 0) {
-                statusIcon = '#rapid-icon-plus';
-            } else if (d.status === 'open') {
-                statusIcon = '#rapid-icon-close';
-            } else {
-                statusIcon = '#rapid-icon-apply';
-            }
-            iconEnter
-                .append('div')
-                .attr('class', 'note-icon-annotation')
-                .call(uiIcon(statusIcon, 'icon-annotation'));
-        });
+    iconEnter
+      .each(d => {
+        let statusIcon;
+        if (d.id < 0) {
+          statusIcon = '#rapid-icon-plus';
+        } else if (d.status === 'open') {
+          statusIcon = '#rapid-icon-close';
+        } else {
+          statusIcon = '#rapid-icon-apply';
+        }
+        iconEnter
+          .append('div')
+          .attr('class', 'note-icon-annotation')
+          .call(uiIcon(statusIcon, 'icon-annotation'));
+      });
 
-        headerEnter
-            .append('div')
-            .attr('class', 'note-header-label')
-            .html(function(d) {
-                if (_note.isNew()) { return t('note.new'); }
-                return t('note.note') + ' ' + d.id + ' ' +
-                    (d.status === 'closed' ? t('note.closed') : '');
-            });
-    }
+    headerEnter
+      .append('div')
+      .attr('class', 'note-header-label')
+      .text(d => {
+        if (_note.isNew()) {
+          return context.t('note.new');
+        } else {
+          return context.t('note.note') + ' ' + d.id + ' ' +
+            (d.status === 'closed' ? context.t('note.closed') : '');
+        }
+      });
+  }
 
 
-    noteHeader.note = function(val) {
-        if (!arguments.length) return _note;
-        _note = val;
-        return noteHeader;
-    };
+  noteHeader.note = function(val) {
+    if (!arguments.length) return _note;
+    _note = val;
+    return noteHeader;
+  };
 
 
-    return noteHeader;
+  return noteHeader;
 }
diff --git a/modules/ui/note_report.js b/modules/ui/note_report.js
index 3520e55fe0..496e9a4504 100644
--- a/modules/ui/note_report.js
+++ b/modules/ui/note_report.js
@@ -1,44 +1,43 @@
-import { t } from '../core/localizer';
 import { osmNote } from '../osm';
-import { services } from '../services';
 import { uiIcon } from './icon';
 
 
-export function uiNoteReport() {
-    var _note;
+export function uiNoteReport(context) {
+  let _note;
 
-    function noteReport(selection) {
-        var url;
-        if (services.osm && (_note instanceof osmNote) && (!_note.isNew())) {
-            url = services.osm.noteReportURL(_note);
-        }
-
-        var link = selection.selectAll('.note-report')
-            .data(url ? [url] : []);
+  function noteReport(selection) {
+    let url;
+    const osm = context.services.get('osm');
+    if (osm && (_note instanceof osmNote) && !_note.isNew()) {
+      url = osm.noteReportURL(_note);
+    }
 
-        // exit
-        link.exit()
-            .remove();
+    let link = selection.selectAll('.note-report')
+      .data(url ? [url] : []);
 
-        // enter
-        var linkEnter = link.enter()
-            .append('a')
-            .attr('class', 'note-report')
-            .attr('target', '_blank')
-            .attr('href', function(d) { return d; })
-            .call(uiIcon('#rapid-icon-out-link', 'inline'));
+    // exit
+    link.exit()
+      .remove();
 
-        linkEnter
-            .append('span')
-            .html(t.html('note.report'));
-    }
+    // enter
+    let linkEnter = link.enter()
+      .append('a')
+      .attr('class', 'note-report')
+      .attr('target', '_blank')
+      .attr('href', d => d)
+      .call(uiIcon('#rapid-icon-out-link', 'inline'));
 
+    linkEnter
+      .append('span')
+      .text(context.t('note.report'));
+  }
 
-    noteReport.note = function(val) {
-        if (!arguments.length) return _note;
-        _note = val;
-        return noteReport;
-    };
 
+  noteReport.note = function(val) {
+    if (!arguments.length) return _note;
+    _note = val;
     return noteReport;
+  };
+
+  return noteReport;
 }
diff --git a/modules/ui/osmose_details.js b/modules/ui/osmose_details.js
index 39bef5625e..3fdea2a5fb 100644
--- a/modules/ui/osmose_details.js
+++ b/modules/ui/osmose_details.js
@@ -1,105 +1,101 @@
 import { select as d3_select } from 'd3-selection';
 
-import { presetManager } from '../presets';
-import { modeSelect } from '../modes/select';
-import { t } from '../core/localizer';
-import { services } from '../services';
-import { utilDisplayName, utilHighlightEntities } from '../util';
+import { utilHighlightEntities } from '../util';
 
 
 export function uiOsmoseDetails(context) {
+  const l10n = context.localizationSystem();
+  const osmose = context.services.get('osmose');
   let _qaItem;
 
   function issueString(d, type) {
-    if (!d) return '';
+    if (!osmose || !d) return '';
 
     // Issue strings are cached from Osmose API
-    const s = services.osmose.getStrings(d.itemType);
+    const s = osmose.getStrings(d.itemType);
     return (type in s) ? s[type] : '';
   }
 
 
   function osmoseDetails(selection) {
     const details = selection.selectAll('.error-details')
-      .data(
-        _qaItem ? [_qaItem] : [],
-        d => `${d.id}-${d.status || 0}`
-      );
+      .data(_qaItem ? [_qaItem] : [], d => `${d.id}-${d.status || 0}` );
 
     details.exit()
       .remove();
 
     const detailsEnter = details.enter()
       .append('div')
-        .attr('class', 'error-details qa-details-container');
+      .attr('class', 'error-details qa-details-container');
 
 
     // Description
     if (issueString(_qaItem, 'detail')) {
       const div = detailsEnter
         .append('div')
-          .attr('class', 'qa-details-subsection');
+        .attr('class', 'qa-details-subsection');
 
       div
         .append('h4')
-          .html(t.html('QA.keepRight.detail_description'));
+        .html(l10n.tHtml('QA.keepRight.detail_description'));
 
       div
         .append('p')
-          .attr('class', 'qa-details-description-text')
-          .html(d => issueString(d, 'detail'))
+        .attr('class', 'qa-details-description-text')
+        .html(d => issueString(d, 'detail'))
         .selectAll('a')
-          .attr('rel', 'noopener')
-          .attr('target', '_blank');
+        .attr('rel', 'noopener')
+        .attr('target', '_blank');
     }
 
     // Elements (populated later as data is requested)
     const detailsDiv = detailsEnter
       .append('div')
-        .attr('class', 'qa-details-subsection');
+      .attr('class', 'qa-details-subsection');
 
     const elemsDiv = detailsEnter
       .append('div')
-        .attr('class', 'qa-details-subsection');
+      .attr('class', 'qa-details-subsection');
 
     // Suggested Fix (mustn't exist for every issue type)
     if (issueString(_qaItem, 'fix')) {
       const div = detailsEnter
         .append('div')
-          .attr('class', 'qa-details-subsection');
+        .attr('class', 'qa-details-subsection');
 
       div
         .append('h4')
-          .html(t.html('QA.osmose.fix_title'));
+        .html(l10n.tHtml('QA.osmose.fix_title'));
 
       div
         .append('p')
-          .html(d => issueString(d, 'fix'))
+        .html(d => issueString(d, 'fix'))
         .selectAll('a')
-          .attr('rel', 'noopener')
-          .attr('target', '_blank');
+        .attr('rel', 'noopener')
+        .attr('target', '_blank');
     }
 
     // Common Pitfalls (mustn't exist for every issue type)
     if (issueString(_qaItem, 'trap')) {
       const div = detailsEnter
         .append('div')
-          .attr('class', 'qa-details-subsection');
+        .attr('class', 'qa-details-subsection');
 
       div
         .append('h4')
-          .html(t.html('QA.osmose.trap_title'));
+        .html(l10n.tHtml('QA.osmose.trap_title'));
 
       div
         .append('p')
-          .html(d => issueString(d, 'trap'))
+        .html(d => issueString(d, 'trap'))
         .selectAll('a')
-          .attr('rel', 'noopener')
-          .attr('target', '_blank');
+        .attr('rel', 'noopener')
+        .attr('target', '_blank');
     }
 
     // Save current item to check if UI changed by time request resolves
-    services.osmose.loadIssueDetailAsync(_qaItem)
+    if (!osmose) return;
+    osmose.loadIssueDetailAsync(_qaItem)
       .then(d => {
         // Do nothing if _qaItem has changed by the time Promise resolves
         if (_qaItem.id !== d.id) return;
@@ -111,20 +107,20 @@ export function uiOsmoseDetails(context) {
         if (d.detail) {
           detailsDiv
             .append('h4')
-              .html(t.html('QA.osmose.detail_title'));
+            .html(l10n.tHtml('QA.osmose.detail_title'));
 
           detailsDiv
             .append('p')
-              .html(d => d.detail)
+            .html(d => d.detail)
             .selectAll('a')
-              .attr('rel', 'noopener')
-              .attr('target', '_blank');
+            .attr('rel', 'noopener')
+            .attr('target', '_blank');
         }
 
         // Create list of linked issue elements
         elemsDiv
           .append('h4')
-            .html(t.html('QA.osmose.elems_title'));
+          .html(l10n.tHtml('QA.osmose.elems_title'));
 
         elemsDiv
           .append('ul').selectAll('li')
@@ -132,60 +128,63 @@ export function uiOsmoseDetails(context) {
           .enter()
           .append('li')
           .append('a')
-            .attr('href', '#')
-            .attr('class', 'error_entity_link')
-            .html(d => d)
-            .each(function() {
-              const link = d3_select(this);
-              const entityID = this.textContent;
-              const entity = context.hasEntity(entityID);
-
-              // Add click handler
-              link
-                .on('mouseenter', () => {
-                  utilHighlightEntities([entityID], true, context);
-                })
-                .on('mouseleave', () => {
-                  utilHighlightEntities([entityID], false, context);
-                })
-                .on('click', (d3_event) => {
-                  d3_event.preventDefault();
-
-                  utilHighlightEntities([entityID], false, context);
-
-                  context.scene().enableLayers('osm');  // make sure osm layer is even on
-                  context.map().centerZoom(d.loc, 20);
-
-                  if (entity) {
-                    context.enter(modeSelect(context, [entityID]));
-                  } else {
-                    context.loadEntity(entityID, (err, result) => {
-                      if (err) return;
-                      const entity = result.data.find(e => e.id === entityID);
-                      if (entity) context.enter(modeSelect(context, [entityID]));
-                    });
-                  }
-                });
-
-              // Replace with friendly name if possible
-              // (The entity may not yet be loaded into the graph)
-              if (entity) {
-                let name = utilDisplayName(entity);  // try to use common name
-
-                if (!name) {
-                  const preset = presetManager.match(entity, context.graph());
-                  name = preset && !preset.isFallback() && preset.name();  // fallback to preset name
+          .attr('href', '#')
+          .attr('class', 'error_entity_link')
+          .html(d => d)
+          .each((d, i, nodes) => {
+            const node = nodes[i];
+            const link = d3_select(node);
+            const entityID = node.textContent;
+            const entity = context.hasEntity(entityID);
+
+            // Add click handler
+            link
+              .on('mouseenter', () => {
+                utilHighlightEntities([entityID], true, context);
+              })
+              .on('mouseleave', () => {
+                utilHighlightEntities([entityID], false, context);
+              })
+              .on('click', (d3_event) => {
+                d3_event.preventDefault();
+
+                utilHighlightEntities([entityID], false, context);
+
+                context.scene().enableLayers('osm');  // make sure osm layer is even on
+                context.mapSystem().centerZoom(d.loc, 20);
+
+                if (entity) {
+                  context.enter('select-osm', { selectedIDs: [entityID] });
+                } else {
+                  context.loadEntity(entityID, (err, result) => {
+                    if (err) return;
+                    const entity = result.data.find(e => e.id === entityID);
+                    if (entity) {
+                      context.enter('select-osm', { selectedIDs: [entityID] });
+                    }
+                  });
                 }
+              });
+
+            // Replace with friendly name if possible
+            // (The entity may not yet be loaded into the graph)
+            if (entity) {
+              let name = l10n.displayName(entity);  // try to use common name
+              if (!name) {
+                const presetSystem = context.presetSystem();
+                const preset = presetSystem.match(entity, context.graph());
+                name = preset && !preset.isFallback() && preset.name();  // fallback to preset name
+              }
 
-                if (name) {
-                  this.innerText = name;
-                }
+              if (name) {
+                node.innerText = name;
               }
-            });
+            }
+          });
 
-        // Don't hide entities related to this issue - #5880
-        context.features().forceVisible(d.elems);
-        context.map().immediateRedraw();
+        // Don't hide entities related to this issue - iD#5880
+        context.filterSystem().forceVisible(d.elems);
+        context.mapSystem().immediateRedraw();
       })
       .catch(e => console.error(e));  // eslint-disable-line
   }
diff --git a/modules/ui/osmose_editor.js b/modules/ui/osmose_editor.js
index d16167167e..33b3e54008 100644
--- a/modules/ui/osmose_editor.js
+++ b/modules/ui/osmose_editor.js
@@ -1,7 +1,5 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
-import { t } from '../core/localizer';
-import { services } from '../services';
 import { uiIcon } from './icon';
 
 import { uiOsmoseDetails } from './osmose_details';
@@ -11,37 +9,37 @@ import { utilRebind } from '../util';
 
 
 export function uiOsmoseEditor(context) {
+  const osmose = context.services.get('osmose');
   const dispatch = d3_dispatch('change');
   const qaDetails = uiOsmoseDetails(context);
   const qaHeader = uiOsmoseHeader(context);
-
   let _qaItem;
 
-  function osmoseEditor(selection) {
 
+  function osmoseEditor(selection) {
     const header = selection.selectAll('.header')
       .data([0]);
 
     const headerEnter = header.enter()
       .append('div')
-        .attr('class', 'header fillL');
+      .attr('class', 'header fillL');
 
     headerEnter
       .append('button')
-        .attr('class', 'close')
-        .on('click', () => context.enter('browse'))
-        .call(uiIcon('#rapid-icon-close'));
+      .attr('class', 'close')
+      .on('click', () => context.enter('browse'))
+      .call(uiIcon('#rapid-icon-close'));
 
     headerEnter
       .append('h3')
-        .html(t.html('QA.osmose.title'));
+      .html(context.tHtml('QA.osmose.title'));
 
     let body = selection.selectAll('.body')
       .data([0]);
 
     body = body.enter()
-        .append('div')
-        .attr('class', 'body')
+      .append('div')
+      .attr('class', 'body')
       .merge(body);
 
     let editor = body.selectAll('.qa-editor')
@@ -49,11 +47,11 @@ export function uiOsmoseEditor(context) {
 
     editor.enter()
       .append('div')
-        .attr('class', 'modal-section qa-editor')
+      .attr('class', 'modal-section qa-editor')
       .merge(editor)
-        .call(qaHeader.issue(_qaItem))
-        .call(qaDetails.issue(_qaItem))
-        .call(osmoseSaveSection);
+      .call(qaHeader.issue(_qaItem))
+      .call(qaDetails.issue(_qaItem))
+      .call(osmoseSaveSection);
 
     const footer = selection.selectAll('.footer')
       .data([0]);
@@ -70,10 +68,7 @@ export function uiOsmoseEditor(context) {
     const isSelected = errID && context.selectedData().has(errID);
     const isShown = (_qaItem && isSelected);
     let saveSection = selection.selectAll('.qa-save')
-      .data(
-        (isShown ? [_qaItem] : []),
-        d => `${d.id}-${d.status || 0}`
-      );
+      .data((isShown ? [_qaItem] : []), d => `${d.id}-${d.status || 0}` );
 
     // exit
     saveSection.exit()
@@ -82,12 +77,12 @@ export function uiOsmoseEditor(context) {
     // enter
     const saveSectionEnter = saveSection.enter()
       .append('div')
-        .attr('class', 'qa-save save-section cf');
+      .attr('class', 'qa-save save-section cf');
 
     // update
     saveSection = saveSectionEnter
       .merge(saveSection)
-        .call(qaSaveButtons);
+      .call(qaSaveButtons);
   }
 
   function qaSaveButtons(selection) {
@@ -103,39 +98,37 @@ export function uiOsmoseEditor(context) {
     // enter
     const buttonEnter = buttonSection.enter()
       .append('div')
-        .attr('class', 'buttons');
+      .attr('class', 'buttons');
 
     buttonEnter
       .append('button')
-        .attr('class', 'button close-button action');
+      .attr('class', 'button close-button action');
 
     buttonEnter
       .append('button')
-        .attr('class', 'button ignore-button action');
+      .attr('class', 'button ignore-button action');
 
     // update
     buttonSection = buttonSection
       .merge(buttonEnter);
 
     buttonSection.select('.close-button')
-      .html(t.html('QA.keepRight.close'))
+      .html(context.tHtml('QA.keepRight.close'))
       .on('click.close', function(d3_event, d) {
-        this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.osmose;
-        if (qaService) {
+        this.blur();    // avoid keeping focus on the button - iD#4641
+        if (osmose) {
           d.newStatus = 'done';
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+          osmose.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
 
     buttonSection.select('.ignore-button')
-      .html(t.html('QA.keepRight.ignore'))
+      .html(context.tHtml('QA.keepRight.ignore'))
       .on('click.ignore', function(d3_event, d) {
-        this.blur();    // avoid keeping focus on the button - #4641
-        const qaService = services.osmose;
-        if (qaService) {
+        this.blur();    // avoid keeping focus on the button - iD#4641
+        if (osmose) {
           d.newStatus = 'false';
-          qaService.postUpdate(d, (err, item) => dispatch.call('change', item));
+          osmose.postUpdate(d, (err, item) => dispatch.call('change', item));
         }
       });
   }
diff --git a/modules/ui/osmose_header.js b/modules/ui/osmose_header.js
index dfe8caf665..8eadda722f 100644
--- a/modules/ui/osmose_header.js
+++ b/modules/ui/osmose_header.js
@@ -1,27 +1,24 @@
-import * as PIXI from 'pixi.js';
+import { Color } from 'pixi.js';
 
-import { services } from '../services';
-import { t } from '../core/localizer';
 
-
-export function uiOsmoseHeader() {
+export function uiOsmoseHeader(context) {
+  const osmose = context.services.get('osmose');
   let _qaItem;
 
   function issueTitle(d) {
-    const unknown = t('inspector.unknown');
-    if (!d) return unknown;
+    const unknown = context.t('inspector.unknown');
+    if (!osmose || !d) return unknown;
 
     // Issue titles supplied by Osmose
-    const s = services.osmose.getStrings(d.itemType);
+    const s = osmose.getStrings(d.itemType);
     return ('title' in s) ? s.title : unknown;
   }
 
 
   function osmoseHeader(selection) {
     let iconFill = 0xffffff;
-    const service = services.osmose;
-    if (service) {
-      iconFill = service.getColor(_qaItem?.item);
+    if (osmose) {
+      iconFill = osmose.getColor(_qaItem?.item);
     }
 
     const header = selection.selectAll('.qa-header')
@@ -48,7 +45,7 @@ export function uiOsmoseHeader() {
 
     svgEnter
       .append('polygon')
-      .attr('fill', PIXI.utils.hex2string(iconFill))
+      .attr('fill', new Color(iconFill).toHex())
       .attr('stroke', '#333')
       .attr('points', '16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6');
 
diff --git a/modules/ui/pane.js b/modules/ui/pane.js
index e34792eed5..4fc62b4e63 100644
--- a/modules/ui/pane.js
+++ b/modules/ui/pane.js
@@ -1,136 +1,126 @@
-import {
-    select as d3_select
-} from 'd3-selection';
+import { select as d3_select } from 'd3-selection';
 
 import { uiIcon } from './icon';
-import { localizer } from '../core/localizer';
 import { uiTooltip } from './tooltip';
 
 
-export function uiPane(id, context) {
+export function uiPane(context, id) {
+  let _key;
+  let _label = '';
+  let _description = '';
+  let _iconName = '';
+  let _sections; // array of uiSection objects
 
-    var _key;
-    var _label = '';
-    var _description = '';
-    var _iconName = '';
-    var _sections; // array of uiSection objects
+  let _paneSelection = d3_select(null);
+  let _paneTooltip;
+  let pane = { id: id };
 
-    var _paneSelection = d3_select(null);
+  pane.label = function(val) {
+    if (!arguments.length) return _label;
+    _label = val;
+    return pane;
+  };
 
-    var _paneTooltip;
+  pane.key = function(val) {
+    if (!arguments.length) return _key;
+    _key = val;
+    return pane;
+  };
 
-    var pane = {
-        id: id
-    };
+  pane.description = function(val) {
+    if (!arguments.length) return _description;
+    _description = val;
+    return pane;
+  };
 
-    pane.label = function(val) {
-        if (!arguments.length) return _label;
-        _label = val;
-        return pane;
-    };
+  pane.iconName = function(val) {
+    if (!arguments.length) return _iconName;
+    _iconName = val;
+    return pane;
+  };
 
-    pane.key = function(val) {
-        if (!arguments.length) return _key;
-        _key = val;
-        return pane;
-    };
+  pane.sections = function(val) {
+    if (!arguments.length) return _sections;
+    _sections = val;
+    return pane;
+  };
+
+  pane.selection = function() {
+    return _paneSelection;
+  };
+
+  function hidePane() {
+    context.ui().togglePanes();
+  }
+
+  pane.togglePane = function(d3_event) {
+    if (d3_event) d3_event.preventDefault();
+    _paneTooltip.hide();
+    const shown = !_paneSelection.classed('shown');
+    context.ui().togglePanes(shown ? _paneSelection : undefined);
+
+    // iD#655: Since firing the validator is so expensive,
+    // only do it when we're right about to open the validation pane.
+    if (pane.id === 'issues' && shown) {
+      context.validationSystem().validate();
+    }
+  };
+
+  pane.renderToggleButton = function(selection) {
+    if (!_paneTooltip) {
+      const isRTL = context.localizationSystem().isRTL();
+      _paneTooltip = uiTooltip(context)
+        .placement(isRTL ? 'right' : 'left')
+        .title(_description)
+        .keys([_key]);
+    }
 
-    pane.description = function(val) {
-        if (!arguments.length) return _description;
-        _description = val;
-        return pane;
-    };
+    selection
+      .append('button')
+      .on('click', pane.togglePane)
+      .call(uiIcon(`#${_iconName}`, 'light'))
+      .call(_paneTooltip);
+  };
+
+  pane.renderContent = function(selection) {
+    // override to fully customize content
+    if (_sections) {
+      for (const section of _sections) {
+        selection.call(section.render);
+      }
+    }
+  };
 
-    pane.iconName = function(val) {
-        if (!arguments.length) return _iconName;
-        _iconName = val;
-        return pane;
-    };
+  pane.renderPane = function(selection) {
+    _paneSelection = selection
+      .append('div')
+      .attr('class', `fillL map-pane hide ${id}-pane`)
+      .attr('pane', id);
 
-    pane.sections = function(val) {
-        if (!arguments.length) return _sections;
-        _sections = val;
-        return pane;
-    };
+    let heading = _paneSelection
+      .append('div')
+      .attr('class', 'pane-heading');
 
-    pane.selection = function() {
-        return _paneSelection;
-    };
+    heading
+      .append('h2')
+      .html(_label);
 
-    function hidePane() {
-        context.ui().togglePanes();
-    }
+    heading
+      .append('button')
+      .on('click', hidePane)
+      .call(uiIcon('#rapid-icon-close'));
 
-    pane.togglePane = function(d3_event) {
-        if (d3_event) d3_event.preventDefault();
-        _paneTooltip.hide();
-        const shown = !_paneSelection.classed('shown');
-        context.ui().togglePanes(shown ? _paneSelection : undefined);
-
-        // Fix #655: Since firing the validator is so expensive,
-        // only do it when we're right about to open the validation pane.
-        if (pane.id === 'issues' && shown) {
-            context.validator().validate();
-        }
-    };
-
-    pane.renderToggleButton = function(selection) {
-
-        if (!_paneTooltip) {
-            _paneTooltip = uiTooltip()
-                .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
-                .title(_description)
-                .keys([_key]);
-        }
-
-        selection
-            .append('button')
-            .on('click', pane.togglePane)
-            .call(uiIcon('#' + _iconName, 'light'))
-            .call(_paneTooltip);
-    };
-
-    pane.renderContent = function(selection) {
-        // override to fully customize content
-
-        if (_sections) {
-            _sections.forEach(function(section) {
-                selection.call(section.render);
-            });
-        }
-    };
-
-    pane.renderPane = function(selection) {
-
-        _paneSelection = selection
-            .append('div')
-            .attr('class', 'fillL map-pane hide ' + id + '-pane')
-            .attr('pane', id);
-
-        var heading = _paneSelection
-            .append('div')
-            .attr('class', 'pane-heading');
-
-        heading
-            .append('h2')
-            .html(_label);
-
-        heading
-            .append('button')
-            .on('click', hidePane)
-            .call(uiIcon('#rapid-icon-close'));
-
-
-        _paneSelection
-            .append('div')
-            .attr('class', 'pane-content')
-            .call(pane.renderContent);
-
-        if (_key) {
-            context.keybinding()
-                .on(_key, pane.togglePane);
-        }
-    };
 
-    return pane;
+    _paneSelection
+      .append('div')
+      .attr('class', 'pane-content')
+      .call(pane.renderContent);
+
+    if (_key) {
+      context.keybinding()
+        .on(_key, pane.togglePane);
+    }
+  };
+
+  return pane;
 }
diff --git a/modules/ui/panels/UiPanelBackground.js b/modules/ui/panels/UiPanelBackground.js
index 63ddcdaafe..afd9c71a3d 100644
--- a/modules/ui/panels/UiPanelBackground.js
+++ b/modules/ui/panels/UiPanelBackground.js
@@ -1,9 +1,8 @@
-import _debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
 import { Extent } from '@rapid-sdk/math';
+import debounce from 'lodash-es/debounce';
 
 import { AbstractUiPanel } from './AbstractUiPanel';
-import { t } from '../../core/localizer';
 
 const METADATA_KEYS = ['zoom', 'vintage', 'source', 'description', 'resolution', 'accuracy'];
 
@@ -20,8 +19,8 @@ export class UiPanelBackground extends AbstractUiPanel {
   constructor(context) {
     super(context);
     this.id = 'background';
-    this.label = t.html('info_panels.background.title');
-    this.key = t('info_panels.background.key');
+    this.label = context.tHtml('info_panels.background.title');
+    this.key = context.t('info_panels.background.key');
 
     this._selection = d3_select(null);
     this._currSourceID = null;
@@ -31,9 +30,8 @@ export class UiPanelBackground extends AbstractUiPanel {
     // (This is also necessary when using `d3-selection.call`)
     this.render = this.render.bind(this);
     this.updateMetadata = this.updateMetadata.bind(this);
-
-    this._deferredRender = _debounce(this.render, 250);
-    this._deferredUpdateMetadata = _debounce(this.updateMetadata, 250);
+    this._deferredRender = debounce(this.render, 250);
+    this._deferredUpdateMetadata = debounce(this.updateMetadata, 250);
   }
 
 
@@ -49,7 +47,7 @@ export class UiPanelBackground extends AbstractUiPanel {
     this._currSourceID = null;
     this._metadata = {};
 
-    this.context.map()
+    this.context.mapSystem()
       .on('draw', this._deferredRender)
       .on('move', this._deferredUpdateMetadata);
   }
@@ -71,7 +69,7 @@ export class UiPanelBackground extends AbstractUiPanel {
     this._currSourceID = null;
     this._metadata = {};
 
-    this.context.map()
+    this.context.mapSystem()
       .off('draw', this._deferredRender)
       .off('move', this._deferredUpdateMetadata);
   }
@@ -85,7 +83,7 @@ export class UiPanelBackground extends AbstractUiPanel {
 
     const context = this.context;
     const selection = this._selection;
-    const imagery = context.imagery();
+    const imagery = context.imagerySystem();
 
     const source = imagery.baseLayerSource();
     if (!source) return;
@@ -113,7 +111,7 @@ export class UiPanelBackground extends AbstractUiPanel {
         .append('li')
         .attr('class', `background-info-list-${k}`)
         .classed('hide', !this._metadata[k])
-        .html(t.html(`info_panels.background.${k}`) + ':')
+        .html(context.tHtml(`info_panels.background.${k}`) + ':')
         .append('span')
         .attr('class', `background-info-span-${k}`)
         .text(this._metadata[k]);
@@ -126,7 +124,7 @@ export class UiPanelBackground extends AbstractUiPanel {
 
     selection
       .append('a')
-      .html(t.html(`info_panels.background.${toggleTiles}`))
+      .html(context.tHtml(`info_panels.background.${toggleTiles}`))
       .attr('href', '#')
       .attr('class', 'button button-toggle-tiles')
       .on('click', e => {
@@ -145,7 +143,7 @@ export class UiPanelBackground extends AbstractUiPanel {
 
     const context = this.context;
     const selection = this._selection;
-    const imagery = context.imagery();
+    const imagery = context.imagerySystem();
 
     const source = imagery.baseLayerSource();
     if (!source) return;
@@ -157,7 +155,7 @@ export class UiPanelBackground extends AbstractUiPanel {
     }
 
     // Look for a loaded tile that covers the center of the map.
-    const center = context.map().center();
+    const center = context.mapSystem().center();
     const centerExtent = new Extent(center);
     const layer = context.scene().layers.get('background');
     const tileMap = layer?._tileMaps.get(source.id);
@@ -175,7 +173,7 @@ export class UiPanelBackground extends AbstractUiPanel {
     }
 
     // update zoom
-    const zoom = tileZoom || Math.floor(context.map().zoom());
+    const zoom = tileZoom || Math.floor(context.mapSystem().zoom());
     this._metadata.zoom = String(zoom);
     selection.selectAll('.background-info-list-zoom')
       .classed('hide', false)
@@ -190,7 +188,7 @@ export class UiPanelBackground extends AbstractUiPanel {
 
       // update vintage
       const vintage = result.vintage;
-      this._metadata.vintage = (vintage && vintage.range) || t('info_panels.background.unknown');
+      this._metadata.vintage = (vintage && vintage.range) || context.t('info_panels.background.unknown');
       selection.selectAll('.background-info-list-vintage')
         .classed('hide', false)
         .selectAll('.background-info-span-vintage')
diff --git a/modules/ui/panels/UiPanelHistory.js b/modules/ui/panels/UiPanelHistory.js
index 8f79cace8e..e901ff52c6 100644
--- a/modules/ui/panels/UiPanelHistory.js
+++ b/modules/ui/panels/UiPanelHistory.js
@@ -2,7 +2,6 @@ import { select as d3_select } from 'd3-selection';
 
 import { AbstractUiPanel } from './AbstractUiPanel';
 import { uiIcon } from '../icon';
-import { t, localizer } from '../../core/localizer';
 
 
 /**
@@ -17,8 +16,8 @@ export class UiPanelHistory extends AbstractUiPanel {
   constructor(context) {
     super(context);
     this.id = 'history';
-    this.label = t.html('info_panels.history.title');
-    this.key = t('info_panels.history.key');
+    this.label = context.tHtml('info_panels.history.title');
+    this.key = context.t('info_panels.history.key');
 
     this._selection = d3_select(null);
 
@@ -43,8 +42,8 @@ export class UiPanelHistory extends AbstractUiPanel {
     this._enabled = true;
     this._selection = selection;
 
-    this.context.map().on('draw', this.render);
-    this.context.on('enter.info-history', this.render);
+    this.context.mapSystem().on('draw', this.render);
+    this.context.on('modechange', this.render);
   }
 
 
@@ -59,8 +58,8 @@ export class UiPanelHistory extends AbstractUiPanel {
     this._enabled = false;
     this._selection = d3_select(null);
 
-    this.context.map().off('draw', this.render);
-    this.context.on('enter.info-history', null);
+    this.context.mapSystem().off('draw', this.render);
+    this.context.off('modechange', this.render);
   }
 
 
@@ -72,7 +71,7 @@ export class UiPanelHistory extends AbstractUiPanel {
 
     const context = this.context;
     const selection = this._selection;
-//    const osm = context.connection();
+//    const osm = context.services.get('osm');
 
     // Empty out the DOM content and rebuild from scratch..
     selection.html('');
@@ -82,7 +81,7 @@ export class UiPanelHistory extends AbstractUiPanel {
 
     let selected, note, entity;
 //     if (selectedNoteID && osm) {       // selected 1 note
-//       selected = [ t('note.note') + ' ' + selectedNoteID ];
+//       selected = [ context.t('note.note') + ' ' + selectedNoteID ];
 //       note = osm.getNote(selectedNoteID);
 //     } else {                           // selected 1..n entities
 
@@ -98,7 +97,7 @@ export class UiPanelHistory extends AbstractUiPanel {
     selection
       .append('h4')
       .attr('class', 'history-heading')
-      .html(singular || t.html('info_panels.selected', { n: selected.length }));
+      .html(singular || context.tHtml('info_panels.selected', { n: selected.length }));
 
     if (!singular) return;
 
@@ -116,10 +115,13 @@ export class UiPanelHistory extends AbstractUiPanel {
    * @param  `entity`     The OSM note to display details for
    */
   renderNote(selection, note) {
+    const context = this.context;
+    const osm = context.services.get('osm');
+
     if (!note || note.isNew()) {
       selection
         .append('div')
-        .html(t.html('info_panels.history.note_no_history'));
+        .html(context.tHtml('info_panels.history.note_no_history'));
       return;
     }
 
@@ -128,24 +130,23 @@ export class UiPanelHistory extends AbstractUiPanel {
 
     list
       .append('li')
-      .html(t.html('info_panels.history.note_comments') + ':')
+      .html(context.tHtml('info_panels.history.note_comments') + ':')
       .append('span')
       .html(note.comments.length);
 
     if (note.comments.length) {
       list
         .append('li')
-        .html(t.html('info_panels.history.note_created_date') + ':')
+        .html(context.tHtml('info_panels.history.note_created_date') + ':')
         .append('span')
         .text(this.displayTimestamp(note.comments[0].date));
 
       list
         .append('li')
-        .html(t.html('info_panels.history.note_created_user') + ':')
+        .html(context.tHtml('info_panels.history.note_created_user') + ':')
         .call(this.renderUser, note.comments[0].user);
     }
 
-    const osm = this.context.connection();
     if (osm) {
       selection
         .append('a')
@@ -154,7 +155,7 @@ export class UiPanelHistory extends AbstractUiPanel {
         .attr('href', osm.noteURL(note))
         .call(uiIcon('#rapid-icon-out-link', 'inline'))
         .append('span')
-        .html(t.html('info_panels.history.note_link_text'));
+        .html(context.tHtml('info_panels.history.note_link_text'));
     }
   }
 
@@ -165,10 +166,13 @@ export class UiPanelHistory extends AbstractUiPanel {
    * @param  `entity`     The OSM entity (node, way, relation) to display details for
    */
   renderEntity(selection, entity) {
+    const context = this.context;
+    const osm = context.services.get('osm');
+
     if (!entity || entity.isNew()) {
       selection
         .append('div')
-        .html(t.html('info_panels.history.no_history'));
+        .html(context.tHtml('info_panels.history.no_history'));
       return;
     }
 
@@ -176,14 +180,13 @@ export class UiPanelHistory extends AbstractUiPanel {
       .append('div')
       .attr('class', 'links');
 
-    const osm = this.context.connection();
     if (osm) {
       links
         .append('a')
         .attr('class', 'view-history-on-osm')
         .attr('href', osm.historyURL(entity))
         .attr('target', '_blank')
-        .attr('title', t('info_panels.history.link_text'))
+        .attr('title', context.t('info_panels.history.link_text'))
         .text('OSM');
     }
 
@@ -200,24 +203,24 @@ export class UiPanelHistory extends AbstractUiPanel {
 
     list
       .append('li')
-      .html(t.html('info_panels.history.version') + ':')
+      .html(context.tHtml('info_panels.history.version') + ':')
       .append('span')
       .text(entity.version);
 
     list
       .append('li')
-      .html(t.html('info_panels.history.last_edit') + ':')
+      .html(context.tHtml('info_panels.history.last_edit') + ':')
       .append('span')
       .text(this.displayTimestamp(entity.timestamp));
 
     list
       .append('li')
-      .html(t.html('info_panels.history.edited_by') + ':')
+      .html(context.tHtml('info_panels.history.edited_by') + ':')
       .call(this.renderUser, entity.user);
 
     list
       .append('li')
-      .html(t.html('info_panels.history.changeset') + ':')
+      .html(context.tHtml('info_panels.history.changeset') + ':')
       .call(this.renderChangeset, entity.changeset);
   }
 
@@ -227,7 +230,8 @@ export class UiPanelHistory extends AbstractUiPanel {
    * @returns   localized `String` for the given timestamp (or localized 'unknown' string)
    */
   displayTimestamp(timestamp) {
-    if (!timestamp) return t('info_panels.history.unknown');
+    const context = this.context;
+    if (!timestamp) return context.t('info_panels.history.unknown');
 
     const options = {
       day: 'numeric', month: 'short', year: 'numeric',
@@ -235,9 +239,10 @@ export class UiPanelHistory extends AbstractUiPanel {
     };
 
     const d = new Date(timestamp);
-    if (isNaN(d.getTime())) return t('info_panels.history.unknown');
+    if (isNaN(d.getTime())) return context.t('info_panels.history.unknown');
 
-    return d.toLocaleString(localizer.localeCode(), options);
+    const localeCode = context.localizationSystem().localeCode();
+    return d.toLocaleString(localeCode, options);
   }
 
 
@@ -247,10 +252,13 @@ export class UiPanelHistory extends AbstractUiPanel {
    * @param  `userName`   The OSM username to display links for
    */
   renderUser(selection, userName) {
+    const context = this.context;
+    const osm = context.services.get('osm');
+
     if (!userName) {
       selection
         .append('span')
-        .html(t.html('info_panels.history.unknown'));
+        .html(context.tHtml('info_panels.history.unknown'));
       return;
     }
 
@@ -263,7 +271,6 @@ export class UiPanelHistory extends AbstractUiPanel {
       .append('div')
       .attr('class', 'links');
 
-    const osm = this.context.connection();
     if (osm) {
       links
         .append('a')
@@ -276,7 +283,7 @@ export class UiPanelHistory extends AbstractUiPanel {
     links
       .append('a')
       .attr('class', 'user-hdyc-link')
-      .attr('href', 'https://hdyc.neis-one.org/?' + userName)
+      .attr('href', `https://hdyc.neis-one.org/?${userName}`)
       .attr('target', '_blank')
       .attr('tabindex', -1)
       .text('HDYC');
@@ -289,23 +296,25 @@ export class UiPanelHistory extends AbstractUiPanel {
    * @param  `changeset`  the OSM changeset to display the links for
    */
   renderChangeset(selection, changeset) {
+    const context = this.context;
+    const osm = context.services.get('osm');
+
     if (!changeset) {
       selection
         .append('span')
-        .html(t.html('info_panels.history.unknown'));
+        .html(context.tHtml('info_panels.history.unknown'));
       return;
     }
 
     selection
       .append('span')
       .attr('class', 'changeset-id')
-      .html(changeset);
+      .text(changeset);
 
     let links = selection
       .append('div')
       .attr('class', 'links');
 
-    const osm = this.context.connection();
     if (osm) {
       links
         .append('a')
diff --git a/modules/ui/panels/UiPanelLocation.js b/modules/ui/panels/UiPanelLocation.js
index 23bb190328..3ff6979b72 100644
--- a/modules/ui/panels/UiPanelLocation.js
+++ b/modules/ui/panels/UiPanelLocation.js
@@ -1,10 +1,7 @@
-import _debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
+import debounce from 'lodash-es/debounce';
 
 import { AbstractUiPanel } from './AbstractUiPanel';
-import { decimalCoordinatePair, dmsCoordinatePair } from '../../util/units';
-import { t } from '../../core/localizer';
-import { services } from '../../services';
 
 
 /**
@@ -19,8 +16,8 @@ export class UiPanelLocation extends AbstractUiPanel {
   constructor(context) {
     super(context);
     this.id = 'location';
-    this.label = t.html('info_panels.location.title');
-    this.key = t('info_panels.location.key');
+    this.label = context.tHtml('info_panels.location.title');
+    this.key = context.t('info_panels.location.key');
 
     this._selection = d3_select(null);
     this._currLocation = null;
@@ -29,8 +26,7 @@ export class UiPanelLocation extends AbstractUiPanel {
     // (This is also necessary when using `d3-selection.call`)
     this.render = this.render.bind(this);
     this.updateLocation = this.updateLocation.bind(this);
-
-    this._deferredUpdateLocation = _debounce(this.updateLocation, 1000);  // no more than 1/sec
+    this._deferredUpdateLocation = debounce(this.updateLocation, 1000);  // no more than 1/sec
   }
 
 
@@ -75,6 +71,7 @@ export class UiPanelLocation extends AbstractUiPanel {
 
     const context = this.context;
     const selection = this._selection;
+    const l10n = context.localizationSystem();
 
     // Empty out the DOM content and rebuild from scratch..
     selection.html('');
@@ -83,17 +80,17 @@ export class UiPanelLocation extends AbstractUiPanel {
       .append('ul');
 
     // Mouse coordinates as [lon,lat]
-    let loc = context.map().mouseLoc();
+    let loc = context.mapSystem().mouseLoc();
     if (loc.some(isNaN)) {
-      loc = context.map().center();
+      loc = context.mapSystem().center();
     }
 
     // Append coordinates of mouse
     list
       .append('li')
-      .text(dmsCoordinatePair(loc))
+      .text(l10n.dmsCoordinatePair(loc))
       .append('li')
-      .text(decimalCoordinatePair(loc));
+      .text(l10n.decimalCoordinatePair(loc));
 
     // Append reverse geolocated placename
     selection
@@ -115,17 +112,19 @@ export class UiPanelLocation extends AbstractUiPanel {
     if (!this._enabled) return;
 
     const selection = this._selection;
+    const context = this.context;
+    const nominatim = context.services.get('nominatim');
 
-    if (!services.geocoder) {
-      this._currLocation = t('info_panels.location.unknown_location');
-      selection.selectAll('.location-info')
-        .text(this._currLocation);
-    } else {
-      services.geocoder.reverse(loc, (err, result) => {
-        this._currLocation = result ? result.display_name : t('info_panels.location.unknown_location');
+    if (nominatim) {
+      nominatim.reverse(loc, (err, result) => {
+        this._currLocation = result ? result.display_name : context.t('info_panels.location.unknown_location');
         selection.selectAll('.location-info')
           .text(this._currLocation);
       });
+    } else {
+      this._currLocation = context.t('info_panels.location.unknown_location');
+      selection.selectAll('.location-info')
+        .text(this._currLocation);
     }
   }
 
diff --git a/modules/ui/panels/UiPanelMeasurement.js b/modules/ui/panels/UiPanelMeasurement.js
index 64b8b6601b..1c09645b7b 100644
--- a/modules/ui/panels/UiPanelMeasurement.js
+++ b/modules/ui/panels/UiPanelMeasurement.js
@@ -4,9 +4,7 @@ import { Extent, geoSphericalDistance } from '@rapid-sdk/math';
 import { utilGetAllNodes } from '@rapid-sdk/util';
 
 import { AbstractUiPanel } from './AbstractUiPanel';
-import { t, localizer } from '../../core/localizer';
 import { osmNote } from '../../osm';
-import { displayArea, displayLength, decimalCoordinatePair, dmsCoordinatePair } from '../../util/units';
 
 
 // using WGS84 authalic radius (6371007.1809 m)
@@ -47,11 +45,11 @@ export class UiPanelMeasurement extends AbstractUiPanel {
   constructor(context) {
     super(context);
     this.id = 'measurement';
-    this.label = t.html('info_panels.measurement.title');
-    this.key = t('info_panels.measurement.key');
+    this.label = context.tHtml('info_panels.measurement.title');
+    this.key = context.t('info_panels.measurement.key');
 
     this._selection = d3_select(null);
-    this._isImperial = !localizer.usesMetric();
+    this._isImperial = !context.localizationSystem().usesMetric();
 
     // Ensure methods used as callbacks always have `this` bound correctly.
     // (This is also necessary when using `d3-selection.call`)
@@ -69,8 +67,8 @@ export class UiPanelMeasurement extends AbstractUiPanel {
     this._enabled = true;
     this._selection = selection;
 
-    this.context.map().on('draw', this.render);
-    this.context.on('enter.info-measurement', this.render);
+    this.context.mapSystem().on('draw', this.render);
+    this.context.on('modechange', this.render);
   }
 
 
@@ -85,8 +83,8 @@ export class UiPanelMeasurement extends AbstractUiPanel {
     this._enabled = false;
     this._selection = d3_select(null);
 
-    this.context.map().off('draw', this.render);
-    this.context.on('enter.info-measurement', null);
+    this.context.mapSystem().off('draw', this.render);
+    this.context.off('modechange', this.render);
   }
 
 
@@ -99,7 +97,8 @@ export class UiPanelMeasurement extends AbstractUiPanel {
     const selection = this._selection;
     const context = this.context;
     const graph = context.graph();
-    const localeCode = localizer.localeCode();
+    const l10n = context.localizationSystem();
+    const localeCode = l10n.localeCode();
 
     // Empty out the DOM content and rebuild from scratch..
     selection.html('');
@@ -118,7 +117,7 @@ export class UiPanelMeasurement extends AbstractUiPanel {
 
     if (selectedData.size === 1 && (selectedItem instanceof osmNote)) {   // selected 1 OSM Note
       const note = selectedItem;
-      heading = t('note.note') + ' ' + note.id;
+      heading = l10n.t('note.note') + ' ' + note.id;
       location = note.loc;
       geometry = 'note';
 
@@ -128,7 +127,7 @@ export class UiPanelMeasurement extends AbstractUiPanel {
       if (selected.length === 1) {
         heading = selected[0].id;
       } else {
-        heading = t('info_panels.selected', { n: selected.length });
+        heading = l10n.t('info_panels.selected', { n: selected.length });
       }
 
       if (selected.length > 0) {    // 1…n
@@ -192,15 +191,15 @@ export class UiPanelMeasurement extends AbstractUiPanel {
     if (geometry) {
       list
         .append('li')
-        .html(t.html('info_panels.measurement.geometry') + ':')
+        .html(l10n.tHtml('info_panels.measurement.geometry') + ':')
         .append('span')
-        .text(closed ? t('info_panels.measurement.closed_' + geometry) : t('geometry.' + geometry));
+        .text(closed ? l10n.t('info_panels.measurement.closed_' + geometry) : l10n.t('geometry.' + geometry));
     }
 
     if (totalNodeCount) {
       list
         .append('li')
-        .html(t.html('info_panels.measurement.node_count') + ':')
+        .html(l10n.tHtml('info_panels.measurement.node_count') + ':')
         .append('span')
         .text(totalNodeCount.toLocaleString(localeCode));
     }
@@ -208,55 +207,55 @@ export class UiPanelMeasurement extends AbstractUiPanel {
     if (area) {
       list
         .append('li')
-        .html(t.html('info_panels.measurement.area') + ':')
+        .html(l10n.tHtml('info_panels.measurement.area') + ':')
         .append('span')
-        .text(displayArea(area, this._isImperial));
+        .text(l10n.displayArea(area, this._isImperial));
     }
 
     if (length) {
       list
         .append('li')
-        .html(t.html('info_panels.measurement.' + (closed ? 'perimeter' : 'length')) + ':')
+        .html(l10n.tHtml('info_panels.measurement.' + (closed ? 'perimeter' : 'length')) + ':')
         .append('span')
-        .text(displayLength(length, this._isImperial));
+        .text(l10n.displayLength(length, this._isImperial));
     }
 
     if (typeof distance === 'number') {
       list
         .append('li')
-        .html(t.html('info_panels.measurement.distance') + ':')
+        .html(l10n.tHtml('info_panels.measurement.distance') + ':')
         .append('span')
-        .text(displayLength(distance, this._isImperial));
+        .text(l10n.displayLength(distance, this._isImperial));
     }
 
     if (location) {
       coordItem = list
         .append('li')
-        .html(t.html('info_panels.measurement.location') + ':');
+        .html(l10n.tHtml('info_panels.measurement.location') + ':');
       coordItem.append('span')
-        .text(dmsCoordinatePair(location));
+        .text(l10n.dmsCoordinatePair(location));
       coordItem.append('span')
-        .text(decimalCoordinatePair(location));
+        .text(l10n.decimalCoordinatePair(location));
     }
 
     if (centroid) {
       coordItem = list
         .append('li')
-        .html(t.html('info_panels.measurement.centroid') + ':');
+        .html(l10n.tHtml('info_panels.measurement.centroid') + ':');
       coordItem.append('span')
-        .text(dmsCoordinatePair(centroid));
+        .text(l10n.dmsCoordinatePair(centroid));
       coordItem.append('span')
-        .text(decimalCoordinatePair(centroid));
+        .text(l10n.decimalCoordinatePair(centroid));
     }
 
     if (center) {
       coordItem = list
         .append('li')
-        .html(t.html('info_panels.measurement.center') + ':');
+        .html(l10n.tHtml('info_panels.measurement.center') + ':');
       coordItem.append('span')
-        .text(dmsCoordinatePair(center));
+        .text(l10n.dmsCoordinatePair(center));
       coordItem.append('span')
-        .text(decimalCoordinatePair(center));
+        .text(l10n.decimalCoordinatePair(center));
     }
 
     // Add Imperial/Metric toggle
@@ -264,7 +263,7 @@ export class UiPanelMeasurement extends AbstractUiPanel {
       const toggle = this._isImperial ? 'imperial' : 'metric';
       selection
         .append('a')
-        .html(t.html(`info_panels.measurement.${toggle}`))
+        .html(l10n.tHtml(`info_panels.measurement.${toggle}`))
         .attr('href', '#')
         .attr('class', 'button button-toggle-units')
         .on('click', e => {
diff --git a/modules/ui/panes/background.js b/modules/ui/panes/background.js
index 8718df6b81..fd83fb36e1 100644
--- a/modules/ui/panes/background.js
+++ b/modules/ui/panes/background.js
@@ -1,4 +1,3 @@
-import { t } from '../../core/localizer';
 import { uiPane } from '../pane';
 import { uiSectionBackgroundDisplayOptions } from '../sections/background_display_options';
 import { uiSectionBackgroundList } from '../sections/background_list';
@@ -7,20 +6,21 @@ import { uiSectionGridDisplayOptions } from '../sections/grid_display_options';
 import { uiSectionOverlayList } from '../sections/overlay_list';
 // import { uiSectionReactContainer } from '../sections/react_container';
 
+
 export function uiPaneBackground(context) {
-    var backgroundPane = uiPane('background', context)
-        .key(t('background.key'))
-        .label(t.html('background.title'))
-        .description(t.html('background.description'))
-        .iconName('rapid-icon-layers')
-        .sections([
-            uiSectionBackgroundList(context),
-            // uiSectionReactContainer(context),
-            uiSectionOverlayList(context),
-            uiSectionGridDisplayOptions(context),
-            uiSectionBackgroundDisplayOptions(context),
-            uiSectionBackgroundOffset(context)
-        ]);
+  var backgroundPane = uiPane(context, 'background')
+    .key(context.t('background.key'))
+    .label(context.tHtml('background.title'))
+    .description(context.tHtml('background.description'))
+    .iconName('rapid-icon-layers')
+    .sections([
+      uiSectionBackgroundList(context),
+      // uiSectionReactContainer(context),
+      uiSectionOverlayList(context),
+      uiSectionGridDisplayOptions(context),
+      uiSectionBackgroundDisplayOptions(context),
+      uiSectionBackgroundOffset(context)
+    ]);
 
-    return backgroundPane;
+  return backgroundPane;
 }
diff --git a/modules/ui/panes/help.js b/modules/ui/panes/help.js
index 47bcbbd094..d63edcd5bb 100644
--- a/modules/ui/panes/help.js
+++ b/modules/ui/panes/help.js
@@ -3,422 +3,422 @@ import { uiIcon } from '../icon';
 import { uiIntro } from '../intro/intro';
 import { uiPane } from '../pane';
 
-import { t, localizer } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { helpHtml } from '../intro/helper';
 
-export function uiPaneHelp(context) {
 
-    var docKeys = [
-        ['help', [
-            'welcome',
-            'open_data_h',
-            'open_data',
-           'before_start_h',
-           'before_start',
-            'open_source_h',
-            'open_source',
-            'open_source_help'
-        ]],
-        ['overview', [
-            'navigation_h',
-            'navigation_drag',
-            'navigation_zoom',
-            'features_h',
-            'features',
-            'nodes_ways'
-        ]],
-        ['editing', [
-            'select_h',
-            'select_left_click',
-            'select_right_click',
-            'select_space',
-            'multiselect_h',
-            'multiselect',
-            'multiselect_shift_click',
-            'multiselect_lasso',
-            'undo_redo_h',
-            'undo_redo',
-            'save_h',
-            'save',
-            'save_validation',
-            'upload_h',
-            'upload',
-            'backups_h',
-            'backups',
-            'keyboard_h',
-            'keyboard'
-        ]],
-        ['feature_editor', [
-            'intro',
-            'definitions',
-            'type_h',
-            'type',
-            'type_picker',
-            'fields_h',
-            'fields_all_fields',
-            'fields_example',
-            'fields_add_field',
-            'tags_h',
-            'tags_all_tags',
-            'tags_resources'
-        ]],
-        ['points', [
-            'intro',
-            'add_point_h',
-            'add_point',
-            'add_point_finish',
-            'move_point_h',
-            'move_point',
-            'delete_point_h',
-            'delete_point',
-            'delete_point_command'
-        ]],
-        ['lines', [
-            'intro',
-            'add_line_h',
-            'add_line',
-            'add_line_draw',
-            'add_line_continue',
-            'add_line_finish',
-            'modify_line_h',
-            'modify_line_dragnode',
-            'modify_line_addnode',
-            'connect_line_h',
-            'connect_line',
-            'connect_line_display',
-            'connect_line_drag',
-            'connect_line_tag',
-            'disconnect_line_h',
-            'disconnect_line_command',
-            'move_line_h',
-            'move_line_command',
-            'move_line_connected',
-            'delete_line_h',
-            'delete_line',
-            'delete_line_command'
-        ]],
-        ['areas', [
-            'intro',
-            'point_or_area_h',
-            'point_or_area',
-            'add_area_h',
-            'add_area_command',
-            'add_area_draw',
-            'add_area_continue',
-            'add_area_finish',
-            'square_area_h',
-            'square_area_command',
-            'modify_area_h',
-            'modify_area_dragnode',
-            'modify_area_addnode',
-            'delete_area_h',
-            'delete_area',
-            'delete_area_command'
-        ]],
-        ['relations', [
-            'intro',
-            'edit_relation_h',
-            'edit_relation',
-            'edit_relation_add',
-            'edit_relation_delete',
-            'maintain_relation_h',
-            'maintain_relation',
-            'relation_types_h',
-            'multipolygon_h',
-            'multipolygon',
-            'multipolygon_create',
-            'multipolygon_merge',
-            'turn_restriction_h',
-            'turn_restriction',
-            'turn_restriction_field',
-            'turn_restriction_editing',
-            'route_h',
-            'route',
-            'route_add',
-            'boundary_h',
-            'boundary',
-            'boundary_add'
-        ]],
-        ['operations', [
-            'intro',
-            'intro_2',
-            'straighten',
-            'orthogonalize',
-            'circularize',
-            'move',
-            'rotate',
-            'reflect',
-            'continue',
-            'reverse',
-            'disconnect',
-            'split',
-            'extract',
-            'merge',
-            'delete',
-            'downgrade',
-            'copy_paste'
-        ]],
-        ['notes', [
-            'intro',
-            'add_note_h',
-            'add_note',
-            'place_note',
-            'move_note',
-            'update_note_h',
-            'update_note',
-            'save_note_h',
-            'save_note'
-        ]],
-        ['imagery', [
-            'intro',
-            'sources_h',
-            'choosing',
-            'sources',
-            'offsets_h',
-            'offset',
-            'offset_change'
-        ]],
-        ['streetlevel', [
-            'intro',
-            'using_h',
-            'using',
-            'photos',
-            'viewer'
-        ]],
-        ['gps', [
-            'intro',
-            'survey',
-            'using_h',
-            'using',
-            'tracing',
-            'upload'
-        ]],
-        ['qa', [
-            'intro',
-            'tools_h',
-            'tools',
-            'issues_h',
-            'issues'
-        ]]
-    ];
-
-    var headings = {
-        'help.help.open_data_h': 3,
-        'help.help.before_start_h': 3,
-        'help.help.open_source_h': 3,
-        'help.overview.navigation_h': 3,
-        'help.overview.features_h': 3,
-        'help.editing.select_h': 3,
-        'help.editing.multiselect_h': 3,
-        'help.editing.undo_redo_h': 3,
-        'help.editing.save_h': 3,
-        'help.editing.upload_h': 3,
-        'help.editing.backups_h': 3,
-        'help.editing.keyboard_h': 3,
-        'help.feature_editor.type_h': 3,
-        'help.feature_editor.fields_h': 3,
-        'help.feature_editor.tags_h': 3,
-        'help.points.add_point_h': 3,
-        'help.points.move_point_h': 3,
-        'help.points.delete_point_h': 3,
-        'help.lines.add_line_h': 3,
-        'help.lines.modify_line_h': 3,
-        'help.lines.connect_line_h': 3,
-        'help.lines.disconnect_line_h': 3,
-        'help.lines.move_line_h': 3,
-        'help.lines.delete_line_h': 3,
-        'help.areas.point_or_area_h': 3,
-        'help.areas.add_area_h': 3,
-        'help.areas.square_area_h': 3,
-        'help.areas.modify_area_h': 3,
-        'help.areas.delete_area_h': 3,
-        'help.relations.edit_relation_h': 3,
-        'help.relations.maintain_relation_h': 3,
-        'help.relations.relation_types_h': 2,
-        'help.relations.multipolygon_h': 3,
-        'help.relations.turn_restriction_h': 3,
-        'help.relations.route_h': 3,
-        'help.relations.boundary_h': 3,
-        'help.notes.add_note_h': 3,
-        'help.notes.update_note_h': 3,
-        'help.notes.save_note_h': 3,
-        'help.imagery.sources_h': 3,
-        'help.imagery.offsets_h': 3,
-        'help.streetlevel.using_h': 3,
-        'help.gps.using_h': 3,
-        'help.qa.tools_h': 3,
-        'help.qa.issues_h': 3
-    };
-
-    // For each section, squash all the texts into a single markdown document
-    var docs = docKeys.map(function(key) {
-        var helpkey = 'help.' + key[0];
-        var helpPaneReplacements = {
-            version: `**${context.version}**`,
-            rapidicon: `<svg class="icon pre-text rapid"><use xlink:href="#rapid-logo-rapid-wordmark"></use></svg>`
-        };
-        var text = key[1].reduce(function(all, part) {
-            var subkey = helpkey + '.' + part;
-            var depth = headings[subkey];                              // is this subkey a heading?
-            var hhh = depth ? Array(depth + 1).join('#') + ' ' : '';   // if so, prepend with some ##'s
-            return all + hhh + helpHtml(subkey, helpPaneReplacements) + '\n\n';
-        }, '');
-
-        return {
-            title: t.html(helpkey + '.title'),
-            content: marked.parse(text.trim())
-                // use keyboard key styling for shortcuts
-                .replace(/<code>/g, '<kbd>')
-                .replace(/<\/code>/g, '<\/kbd>')
-        };
+export function uiPaneHelp(context) {
+  const l10n = context.localizationSystem();
+
+  const docSections = [
+    ['help', [
+      'welcome',
+      'open_data_h',
+      'open_data',
+      'before_start_h',
+      'before_start',
+      'open_source_h',
+      'open_source',
+      'open_source_help'
+    ]],
+    ['overview', [
+      'navigation_h',
+      'navigation_drag',
+      'navigation_zoom',
+      'features_h',
+      'features',
+      'nodes_ways'
+    ]],
+    ['editing', [
+      'select_h',
+      'select_left_click',
+      'select_right_click',
+      'select_space',
+      'multiselect_h',
+      'multiselect',
+      'multiselect_shift_click',
+      'multiselect_lasso',
+      'undo_redo_h',
+      'undo_redo',
+      'save_h',
+      'save',
+      'save_validation',
+      'upload_h',
+      'upload',
+      'backups_h',
+      'backups',
+      'keyboard_h',
+      'keyboard'
+    ]],
+    ['feature_editor', [
+      'intro',
+      'definitions',
+      'type_h',
+      'type',
+      'type_picker',
+      'fields_h',
+      'fields_all_fields',
+      'fields_example',
+      'fields_add_field',
+      'tags_h',
+      'tags_all_tags',
+      'tags_resources'
+    ]],
+    ['points', [
+      'intro',
+      'add_point_h',
+      'add_point',
+      'add_point_finish',
+      'move_point_h',
+      'move_point',
+      'delete_point_h',
+      'delete_point',
+      'delete_point_command'
+    ]],
+    ['lines', [
+      'intro',
+      'add_line_h',
+      'add_line',
+      'add_line_draw',
+      'add_line_continue',
+      'add_line_finish',
+      'modify_line_h',
+      'modify_line_dragnode',
+      'modify_line_addnode',
+      'connect_line_h',
+      'connect_line',
+      'connect_line_display',
+      'connect_line_drag',
+      'connect_line_tag',
+      'disconnect_line_h',
+      'disconnect_line_command',
+      'move_line_h',
+      'move_line_command',
+      'move_line_connected',
+      'delete_line_h',
+      'delete_line',
+      'delete_line_command'
+    ]],
+    ['areas', [
+      'intro',
+      'point_or_area_h',
+      'point_or_area',
+      'add_area_h',
+      'add_area_command',
+      'add_area_draw',
+      'add_area_continue',
+      'add_area_finish',
+      'square_area_h',
+      'square_area_command',
+      'modify_area_h',
+      'modify_area_dragnode',
+      'modify_area_addnode',
+      'delete_area_h',
+      'delete_area',
+      'delete_area_command'
+    ]],
+    ['relations', [
+      'intro',
+      'edit_relation_h',
+      'edit_relation',
+      'edit_relation_add',
+      'edit_relation_delete',
+      'maintain_relation_h',
+      'maintain_relation',
+      'relation_types_h',
+      'multipolygon_h',
+      'multipolygon',
+      'multipolygon_create',
+      'multipolygon_merge',
+      'turn_restriction_h',
+      'turn_restriction',
+      'turn_restriction_field',
+      'turn_restriction_editing',
+      'route_h',
+      'route',
+      'route_add',
+      'boundary_h',
+      'boundary',
+      'boundary_add'
+    ]],
+    ['operations', [
+      'intro',
+      'intro_2',
+      'straighten',
+      'orthogonalize',
+      'circularize',
+      'move',
+      'rotate',
+      'reflect',
+      'continue',
+      'reverse',
+      'disconnect',
+      'split',
+      'extract',
+      'merge',
+      'delete',
+      'downgrade',
+      'copy_paste'
+    ]],
+    ['notes', [
+      'intro',
+      'add_note_h',
+      'add_note',
+      'place_note',
+      'move_note',
+      'update_note_h',
+      'update_note',
+      'save_note_h',
+      'save_note'
+    ]],
+    ['imagery', [
+      'intro',
+      'sources_h',
+      'choosing',
+      'sources',
+      'offsets_h',
+      'offset',
+      'offset_change'
+    ]],
+    ['streetlevel', [
+      'intro',
+      'using_h',
+      'using',
+      'photos',
+      'viewer'
+    ]],
+    ['gps', [
+      'intro',
+      'survey',
+      'using_h',
+      'using',
+      'tracing',
+      'upload'
+    ]],
+    ['qa', [
+      'intro',
+      'tools_h',
+      'tools',
+      'issues_h',
+      'issues'
+    ]]
+  ];
+
+  const headings = {
+    'help.help.open_data_h': 3,
+    'help.help.before_start_h': 3,
+    'help.help.open_source_h': 3,
+    'help.overview.navigation_h': 3,
+    'help.overview.features_h': 3,
+    'help.editing.select_h': 3,
+    'help.editing.multiselect_h': 3,
+    'help.editing.undo_redo_h': 3,
+    'help.editing.save_h': 3,
+    'help.editing.upload_h': 3,
+    'help.editing.backups_h': 3,
+    'help.editing.keyboard_h': 3,
+    'help.feature_editor.type_h': 3,
+    'help.feature_editor.fields_h': 3,
+    'help.feature_editor.tags_h': 3,
+    'help.points.add_point_h': 3,
+    'help.points.move_point_h': 3,
+    'help.points.delete_point_h': 3,
+    'help.lines.add_line_h': 3,
+    'help.lines.modify_line_h': 3,
+    'help.lines.connect_line_h': 3,
+    'help.lines.disconnect_line_h': 3,
+    'help.lines.move_line_h': 3,
+    'help.lines.delete_line_h': 3,
+    'help.areas.point_or_area_h': 3,
+    'help.areas.add_area_h': 3,
+    'help.areas.square_area_h': 3,
+    'help.areas.modify_area_h': 3,
+    'help.areas.delete_area_h': 3,
+    'help.relations.edit_relation_h': 3,
+    'help.relations.maintain_relation_h': 3,
+    'help.relations.relation_types_h': 2,
+    'help.relations.multipolygon_h': 3,
+    'help.relations.turn_restriction_h': 3,
+    'help.relations.route_h': 3,
+    'help.relations.boundary_h': 3,
+    'help.notes.add_note_h': 3,
+    'help.notes.update_note_h': 3,
+    'help.notes.save_note_h': 3,
+    'help.imagery.sources_h': 3,
+    'help.imagery.offsets_h': 3,
+    'help.streetlevel.using_h': 3,
+    'help.gps.using_h': 3,
+    'help.qa.tools_h': 3,
+    'help.qa.issues_h': 3
+  };
+
+  // common replacements that we may use anywhere in the help text
+  const replacements = {
+    version: `**${context.version}**`,
+    rapidicon: `<svg class="icon pre-text rapid"><use xlink:href="#rapid-logo-rapid-wordmark"></use></svg>`
+  };
+
+
+  // For each doc section, squash all the subsections into a single markdown document
+  let docs = [];
+  for (const [section, subsections] of docSections) {
+    const markdown = subsections.reduce((acc, subsection) => {
+      const stringID = `help.${section}.${subsection}`;
+      const depth = headings[stringID];                             // is this string a heading?
+      const hhh = depth ? Array(depth + 1).join('#') + ' ' : '';    // if so, prepend with some ##'s
+      return acc + hhh + helpHtml(context, stringID, replacements) + '\n\n';
+    }, '');
+
+    docs.push({
+      title: l10n.tHtml(`help.${section}.title`),
+      content: marked.parse(markdown.trim())
+        .replace(/<code>/g, '<kbd>')       // use <kbd> styling for shortcuts
+        .replace(/<\/code>/g, '<\/kbd>')
     });
+  }
+
+
+  const helpPane = uiPane(context, 'help')
+    .key(l10n.t('help.key'))
+    .label(l10n.tHtml('help.title'))
+    .description(l10n.tHtml('help.title'))
+    .iconName('rapid-icon-help');
+
+
+  helpPane.renderContent = function(content) {
+
+    function clickHelp(d, i) {
+      const isRTL = l10n.isRTL();
+      content.property('scrollTop', 0);
+      helpPane.selection().select('.pane-heading h2').html(d.title);
 
-    var helpPane = uiPane('help', context)
-        .key(t('help.key'))
-        .label(t.html('help.title'))
-        .description(t.html('help.title'))
-        .iconName('rapid-icon-help');
-
-    helpPane.renderContent = function(content) {
-
-        function clickHelp(d, i) {
-
-            var rtl = (localizer.textDirection() === 'rtl');
-            content.property('scrollTop', 0);
-            helpPane.selection().select('.pane-heading h2').html(d.title);
-
-            body.html(d.content);
-            body.selectAll('a')
-                .attr('target', '_blank');
-            menuItems.classed('selected', function(m) {
-                return m.title === d.title;
-            });
-
-            nav.html('');
-            if (rtl) {
-                nav.call(drawNext).call(drawPrevious);
-            } else {
-                nav.call(drawPrevious).call(drawNext);
-            }
-
-
-            function drawNext(selection) {
-                if (i < docs.length - 1) {
-                    var nextLink = selection
-                        .append('a')
-                        .attr('href', '#')
-                        .attr('class', 'next')
-                        .on('click', function(d3_event) {
-                            d3_event.preventDefault();
-                            clickHelp(docs[i + 1], i + 1);
-                        });
-
-                    nextLink
-                        .append('span')
-                        .html(docs[i + 1].title)
-                        .call(uiIcon((rtl ? '#rapid-icon-backward' : '#rapid-icon-forward'), 'inline'));
-                }
-            }
-
-
-            function drawPrevious(selection) {
-                if (i > 0) {
-                    var prevLink = selection
-                        .append('a')
-                        .attr('href', '#')
-                        .attr('class', 'previous')
-                        .on('click', function(d3_event) {
-                            d3_event.preventDefault();
-                            clickHelp(docs[i - 1], i - 1);
-                        });
-
-                    prevLink
-                        .call(uiIcon((rtl ? '#rapid-icon-forward' : '#rapid-icon-backward'), 'inline'))
-                        .append('span')
-                        .html(docs[i - 1].title);
-                }
-            }
-        }
-
-
-        function clickWalkthrough(d3_event) {
+      body.html(d.content);
+      body.selectAll('a').attr('target', '_blank');
+      menuItems.classed('selected', item => item.title === d.title);
+
+      nav.html('');
+      if (isRTL) {
+        nav.call(drawNext).call(drawPrevious);
+      } else {
+        nav.call(drawPrevious).call(drawNext);
+      }
+
+
+      function drawNext(selection) {
+        if (i === docs.length - 1) return;
+
+        let nextLink = selection
+          .append('a')
+          .attr('href', '#')
+          .attr('class', 'next')
+          .on('click', function(d3_event) {
             d3_event.preventDefault();
-            if (context.inIntro()) return;
-            context.container().call(uiIntro(context));
-            context.ui().togglePanes();
-        }
+            clickHelp(docs[i + 1], i + 1);
+          });
+
+        nextLink
+          .append('span')
+          .html(docs[i + 1].title)
+          .call(uiIcon((isRTL ? '#rapid-icon-backward' : '#rapid-icon-forward'), 'inline'));
+      }
+
 
+      function drawPrevious(selection) {
+        if (i === 0) return;
 
-        function clickShortcuts(d3_event) {
+        let prevLink = selection
+          .append('a')
+          .attr('href', '#')
+          .attr('class', 'previous')
+          .on('click', function(d3_event) {
             d3_event.preventDefault();
-            context.container().call(context.ui().shortcuts, true);
-        }
-
-        var toc = content
-            .append('ul')
-            .attr('class', 'toc');
-
-        var menuItems = toc.selectAll('li')
-            .data(docs)
-            .enter()
-            .append('li')
-            .append('a')
-            .attr('href', '#')
-            .html(function(d) { return d.title; })
-            .on('click', function(d3_event, d) {
-                d3_event.preventDefault();
-                clickHelp(d, docs.indexOf(d));
-            });
-
-        var shortcuts = toc
-            .append('li')
-            .attr('class', 'shortcuts')
-            .call(uiTooltip()
-                .title(t.html('shortcuts.tooltip'))
-                .keys(['?'])
-                .placement('top')
-            )
-            .append('a')
-            .attr('href', '#')
-            .on('click', clickShortcuts);
-
-        shortcuts
-            .append('div')
-            .html(t.html('shortcuts.title'));
-
-       var walkthrough = toc
-           .append('li')
-           .attr('class', 'walkthrough')
-           .append('a')
-           .attr('href', '#')
-           .on('click', clickWalkthrough);
-
-       walkthrough
-           .append('svg')
-           .attr('class', 'logo logo-walkthrough')
-           .append('use')
-           .attr('xlink:href', '#rapid-logo-walkthrough');
-
-       walkthrough
-           .append('div')
-           .html(t.html('splash.walkthrough'));
-
-
-        var helpContent = content
-            .append('div')
-            .attr('class', 'left-content');
-
-        var body = helpContent
-            .append('div')
-            .attr('class', 'body');
-
-        var nav = helpContent
-            .append('div')
-            .attr('class', 'nav');
-
-        clickHelp(docs[0], 0);
-    };
-
-    return helpPane;
+            clickHelp(docs[i - 1], i - 1);
+          });
+
+        prevLink
+          .call(uiIcon((isRTL ? '#rapid-icon-forward' : '#rapid-icon-backward'), 'inline'))
+          .append('span')
+          .html(docs[i - 1].title);
+      }
+    }
+
+
+    function clickWalkthrough(d3_event) {
+      d3_event.preventDefault();
+      if (context.inIntro) return;
+      context.container().call(uiIntro(context));
+      context.ui().togglePanes();
+    }
+
+
+    function clickShortcuts(d3_event) {
+      d3_event.preventDefault();
+      context.container().call(context.ui().shortcuts, true);
+    }
+
+    let toc = content   // table of contents
+      .append('ul')
+      .attr('class', 'toc');
+
+    let menuItems = toc.selectAll('li')
+      .data(docs)
+      .enter()
+      .append('li')
+      .append('a')
+      .attr('href', '#')
+      .html(d => d.title)
+      .on('click', function(d3_event, d) {
+        d3_event.preventDefault();
+        clickHelp(d, docs.indexOf(d));
+      });
+
+    let shortcuts = toc
+      .append('li')
+      .attr('class', 'shortcuts')
+      .call(uiTooltip(context)
+        .title(l10n.tHtml('shortcuts.tooltip'))
+        .keys(['?'])
+        .placement('top')
+      )
+      .append('a')
+      .attr('href', '#')
+      .on('click', clickShortcuts);
+
+    shortcuts
+      .append('div')
+      .html(l10n.tHtml('shortcuts.title'));
+
+    let walkthrough = toc
+      .append('li')
+      .attr('class', 'walkthrough')
+      .append('a')
+      .attr('href', '#')
+      .on('click', clickWalkthrough);
+
+    walkthrough
+      .append('svg')
+      .attr('class', 'logo logo-walkthrough')
+      .append('use')
+      .attr('xlink:href', '#rapid-logo-walkthrough');
+
+    walkthrough
+      .append('div')
+      .html(l10n.tHtml('splash.walkthrough'));
+
+    let helpContent = content
+      .append('div')
+      .attr('class', 'left-content');
+
+    let body = helpContent
+      .append('div')
+      .attr('class', 'body');
+
+    let nav = helpContent
+      .append('div')
+      .attr('class', 'nav');
+
+    clickHelp(docs[0], 0);
+  };
+
+  return helpPane;
 }
diff --git a/modules/ui/panes/issues.js b/modules/ui/panes/issues.js
index 7dddd6bc09..a361f81659 100644
--- a/modules/ui/panes/issues.js
+++ b/modules/ui/panes/issues.js
@@ -1,4 +1,3 @@
-import { t } from '../../core/localizer';
 import { uiPane } from '../pane';
 
 import { uiSectionValidationIssues } from '../sections/validation_issues';
@@ -6,11 +5,12 @@ import { uiSectionValidationOptions } from '../sections/validation_options';
 import { uiSectionValidationRules } from '../sections/validation_rules';
 import { uiSectionValidationStatus } from '../sections/validation_status';
 
+
 export function uiPaneIssues(context) {
-  return uiPane('issues', context)
-    .key(t('issues.key'))
-    .label(t.html('issues.title'))
-    .description(t.html('issues.title'))
+  return uiPane(context, 'issues')
+    .key(context.t('issues.key'))
+    .label(context.tHtml('issues.title'))
+    .description(context.tHtml('issues.title'))
     .iconName('rapid-icon-alert')
     .sections([
       uiSectionValidationOptions(context),
diff --git a/modules/ui/panes/map_data.js b/modules/ui/panes/map_data.js
index f2a0192848..5107160ef7 100644
--- a/modules/ui/panes/map_data.js
+++ b/modules/ui/panes/map_data.js
@@ -1,4 +1,3 @@
-import { t } from '../../core/localizer';
 import { uiPane } from '../pane';
 
 import { uiSectionDataLayers } from '../sections/data_layers';
@@ -8,10 +7,10 @@ import { uiSectionPhotoOverlays } from '../sections/photo_overlays';
 
 
 export function uiPaneMapData(context) {
-  let mapDataPane = uiPane('map-data', context)
-    .key(t('map_data.key'))
-    .label(t.html('map_data.title'))
-    .description(t.html('map_data.description'))
+  return uiPane(context, 'map-data')
+    .key(context.t('map_data.key'))
+    .label(context.tHtml('map_data.title'))
+    .description(context.tHtml('map_data.description'))
     .iconName('rapid-icon-data')
     .sections([
       uiSectionDataLayers(context),
@@ -19,6 +18,4 @@ export function uiPaneMapData(context) {
       uiSectionMapStyleOptions(context),
       uiSectionMapFeatures(context)
     ]);
-
-  return mapDataPane;
 }
diff --git a/modules/ui/panes/preferences.js b/modules/ui/panes/preferences.js
index 8dd8fa933b..c65c0018e5 100644
--- a/modules/ui/panes/preferences.js
+++ b/modules/ui/panes/preferences.js
@@ -1,13 +1,13 @@
-import { t } from '../../core/localizer';
 import { uiPane } from '../pane';
 import { uiSectionPrivacy } from '../sections/privacy';
 import { uiSectionMapInteractionOptions } from '../sections/map_interaction_options';
 
+
 export function uiPanePreferences(context) {
-  return uiPane('preferences', context)
-    .key(t('preferences.key'))
-    .label(t.html('preferences.title'))
-    .description(t.html('preferences.description'))
+  return uiPane(context, 'preferences')
+    .key(context.t('preferences.key'))
+    .label(context.tHtml('preferences.title'))
+    .description(context.tHtml('preferences.description'))
     .iconName('fas-user-cog')
     .sections([
       uiSectionPrivacy(context),
diff --git a/modules/ui/photo_viewer.js b/modules/ui/photo_viewer.js
new file mode 100644
index 0000000000..228cb93299
--- /dev/null
+++ b/modules/ui/photo_viewer.js
@@ -0,0 +1,139 @@
+import { select as d3_select } from 'd3-selection';
+import { dispatch as d3_dispatch } from 'd3-dispatch';
+
+import { uiIcon } from './icon';
+import { utilGetDimensions } from '../util/dimensions';
+import { utilRebind } from '../util';
+
+
+export function uiPhotoViewer(context) {
+  let dispatch = d3_dispatch('resize');
+
+
+  function photoviewer(selection) {
+    selection
+      .append('button')
+      .attr('class', 'thumb-hide')
+      .on('click', () => {
+        for (const serviceID of ['mapillary', 'kartaview', 'streetside']) {
+          const service = context.services.get(serviceID);
+          service?.hideViewer();
+        }
+      })
+      .append('div')
+      .call(uiIcon('#rapid-icon-close'));
+
+    function preventDefault(d3_event) {
+      d3_event.preventDefault();
+    }
+
+    selection
+      .append('button')
+      .attr('class', 'resize-handle-xy')
+      .on('touchstart touchdown touchend', preventDefault)
+      .on('pointerdown', buildResizeListener(selection, 'resize', { resizeOnX: true, resizeOnY: true }) );
+
+    selection
+      .append('button')
+      .attr('class', 'resize-handle-x')
+      .on('touchstart touchdown touchend', preventDefault)
+      .on('pointerdown', buildResizeListener(selection, 'resize', { resizeOnX: true }) );
+
+    selection
+      .append('button')
+      .attr('class', 'resize-handle-y')
+      .on('touchstart touchdown touchend', preventDefault)
+      .on('pointerdown', buildResizeListener(selection, 'resize', { resizeOnY: true }) );
+
+
+    function buildResizeListener(target, eventName, options) {
+      const resizeOnX = !!options.resizeOnX;
+      const resizeOnY = !!options.resizeOnY;
+      const minHeight = options.minHeight || 240;
+      const minWidth = options.minWidth || 320;
+      let pointerId;
+      let startX;
+      let startY;
+      let startWidth;
+      let startHeight;
+
+      function startResize(d3_event) {
+        if (pointerId !== (d3_event.pointerId || 'mouse')) return;
+
+        d3_event.preventDefault();
+        d3_event.stopPropagation();
+
+        const dims = context.mapSystem().dimensions;
+        if (resizeOnX) {
+          const maxWidth = dims[0];
+          const newWidth = clamp((startWidth + d3_event.clientX - startX), minWidth, maxWidth);
+          target.style('width', newWidth + 'px');
+        }
+        if (resizeOnY) {
+          const maxHeight = dims[1] - 90;  // preserve space at top/bottom of map
+          const newHeight = clamp((startHeight + startY - d3_event.clientY), minHeight, maxHeight);
+          target.style('height', newHeight + 'px');
+        }
+
+        dispatch.call(eventName, target, utilGetDimensions(target, true));
+      }
+
+      function clamp(num, min, max) {
+        return Math.max(min, Math.min(num, max));
+      }
+
+      function stopResize(d3_event) {
+        if (pointerId !== (d3_event.pointerId || 'mouse')) return;
+
+        d3_event.preventDefault();
+        d3_event.stopPropagation();
+
+        // remove all the listeners we added
+        d3_select(window)
+          .on('.' + eventName, null);
+      }
+
+      return function initResize(d3_event) {
+        d3_event.preventDefault();
+        d3_event.stopPropagation();
+
+        pointerId = d3_event.pointerId || 'mouse';
+        startX = d3_event.clientX;
+        startY = d3_event.clientY;
+
+        const targetRect = target.node().getBoundingClientRect();
+        startWidth = targetRect.width;
+        startHeight = targetRect.height;
+
+        d3_select(window)
+          .on('pointermove.' + eventName, startResize, false)
+          .on('pointerup.' + eventName, stopResize, false)
+          .on('pointercancel.' + eventName, stopResize, false);
+      };
+    }
+  }
+
+
+  photoviewer.onMapResize = function() {
+    const photoviewer = context.container().select('.photoviewer');
+    const content = context.container().select('.main-content');
+    const mapDimensions = utilGetDimensions(content, true);
+    // shrink photo viewer if it is too big
+    // (-90 preserves space at top and bottom of map used by menus)
+    const photoDimensions = utilGetDimensions(photoviewer, true);
+    if (photoDimensions[0] > mapDimensions[0] || photoDimensions[1] > (mapDimensions[1] - 90)) {
+      const setPhotoDimensions = [
+        Math.min(photoDimensions[0], mapDimensions[0]),
+        Math.min(photoDimensions[1], mapDimensions[1] - 90),
+      ];
+
+      photoviewer
+        .style('width', setPhotoDimensions[0] + 'px')
+        .style('height', setPhotoDimensions[1] + 'px');
+
+      dispatch.call('resize', photoviewer, setPhotoDimensions);
+    }
+  };
+
+  return utilRebind(photoviewer, dispatch, 'on');
+}
diff --git a/modules/ui/photoviewer.js b/modules/ui/photoviewer.js
deleted file mode 100644
index d2c6d4ccaa..0000000000
--- a/modules/ui/photoviewer.js
+++ /dev/null
@@ -1,149 +0,0 @@
-import { select as d3_select } from 'd3-selection';
-
-import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { uiIcon } from './icon';
-import { utilGetDimensions } from '../util/dimensions';
-import { utilRebind } from '../util';
-import { services } from '../services';
-
-
-export function uiPhotoviewer(context) {
-    var dispatch = d3_dispatch('resize');
-
-
-    function photoviewer(selection) {
-        selection
-            .append('button')
-            .attr('class', 'thumb-hide')
-            .on('click', function () {
-                if (services.streetside) { services.streetside.hideViewer(context); }
-                if (services.mapillary) { services.mapillary.hideViewer(context); }
-                if (services.kartaview) { services.kartaview.hideViewer(context); }
-            })
-            .append('div')
-            .call(uiIcon('#rapid-icon-close'));
-
-        function preventDefault(d3_event) {
-            d3_event.preventDefault();
-        }
-
-        selection
-            .append('button')
-            .attr('class', 'resize-handle-xy')
-            .on('touchstart touchdown touchend', preventDefault)
-            .on(
-                'pointerdown',
-                buildResizeListener(selection, 'resize', dispatch, { resizeOnX: true, resizeOnY: true })
-            );
-
-        selection
-            .append('button')
-            .attr('class', 'resize-handle-x')
-            .on('touchstart touchdown touchend', preventDefault)
-            .on(
-                'pointerdown',
-                buildResizeListener(selection, 'resize', dispatch, { resizeOnX: true })
-            );
-
-        selection
-            .append('button')
-            .attr('class', 'resize-handle-y')
-            .on('touchstart touchdown touchend', preventDefault)
-            .on(
-                'pointerdown',
-                buildResizeListener(selection, 'resize', dispatch, { resizeOnY: true })
-            );
-
-
-        function buildResizeListener(target, eventName, dispatch, options) {
-            var resizeOnX = !!options.resizeOnX;
-            var resizeOnY = !!options.resizeOnY;
-            var minHeight = options.minHeight || 240;
-            var minWidth = options.minWidth || 320;
-            var pointerId;
-            var startX;
-            var startY;
-            var startWidth;
-            var startHeight;
-
-            function startResize(d3_event) {
-                if (pointerId !== (d3_event.pointerId || 'mouse')) return;
-
-                d3_event.preventDefault();
-                d3_event.stopPropagation();
-
-                var mapSize = context.map().dimensions;
-
-                if (resizeOnX) {
-                    var maxWidth = mapSize[0];
-                    var newWidth = clamp((startWidth + d3_event.clientX - startX), minWidth, maxWidth);
-                    target.style('width', newWidth + 'px');
-                }
-
-                if (resizeOnY) {
-                    var maxHeight = mapSize[1] - 90;  // preserve space at top/bottom of map
-                    var newHeight = clamp((startHeight + startY - d3_event.clientY), minHeight, maxHeight);
-                    target.style('height', newHeight + 'px');
-                }
-
-                dispatch.call(eventName, target, utilGetDimensions(target, true));
-            }
-
-            function clamp(num, min, max) {
-                return Math.max(min, Math.min(num, max));
-            }
-
-            function stopResize(d3_event) {
-                if (pointerId !== (d3_event.pointerId || 'mouse')) return;
-
-                d3_event.preventDefault();
-                d3_event.stopPropagation();
-
-                // remove all the listeners we added
-                d3_select(window)
-                    .on('.' + eventName, null);
-            }
-
-            return function initResize(d3_event) {
-                d3_event.preventDefault();
-                d3_event.stopPropagation();
-
-                pointerId = d3_event.pointerId || 'mouse';
-
-                startX = d3_event.clientX;
-                startY = d3_event.clientY;
-                var targetRect = target.node().getBoundingClientRect();
-                startWidth = targetRect.width;
-                startHeight = targetRect.height;
-
-                d3_select(window)
-                    .on('pointermove.' + eventName, startResize, false)
-                    .on('pointerup.' + eventName, stopResize, false)
-                    .on('pointercancel.' + eventName, stopResize, false);
-            };
-        }
-    }
-
-    photoviewer.onMapResize = function() {
-        var photoviewer = context.container().select('.photoviewer');
-        var content = context.container().select('.main-content');
-        var mapDimensions = utilGetDimensions(content, true);
-        // shrink photo viewer if it is too big
-        // (-90 preserves space at top and bottom of map used by menus)
-        var photoDimensions = utilGetDimensions(photoviewer, true);
-        if (photoDimensions[0] > mapDimensions[0] || photoDimensions[1] > (mapDimensions[1] - 90)) {
-            var setPhotoDimensions = [
-                Math.min(photoDimensions[0], mapDimensions[0]),
-                Math.min(photoDimensions[1], mapDimensions[1] - 90),
-            ];
-
-            photoviewer
-                .style('width', setPhotoDimensions[0] + 'px')
-                .style('height', setPhotoDimensions[1] + 'px');
-
-            dispatch.call('resize', photoviewer, setPhotoDimensions);
-        }
-    };
-
-    return utilRebind(photoviewer, dispatch, 'on');
-}
diff --git a/modules/ui/popover.js b/modules/ui/popover.js
index 310bc78cad..d2d2f8d680 100644
--- a/modules/ui/popover.js
+++ b/modules/ui/popover.js
@@ -3,7 +3,7 @@ import { utilFunctor } from '../util/util';
 
 var _popoverID = 0;
 
-export function uiPopover(klass) {
+export function uiPopover(context, klass) {
     var _id = _popoverID++;
     var _anchorSelection = d3_select(null);
     var popover = function(selection) {
diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js
index eb92029b3c..d431072dcb 100644
--- a/modules/ui/preset_icon.js
+++ b/modules/ui/preset_icon.js
@@ -1,11 +1,9 @@
-import * as PIXI from 'pixi.js';
-
-import { prefs } from '../core/preferences';
+import { Color } from 'pixi.js';
 import { styleMatch } from '../pixi/styles';
 import { uiIcon } from './icon';
 
 
-export function uiPresetIcon() {
+export function uiPresetIcon(context) {
   let _preset;
   let _geometry;
 
@@ -23,7 +21,7 @@ export function uiPresetIcon() {
   //
   function renderCategoryBorder(container, style) {
     const px = 60;
-    const color = PIXI.utils.hex2string(style.fill.color);
+    const color = new Color(style.fill.color).toHex();
     const alpha = style.fill.alpha;
     const FOLDER_PATH = 'M9.5,7.5 L25.5,7.5 L28.5,12.5 L49.5,12.5 C51.709139,12.5 53.5,14.290861 53.5,16.5 L53.5,43.5 C53.5,45.709139 51.709139,47.5 49.5,47.5 L10.5,47.5 C8.290861,47.5 6.5,45.709139 6.5,43.5 L6.5,12.5 L9.5,7.5 Z';
 
@@ -89,7 +87,7 @@ export function uiPresetIcon() {
     const len = px * 2/3;
     const c1 = (px-len) / 2;
     const c2 = c1 + len;
-    const color = PIXI.utils.hex2string(style.fill.color);
+    const color = new Color(style.fill.color).toHex();
     const alpha = style.fill.alpha;
 
     let svg = container
@@ -137,8 +135,8 @@ export function uiPresetIcon() {
     const l = Math.round(px * 0.6);
     const x1 = (px - l) / 2;
     const x2 = x1 + l;
-    const casingColor = PIXI.utils.hex2string(style.casing.color);
-    const strokeColor = PIXI.utils.hex2string(style.stroke.color);
+    const casingColor = new Color(style.casing.color).toHex();
+    const strokeColor = new Color(style.stroke.color).toHex();
     const dash = style.stroke.dash;
     const hasDash = Array.isArray(dash);
 
@@ -247,7 +245,8 @@ export function uiPresetIcon() {
       geom = 'route';
     }
 
-    const showThirdPartyIcons = (prefs('preferences.privacy.thirdpartyicons') ?? 'true') === 'true';
+    const prefs = context.storageSystem();
+    const showThirdPartyIcons = (prefs.getItem('preferences.privacy.thirdpartyicons') ?? 'true') === 'true';
     const imageURL = showThirdPartyIcons && p.imageURL;
     const picon = getIcon(p, geom);
     // const showPoint = isPreset && (geom === 'point');     // not actually used
@@ -282,7 +281,7 @@ export function uiPresetIcon() {
       let color = '#333';
       if (showLine || showRoute) {
         if (isRapidIcon) {
-          color = PIXI.utils.hex2string(style.stroke.color);
+          color = new Color(style.stroke.color).toHex();
         }
       }
 
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index 57c10971f5..340003dcee 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -1,9 +1,7 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
-import _debounce from 'lodash-es/debounce';
+import debounce from 'lodash-es/debounce';
 
-import { presetManager } from '../presets';
-import { t, localizer } from '../core/localizer';
 import { actionChangePreset } from '../actions/change_preset';
 import { operationDelete } from '../operations/delete';
 import { uiIcon } from './icon';
@@ -14,6 +12,10 @@ import { utilKeybinding, utilNoAuto, utilRebind, utilTotalExtent } from '../util
 
 
 export function uiPresetList(context) {
+    var l10n = context.localizationSystem();
+    var filterSystem = context.filterSystem();
+    var presetSystem = context.presetSystem();
+
     var dispatch = d3_dispatch('cancel', 'choose');
     var _entityIDs;
     var _currLoc;
@@ -24,7 +26,8 @@ export function uiPresetList(context) {
     function presetList(selection) {
         if (!_entityIDs) return;
 
-        var presets = presetManager.matchAllGeometry(entityGeometries());
+        var presets = presetSystem.matchAllGeometry(entityGeometries());
+        const isRTL = l10n.isRTL();
 
         selection.html('');
 
@@ -34,13 +37,53 @@ export function uiPresetList(context) {
 
         var message = messagewrap
             .append('h3')
-            .html(t.html('inspector.choose'));
+            .html(l10n.tHtml('inspector.choose'));
 
         messagewrap
             .append('button')
             .attr('class', 'preset-choose')
             .on('click', function() { dispatch.call('cancel', this); })
-            .call(uiIcon((localizer.textDirection() === 'rtl') ? '#rapid-icon-backward' : '#rapid-icon-forward'));
+            .call(uiIcon(isRTL ? '#rapid-icon-backward' : '#rapid-icon-forward'));
+
+
+        var searchWrap = selection
+            .append('div')
+            .attr('class', 'search-header');
+
+        searchWrap
+            .call(uiIcon('#rapid-icon-search', 'pre-text'));
+
+        var search = searchWrap
+            .append('input')
+            .attr('class', 'preset-search-input')
+            .attr('placeholder', l10n.t('inspector.search'))
+            .attr('type', 'search')
+            .call(utilNoAuto)
+            .on('keydown', initialKeydown)
+            .on('keypress', keypress)
+            .on('input', debounce(inputevent));
+
+        if (_autofocus) {
+            search.node().focus();
+
+            // Safari 14 doesn't always like to focus immediately,
+            // so try again on the next pass
+            setTimeout(function() {
+                search.node().focus();
+            }, 0);
+        }
+
+        var listWrap = selection
+            .append('div')
+            .attr('class', 'inspector-body');
+
+        var list = listWrap
+            .append('div')
+            .attr('class', 'preset-list')
+            .call(drawList, presetSystem.defaults(entityGeometries()[0], 36, !context.inIntro, _currLoc));
+
+        filterSystem.on('filterchange', updateForFeatureHiddenState);
+
 
         function initialKeydown(d3_event) {
             // hack to let delete shortcut work when search is autofocused
@@ -92,102 +135,63 @@ export function uiPresetList(context) {
             var value = search.property('value');
             list.classed('filtered', value.length);
 
-            var results, messageText;
+            var collection, messageText;
             if (value.length) {
-                results = presets.search(value, entityGeometries()[0], _currLoc);
-                messageText = t('inspector.results', {
-                    n: results.collection.length,
+                collection = presets.search(value, entityGeometries()[0], _currLoc);
+                messageText = l10n.t('inspector.results', {
+                    n: collection.array.length,
                     search: value
                 });
             } else {
-                results = presetManager.defaults(entityGeometries()[0], 36, !context.inIntro(), _currLoc);
-                messageText = t('inspector.choose');
+                collection = presetSystem.defaults(entityGeometries()[0], 36, !context.inIntro, _currLoc);
+                messageText = l10n.t('inspector.choose');
             }
-            list.call(drawList, results);
+            list.call(drawList, collection);
             message.html(messageText);
         }
-
-        var searchWrap = selection
-            .append('div')
-            .attr('class', 'search-header');
-
-        searchWrap
-            .call(uiIcon('#rapid-icon-search', 'pre-text'));
-
-        var search = searchWrap
-            .append('input')
-            .attr('class', 'preset-search-input')
-            .attr('placeholder', t('inspector.search'))
-            .attr('type', 'search')
-            .call(utilNoAuto)
-            .on('keydown', initialKeydown)
-            .on('keypress', keypress)
-            .on('input', _debounce(inputevent));
-
-        if (_autofocus) {
-            search.node().focus();
-
-            // Safari 14 doesn't always like to focus immediately,
-            // so try again on the next pass
-            setTimeout(function() {
-                search.node().focus();
-            }, 0);
-        }
-
-        var listWrap = selection
-            .append('div')
-            .attr('class', 'inspector-body');
-
-        var list = listWrap
-            .append('div')
-            .attr('class', 'preset-list')
-            .call(drawList, presetManager.defaults(entityGeometries()[0], 36, !context.inIntro(), _currLoc));
-
-        context.features().on('change.preset-list', updateForFeatureHiddenState);
     }
 
 
-    function drawList(list, presets) {
-        presets = presets.matchAllGeometry(entityGeometries());
-        var collection = presets.collection.reduce(function(collection, preset) {
-            if (!preset) return collection;
+    // Draws a collection of Presets/Categories
+    function drawList(selection, collection) {
+        collection = collection.matchAllGeometry(entityGeometries());  // not sure why we do this again
 
-            if (preset.members) {
-                if (preset.members.collection.filter(function(preset) {
-                    return preset.addable();
-                }).length > 1) {
-                    collection.push(CategoryItem(preset));
-                }
-            } else if (preset.addable()) {
-                collection.push(PresetItem(preset));
-            }
-            return collection;
-        }, []);
+        let arr = [];
+        for (const item of collection.array) {
+          if (!item) continue;  // not sure how this would happen
+          if (item.members) {
+            arr.push(CategoryItem(item));
+          } else {
+            arr.push(PresetItem(item));
+          }
+        }
 
-        var items = list.selectAll('.preset-list-item')
-            .data(collection, function(d) { return d.preset.id; });
+        let items = selection.selectAll('.preset-list-item')
+          .data(arr, d => d.preset.id);
 
-        items.order();
+        items.order();  // make them match the order of `arr`
 
         items.exit()
-            .remove();
+          .remove();
 
         items.enter()
-            .append('div')
-            .attr('class', function(item) { return 'preset-list-item preset-' + item.preset.id.replace('/', '-'); })
-            .classed('current', function(item) { return _currentPresets.indexOf(item.preset) !== -1; })
-            .each(function(item) { d3_select(this).call(item); })
-            .style('opacity', 0)
-            .transition()
-            .style('opacity', 1);
-
-        updateForFeatureHiddenState();
+          .append('div')
+          .attr('class', function(item) { return 'preset-list-item preset-' + item.preset.id.replace('/', '-'); })
+          .classed('current', function(item) { return _currentPresets.indexOf(item.preset) !== -1; })
+          .each(function(item) { d3_select(this).call(item); })
+          .style('opacity', 0)
+          .transition()
+          .style('opacity', 1);
+
+      updateForFeatureHiddenState();
     }
 
+
     function itemKeydown(d3_event) {
         // the actively focused item
         var item = d3_select(this.closest('.preset-list-item'));
         var parentItem = d3_select(item.node().parentNode.closest('.preset-list-item'));
+        const isRTL = l10n.isRTL();
 
         // arrow down, move focus to the next, lower item
         if (d3_event.keyCode === utilKeybinding.keyCodes['↓']) {
@@ -243,7 +247,7 @@ export function uiPresetList(context) {
             }
 
         // arrow left, move focus to the parent item if there is one
-        } else if (d3_event.keyCode === utilKeybinding.keyCodes[(localizer.textDirection() === 'rtl') ? '→' : '←']) {
+        } else if (d3_event.keyCode === utilKeybinding.keyCodes[isRTL ? '→' : '←']) {
             d3_event.preventDefault();
             d3_event.stopPropagation();
             // if there is a parent item, focus on the parent item
@@ -252,7 +256,7 @@ export function uiPresetList(context) {
             }
 
         // arrow right, choose this item
-        } else if (d3_event.keyCode === utilKeybinding.keyCodes[(localizer.textDirection() === 'rtl') ? '←' : '→']) {
+        } else if (d3_event.keyCode === utilKeybinding.keyCodes[isRTL ? '←' : '→']) {
             d3_event.preventDefault();
             d3_event.stopPropagation();
             item.datum().choose.call(d3_select(this).node());
@@ -264,13 +268,14 @@ export function uiPresetList(context) {
         var box, sublist, shown = false;
 
         function item(selection) {
+            const isRTL = l10n.isRTL();
+
             var wrap = selection.append('div')
                 .attr('class', 'preset-list-button-wrap category');
 
             function click() {
                 var isExpanded = d3_select(this).classed('expanded');
-                var iconName = isExpanded ?
-                    (localizer.textDirection() === 'rtl' ? '#rapid-icon-backward' : '#rapid-icon-forward') : '#rapid-icon-down';
+                var iconName = isExpanded ? (isRTL ? '#rapid-icon-backward' : '#rapid-icon-forward') : '#rapid-icon-down';
                 d3_select(this)
                     .classed('expanded', !isExpanded);
                 d3_select(this).selectAll('div.label-inner svg.icon use')
@@ -284,13 +289,13 @@ export function uiPresetList(context) {
                 .append('button')
                 .attr('class', 'preset-list-button')
                 .classed('expanded', false)
-                .call(uiPresetIcon()
+                .call(uiPresetIcon(context)
                     .geometry(geometries.length === 1 && geometries[0])
                     .preset(preset))
                 .on('click', click)
                 .on('keydown', function(d3_event) {
                     // right arrow, expand the focused item
-                    if (d3_event.keyCode === utilKeybinding.keyCodes[(localizer.textDirection() === 'rtl') ? '←' : '→']) {
+                    if (d3_event.keyCode === utilKeybinding.keyCodes[isRTL ? '←' : '→']) {
                         d3_event.preventDefault();
                         d3_event.stopPropagation();
                         // if the item isn't expanded
@@ -299,7 +304,7 @@ export function uiPresetList(context) {
                             click.call(this, d3_event);
                         }
                     // left arrow, collapse the focused item
-                    } else if (d3_event.keyCode === utilKeybinding.keyCodes[(localizer.textDirection() === 'rtl') ? '→' : '←']) {
+                    } else if (d3_event.keyCode === utilKeybinding.keyCodes[isRTL ? '→' : '←']) {
                         d3_event.preventDefault();
                         d3_event.stopPropagation();
                         // if the item is expanded
@@ -321,7 +326,7 @@ export function uiPresetList(context) {
             label
                 .append('div')
                 .attr('class', 'namepart')
-                .call(uiIcon((localizer.textDirection() === 'rtl' ? '#rapid-icon-backward' : '#rapid-icon-forward'), 'inline'))
+                .call(uiIcon((isRTL ? '#rapid-icon-backward' : '#rapid-icon-forward'), 'inline'))
                 .append('span')
                 .html(function() { return preset.nameLabel() + '&hellip;'; });
 
@@ -355,7 +360,7 @@ export function uiPresetList(context) {
                 box.transition()
                     .duration(200)
                     .style('opacity', '1')
-                    .style('max-height', 200 + members.collection.length * 190 + 'px')
+                    .style('max-height', 200 + members.array.length * 190 + 'px')
                     .style('padding-bottom', '10px');
             }
         };
@@ -374,7 +379,7 @@ export function uiPresetList(context) {
 
             var button = wrap.append('button')
                 .attr('class', 'preset-list-button')
-                .call(uiPresetIcon()
+                .call(uiPresetIcon(context)
                     .geometry(geometries.length === 1 && geometries[0])
                     .preset(preset))
                 .on('click', item.choose)
@@ -404,22 +409,22 @@ export function uiPresetList(context) {
 
         item.choose = function() {
             if (d3_select(this).classed('disabled')) return;
-            if (!context.inIntro()) {
-                presetManager.setMostRecent(preset, entityGeometries()[0]);
+            if (!context.inIntro) {
+                presetSystem.setMostRecent(preset);
             }
             context.perform(
                 function(graph) {
                     for (var i in _entityIDs) {
                         var entityID = _entityIDs[i];
-                        var oldPreset = presetManager.match(graph.entity(entityID), graph);
+                        var oldPreset = presetSystem.match(graph.entity(entityID), graph);
                         graph = actionChangePreset(entityID, oldPreset, preset)(graph);
                     }
                     return graph;
                 },
-                t('operations.change_tags.annotation')
+                l10n.t('operations.change_tags.annotation')
             );
 
-            context.validator().validate();  // rerun validation
+            context.validationSystem().validate();  // rerun validation
             dispatch.call('choose', this, preset);
         };
 
@@ -429,7 +434,7 @@ export function uiPresetList(context) {
         };
 
         item.preset = preset;
-        item.reference = uiTagReference(preset.reference(), context);
+        item.reference = uiTagReference(context, preset.reference());
 
         return item;
     }
@@ -442,15 +447,15 @@ export function uiPresetList(context) {
         var button = context.container().selectAll('.preset-list .preset-list-button');
 
         // remove existing tooltips
-        button.call(uiTooltip().destroyAny);
+        button.call(uiTooltip(context).destroyAny);
 
         button.each(function(item, index) {
-            var hiddenPresetFeaturesId;
+            let hiddenPresetFeaturesId;
             for (var i in geometries) {
-                hiddenPresetFeaturesId = context.features().isHiddenPreset(item.preset, geometries[i]);
+                hiddenPresetFeaturesId = filterSystem.isHiddenPreset(item.preset, geometries[i]);
                 if (hiddenPresetFeaturesId) break;
             }
-            var isHiddenPreset = !context.inIntro() &&
+            var isHiddenPreset = !context.inIntro &&
                 !!hiddenPresetFeaturesId &&
                 (_currentPresets.length !== 1 || item.preset !== _currentPresets[0]);
 
@@ -458,10 +463,9 @@ export function uiPresetList(context) {
                 .classed('disabled', isHiddenPreset);
 
             if (isHiddenPreset) {
-                var isAutoHidden = context.features().autoHidden(hiddenPresetFeaturesId);
-                d3_select(this).call(uiTooltip()
-                    .title(t.html('inspector.hidden_preset.' + (isAutoHidden ? 'zoom' : 'manual'), {
-                        features: t.html('feature.' + hiddenPresetFeaturesId + '.description')
+                d3_select(this).call(uiTooltip(context)
+                    .title(l10n.tHtml('inspector.hidden_preset.manual', {
+                        features: l10n.tHtml('feature.' + hiddenPresetFeaturesId + '.description')
                     }))
                     .placement(index < 2 ? 'bottom' : 'top')
                 );
@@ -487,7 +491,7 @@ export function uiPresetList(context) {
 
             // match presets
             var presets = _entityIDs.map(function(entityID) {
-                return presetManager.match(context.entity(entityID), context.graph());
+                return presetSystem.match(context.entity(entityID), context.graph());
             });
             presetList.presets(presets);
         }
@@ -502,7 +506,6 @@ export function uiPresetList(context) {
     };
 
     function entityGeometries() {
-
         var counts = {};
 
         for (var i in _entityIDs) {
diff --git a/modules/ui/rapid_colorpicker.js b/modules/ui/rapid_colorpicker.js
index f11fdfc591..f5ceee890f 100644
--- a/modules/ui/rapid_colorpicker.js
+++ b/modules/ui/rapid_colorpicker.js
@@ -1,13 +1,11 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { localizer } from '../core/localizer';
 import { uiIcon } from './icon';
 import { utilKeybinding, utilRebind } from '../util';
 
 
 export function uiRapidColorpicker(context, parentModal) {
-  const rapidContext = context.rapidContext();
   const dispatch = d3_dispatch('change', 'done');
 
   let _close = () => {};
@@ -74,15 +72,14 @@ export function uiRapidColorpicker(context, parentModal) {
 
 
   function renderPopup(selection, forNode) {
+    const isRTL = context.localizationSystem().isRTL();
     const dataset = forNode.__data__;
     const rect = forNode.getBoundingClientRect();
     const popWidth = 180;
     const popTop = rect.bottom + 15;
-    const popLeft = localizer.textDirection() === 'rtl'
-      ? rect.right - (0.3333 * popWidth)
+    const popLeft = isRTL ? rect.right - (0.3333 * popWidth)
       : rect.left - (0.6666 * popWidth);
-    const arrowLeft = localizer.textDirection() === 'rtl'
-      ? (0.3333 * popWidth) - rect.width + 10
+    const arrowLeft = isRTL ? (0.3333 * popWidth) - rect.width + 10
       : (0.6666 * popWidth) + 10;
 
     const origClose = parentModal.close;
@@ -136,7 +133,7 @@ export function uiRapidColorpicker(context, parentModal) {
       .merge(colorlist);
 
     let colorItems = colorlist.selectAll('.colorpicker-option')
-      .data(rapidContext.colors());
+      .data(context.rapidSystem().colors);
 
     // enter
     let colorItemsEnter = colorItems.enter()
diff --git a/modules/ui/rapid_feature_inspector.js b/modules/ui/rapid_feature_inspector.js
index 391968f0a9..90aac69c53 100644
--- a/modules/ui/rapid_feature_inspector.js
+++ b/modules/ui/rapid_feature_inspector.js
@@ -1,9 +1,6 @@
 import { select as d3_select } from 'd3-selection';
-import { t } from '../core/localizer';
 
 import { actionNoop, actionRapidAcceptFeature } from '../actions';
-import { modeSelect } from '../modes';
-import { services } from '../services';
 import { uiIcon } from './icon';
 import { uiFlash } from './flash';
 import { uiTooltip } from './tooltip';
@@ -11,8 +8,8 @@ import { uiRapidFirstEditDialog } from './rapid_first_edit_dialog';
 
 
 export function uiRapidFeatureInspector(context, keybinding) {
-  const rapidContext = context.rapidContext();
-  const showPowerUser = rapidContext.showPowerUser;
+  const rapid = context.rapidSystem();
+  const showPowerUser = rapid.showPowerUser;
   const ACCEPT_FEATURES_LIMIT = showPowerUser ? Infinity : 50;
   let _datum;
 
@@ -22,7 +19,7 @@ export function uiRapidFeatureInspector(context, keybinding) {
     const gpxInUrl = context.initialHashParams.hasOwnProperty('gpx');
     if (gpxInUrl) return false;
 
-    const annotations = context.history().peekAllAnnotations();
+    const annotations = context.editSystem().peekAllAnnotations();
     const aiFeatureAccepts = annotations.filter(a => a.type === 'rapid_accept_feature');
     return aiFeatureAccepts.length >= ACCEPT_FEATURES_LIMIT;
   }
@@ -34,7 +31,7 @@ export function uiRapidFeatureInspector(context, keybinding) {
     if (isAddFeatureDisabled()) {
       const flash = uiFlash(context)
         .duration(5000)
-        .label(t(
+        .label(context.t(
           'rapid_feature_inspector.option_accept.disabled_flash',
           { n: ACCEPT_FEATURES_LIMIT }
         ));
@@ -45,34 +42,34 @@ export function uiRapidFeatureInspector(context, keybinding) {
     // In place of a string annotation, this introduces an "object-style"
     // annotation, where "type" and "description" are standard keys,
     // and there may be additional properties. Note that this will be
-    // serialized to JSON while saving undo/redo state in history.save().
+    // serialized to JSON while saving undo/redo state in editSystem.save().
     let annotation = {
       type: 'rapid_accept_feature',
-      description: t('rapid_feature_inspector.option_accept.annotation'),
+      description: context.t('rapid_feature_inspector.option_accept.annotation'),
       id: _datum.id,
       origid: _datum.__origid__
     };
 
-    const service = _datum.__service__ === 'esri' ? services.esriData : services.fbMLRoads;
+    const service = context.services.get(_datum.__service__);
     const graph = service.graph(_datum.__datasetid__);
     const sourceTag = _datum.tags && _datum.tags.source;
     if (sourceTag) annotation.source = sourceTag;
 
     context.perform(actionRapidAcceptFeature(_datum.id, graph), annotation);
-    context.enter(modeSelect(context, [_datum.id]));
+    context.enter('select-osm', { selectedIDs: [_datum.id] });
 
-    if (context.inIntro()) return;
+    if (context.inIntro) return;
 
     // remember sources for later when we prepare the changeset
-    rapidContext.sources.add('mapwithai');    // always add 'mapwithai'
+    rapid.sources.add('mapwithai');    // always add 'mapwithai'
     if (sourceTag && /^esri/.test(sourceTag)) {
-      rapidContext.sources.add('esri');       // add 'esri' for esri sources
+      rapid.sources.add('esri');       // add 'esri' for esri sources
     }
 
     if (window.sessionStorage.getItem('acknowledgedLogin') === 'true') return;
     window.sessionStorage.setItem('acknowledgedLogin', 'true');
 
-    const osm = context.connection();
+    const osm = context.services.get('osm');
     if (!osm.authenticated()) {
       context.container()
         .call(uiRapidFirstEditDialog(context));
@@ -85,7 +82,7 @@ export function uiRapidFeatureInspector(context, keybinding) {
 
     const annotation = {
       type: 'rapid_ignore_feature',
-      description: t('rapid_feature_inspector.option_ignore.annotation'),
+      description: context.t('rapid_feature_inspector.option_ignore.annotation'),
       id: _datum.id,
       origid: _datum.__origid__
     };
@@ -110,7 +107,7 @@ export function uiRapidFeatureInspector(context, keybinding) {
     if (!_datum) return;
 
     const datasetID = _datum.__datasetid__.replace('-conflated', '');
-    const dataset = rapidContext.datasets()[datasetID];
+    const dataset = rapid.datasets.get(datasetID);
     const color = dataset.color;
 
     let featureInfo = selection.selectAll('.feature-info')
@@ -131,7 +128,7 @@ export function uiRapidFeatureInspector(context, keybinding) {
       featureInfoEnter
         .append('div')
         .attr('class', 'dataset-beta beta')
-        .attr('title', t('rapid_poweruser_features.beta'));
+        .attr('title', context.t('rapid_poweruser_features.beta'));
     }
 
     // update
@@ -159,7 +156,7 @@ export function uiRapidFeatureInspector(context, keybinding) {
     tagBagEnter
       .append('div')
       .attr('class', 'tag-heading')
-      .text(t('rapid_feature_inspector.tags'));
+      .text(context.t('rapid_feature_inspector.tags'));
 
     const tagEntries = Object.keys(tags).map(k => ({ key: k, value: tags[k] }) );
 
@@ -230,14 +227,14 @@ export function uiRapidFeatureInspector(context, keybinding) {
       {
         key: 'accept',
         iconName: '#rapid-icon-rapid-plus-circle',
-        label: t('rapid_feature_inspector.option_accept.label'),
-        description: t('rapid_feature_inspector.option_accept.description'),
+        label: context.t('rapid_feature_inspector.option_accept.label'),
+        description: context.t('rapid_feature_inspector.option_accept.description'),
         onClick: onAcceptFeature
       }, {
         key: 'ignore',
         iconName: '#rapid-icon-rapid-minus-circle',
-        label: t('rapid_feature_inspector.option_ignore.label'),
-        description: t('rapid_feature_inspector.option_ignore.description'),
+        label: context.t('rapid_feature_inspector.option_ignore.label'),
+        description: context.t('rapid_feature_inspector.option_ignore.description'),
         onClick: onIgnoreFeature
       }
     ];
@@ -252,7 +249,7 @@ export function uiRapidFeatureInspector(context, keybinding) {
 
     choicesEnter
       .append('p')
-      .text(t('rapid_feature_inspector.prompt'));
+      .text(context.t('rapid_feature_inspector.prompt'));
 
     choicesEnter.selectAll('.rapid-inspector-choice')
       .data(choiceData, d => d.key)
@@ -288,20 +285,20 @@ export function uiRapidFeatureInspector(context, keybinding) {
     let title, keys;
     if (d.key === 'accept') {
       if (isAddFeatureDisabled()) {
-        title = t('rapid_feature_inspector.option_accept.disabled', { n: ACCEPT_FEATURES_LIMIT } );
+        title = context.t('rapid_feature_inspector.option_accept.disabled', { n: ACCEPT_FEATURES_LIMIT } );
         keys = [];
       } else {
-        title = t('rapid_feature_inspector.option_accept.tooltip');
-        keys = [t('rapid_feature_inspector.option_accept.key')];
+        title = context.t('rapid_feature_inspector.option_accept.tooltip');
+        keys = [context.t('rapid_feature_inspector.option_accept.key')];
       }
     } else if (d.key === 'ignore') {
-      title = t('rapid_feature_inspector.option_ignore.tooltip');
-      keys = [t('rapid_feature_inspector.option_ignore.key')];
+      title = context.t('rapid_feature_inspector.option_ignore.tooltip');
+      keys = [context.t('rapid_feature_inspector.option_ignore.key')];
     }
 
     if (title && keys) {
       choiceButton = choiceButton
-        .call(uiTooltip().placement('bottom').title(title).keys(keys));
+        .call(uiTooltip(context).placement('bottom').title(title).keys(keys));
     }
 
     choiceButton
@@ -335,8 +332,8 @@ export function uiRapidFeatureInspector(context, keybinding) {
 
   if (keybinding) {
     keybinding()
-      .on(t('rapid_feature_inspector.option_accept.key'), onAcceptFeature)
-      .on(t('rapid_feature_inspector.option_ignore.key'), onIgnoreFeature);
+      .on(context.t('rapid_feature_inspector.option_accept.key'), onAcceptFeature)
+      .on(context.t('rapid_feature_inspector.option_ignore.key'), onIgnoreFeature);
   }
 
   return rapidInspector;
diff --git a/modules/ui/rapid_feature_toggle_dialog.js b/modules/ui/rapid_feature_toggle_dialog.js
index 7fe3884c82..082666815b 100644
--- a/modules/ui/rapid_feature_toggle_dialog.js
+++ b/modules/ui/rapid_feature_toggle_dialog.js
@@ -1,8 +1,6 @@
 import { select as d3_select } from 'd3-selection';
 import { marked } from 'marked';
 
-import { t, localizer } from '../core/localizer';
-import { prefs } from '../core/preferences';
 import { icon } from './intro/helper';
 import { uiIcon } from './icon';
 import { uiModal } from './modal';
@@ -11,7 +9,8 @@ import { uiRapidViewManageDatasets } from './rapid_view_manage_datasets';
 
 
 export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureToggleKeyDispatcher) {
-  const rapidContext = context.rapidContext();
+  const l10n = context.localizationSystem();
+  const rapid = context.rapidSystem();
   let _modalSelection = d3_select(null);
   let _content = d3_select(null);
   let _viewManageModal;
@@ -19,19 +18,18 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
 
 
   function datasetEnabled(d) {
-    const dataset = rapidContext.datasets()[d.id];
-    return dataset && dataset.enabled;
+    const dataset = rapid.datasets.get(d.id);
+    return dataset?.enabled;
   }
 
   function toggleDataset(event, d) {
-    let datasets = rapidContext.datasets();
-    let dataset = datasets[d.id];
+    const dataset = rapid.datasets.get(d.id);
     if (dataset) {
       dataset.enabled = !dataset.enabled;
 
       // update url hash
-      const urlhash = context.urlhash();
-      const datasetIDs = Object.values(datasets)
+      const urlhash = context.urlHashSystem();
+      const datasetIDs = [...rapid.datasets.values()]
         .filter(ds => ds.added && ds.enabled)
         .map(ds => ds.id)
         .join(',');
@@ -43,18 +41,17 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
   }
 
   function changeColor(datasetID, color) {
-    let datasets = rapidContext.datasets();
-    let dataset = datasets[datasetID];
+    const dataset = rapid.datasets.get(datasetID);
     if (dataset) {
       dataset.color = color;
 
       context.scene().dirtyLayers('rapid');
-      context.map().immediateRedraw();
+      context.mapSystem().immediateRedraw();
       _content.call(renderModalContent);
 
       // If a Rapid feature is already selected, reselect it to update sidebar too
       const mode = context.mode();
-      if (mode.id === 'select' && mode.selectedData) {  // new (not legacy) select mode
+      if (mode.id === 'select') {  // new (not legacy) select mode
         const selection = new Map(mode.selectedData);
         context.enter('select', { selection: selection });
       }
@@ -68,7 +65,7 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
 
 
   function keyPressHandler(d3_event) {
-    if (d3_event.shiftKey && d3_event.key === t('map_data.layers.ai-features.key')) {
+    if (d3_event.shiftKey && d3_event.key === l10n.t('map_data.layers.ai-features.key')) {
       toggleRapid();
     }
   }
@@ -124,7 +121,7 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
     toggleAllTextEnter
       .append('div')
       .attr('class', 'rapid-feature-label')
-      .html(t('rapid_feature_toggle.toggle_all', { rapidicon: icon('#rapid-logo-rapid-wordmark', 'logo-rapid') }));
+      .html(l10n.t('rapid_feature_toggle.toggle_all', { rapidicon: icon('#rapid-logo-rapid-wordmark', 'logo-rapid') }));
 
     toggleAllTextEnter
       .append('span')
@@ -181,14 +178,14 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
       .attr('class', 'rapid-feature-label-container')
       .append('div')
       .attr('class', 'rapid-feature-label')
-      .text(t('rapid_feature_toggle.view_manage_datasets'));
+      .text(l10n.t('rapid_feature_toggle.view_manage_datasets'));
 
     manageDatasetsEnter
       .append('div')
       .attr('class', 'rapid-checkbox-inputs')
       .append('div')
       .attr('class', 'rapid-checkbox-label')
-      .call(uiIcon(localizer.textDirection() === 'rtl' ? '#rapid-icon-backward' : '#rapid-icon-forward', 'icon-30'));
+      .call(uiIcon(l10n.isRTL() ? '#rapid-icon-backward' : '#rapid-icon-forward', 'icon-30'));
 
 
     /* OK Button */
@@ -202,13 +199,14 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
       .append('button')
       .attr('class', 'button ok-button action')
       .on('click', () => _modalSelection.remove())
-      .text(t('confirm.okay'));
+      .text(l10n.t('confirm.okay'));
   }
 
 
   function renderDatasets(selection) {
-    const showPreview = prefs('rapid-internal-feature.previewDatasets') === 'true';
-    const datasets = Object.values(rapidContext.datasets())
+    const prefs = context.storageSystem();
+    const showPreview = prefs.getItem('rapid-internal-feature.previewDatasets') === 'true';
+    const datasets = [...rapid.datasets.values()]
       .filter(d => d.added && (showPreview || !d.beta));    // exclude preview datasets unless user has opted into them
     const rapidLayer = context.scene().layers.get('rapid');
     if (!rapidLayer) return;
@@ -245,7 +243,7 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
           labelEnter
             .append('div')
             .attr('class', 'rapid-feature-label-beta beta')
-            .attr('title', t('rapid_poweruser_features.beta'));
+            .attr('title', l10n.t('rapid_poweruser_features.beta'));
         }
 
         if (d.description) {
@@ -285,14 +283,14 @@ export function uiRapidFeatureToggleDialog(context, AIFeatureToggleKey, featureT
               selection
                 .append('a')
                 .attr('href', '#')
-                .text(t('rapid_feature_toggle.center_map'))
+                .text(l10n.t('rapid_feature_toggle.center_map'))
                 .on('click', (d3_event) => {
                   d3_event.preventDefault();
-                  context.map().extent(d.extent);
+                  context.mapSystem().extent(d.extent);
                 });
             } else {
               selection
-                .text(t('rapid_feature_toggle.worldwide'));
+                .text(l10n.t('rapid_feature_toggle.worldwide'));
             }
           });
       });
diff --git a/modules/ui/rapid_first_edit_dialog.js b/modules/ui/rapid_first_edit_dialog.js
index 6c18d9ab8c..688b94816e 100644
--- a/modules/ui/rapid_first_edit_dialog.js
+++ b/modules/ui/rapid_first_edit_dialog.js
@@ -1,4 +1,3 @@
-import { t } from '../core/localizer';
 import { icon } from './intro/helper';
 import { uiModal } from './modal';
 import { uiRapidSplash } from './rapid_splash';
@@ -18,13 +17,13 @@ export function uiRapidFirstEditDialog(context) {
       .append('div')
       .attr('class', 'modal-section')
       .append('h3')
-      .html(t('rapid_first_edit.nice', { rapidicon: icon('#rapid-logo-rapid-wordmark', 'logo-rapid') }));
+      .html(context.t('rapid_first_edit.nice', { rapidicon: icon('#rapid-logo-rapid-wordmark', 'logo-rapid') }));
 
     firstEditModal
       .append('div')
       .attr('class', 'modal-section')
       .append('p')
-      .text(t('rapid_first_edit.text'));
+      .text(context.t('rapid_first_edit.text'));
 
     let buttonWrap = firstEditModal
       .append('div')
@@ -39,21 +38,21 @@ export function uiRapidFirstEditDialog(context) {
 
     exploring
       .append('div')
-      .text(t('rapid_first_edit.exploring'));
+      .text(context.t('rapid_first_edit.exploring'));
 
     let loginToOsm = buttonWrap
       .append('button')
       .attr('class', 'rapid-login-to-osm')
       .on('click', () => {
         modalSelection.close();
-        const osm = context.connection();
+        const osm = context.services.get('osm');
         if (!osm) return;
         osm.authenticate(() => context.container().call(uiRapidSplash(context)) );
       });
 
     loginToOsm
       .append('div')
-      .text(t('rapid_first_edit.login_with_osm'));
+      .text(context.t('rapid_first_edit.login_with_osm'));
 
     modalSelection.select('button.close')
       .attr('class', 'hide');
diff --git a/modules/ui/rapid_poweruser_features_dialog.js b/modules/ui/rapid_poweruser_features_dialog.js
index f951b7eb49..c8379babf3 100644
--- a/modules/ui/rapid_poweruser_features_dialog.js
+++ b/modules/ui/rapid_poweruser_features_dialog.js
@@ -1,59 +1,57 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../core/localizer';
-import { prefs } from '../core/preferences';
 import { uiModal } from './modal';
 
 
 export function uiRapidPowerUserFeaturesDialog(context) {
+  const prefs = context.storageSystem();
   const featureFlags = [
     'previewDatasets', 'tagnosticRoadCombine', 'tagSources', 'showAutoFix', 'allowLargeEdits'
   ];
-  const rapidContext = context.rapidContext();
-  const showPowerUser = rapidContext.showPowerUser;
+  const rapid = context.rapidSystem();
+  const showPowerUser = rapid.showPowerUser;
   let _modalSelection = d3_select(null);
   let _content = d3_select(null);
 
   // if we are not currently showing poweruser features, move all the feature flags to a different keyspace
   if (!showPowerUser) {
     featureFlags.forEach(featureFlag => {
-      const val = prefs(`rapid-internal-feature.${featureFlag}`);
+      const val = prefs.getItem(`rapid-internal-feature.${featureFlag}`);
       if (val) {
-        prefs(`rapid-internal-feature.was.${featureFlag}`, val);
-        prefs(`rapid-internal-feature.${featureFlag}`, null);
+        prefs.setItem(`rapid-internal-feature.was.${featureFlag}`, val);
+        prefs.removeItem(`rapid-internal-feature.${featureFlag}`);
       }
     });
   } else {
     featureFlags.forEach(featureFlag => {
-      const val = prefs(`rapid-internal-feature.was.${featureFlag}`);
+      const val = prefs.getItem(`rapid-internal-feature.was.${featureFlag}`);
       if (val) {
-        prefs(`rapid-internal-feature.${featureFlag}`, val);
-        prefs(`rapid-internal-feature.was.${featureFlag}`, null);
+        prefs.setItem(`rapid-internal-feature.${featureFlag}`, val);
+        prefs.removeItem(`rapid-internal-feature.was.${featureFlag}`);
       }
     });
   }
 
 
   function isEnabled(featureFlag) {
-    return prefs(`rapid-internal-feature.${featureFlag}`) === 'true';
+    return prefs.getItem(`rapid-internal-feature.${featureFlag}`) === 'true';
   }
 
   function toggleFeature(_, featureFlag) {
-    let enabled = prefs(`rapid-internal-feature.${featureFlag}`) === 'true';
+    let enabled = prefs.getItem(`rapid-internal-feature.${featureFlag}`) === 'true';
     enabled = !enabled;
-    prefs(`rapid-internal-feature.${featureFlag}`, enabled);
+    prefs.setItem(`rapid-internal-feature.${featureFlag}`, enabled);
 
     // custom on-toggle behaviors can go here
-    if (featureFlag === 'previewDatasets' && !enabled) {   // user unchecked previewDatasets feature
-      const datasets = rapidContext.datasets();
-      Object.values(datasets).forEach(ds => {
-        if (ds.beta) {
-          ds.added = false;
-          ds.enabled = false;
+    if (featureFlag === 'previewDatasets' && !enabled) {   // if user unchecked previewDatasets feature
+      for (const dataset of rapid.datasets.values()) {
+        if (dataset.beta) {
+          dataset.added = false;
+          dataset.enabled = false;
         }
-      });
+      }
       context.enter('browse');   // return to browse mode (in case something was selected)
-      context.map().immediateRedraw();
+      context.mapSystem().immediateRedraw();
     }
   }
 
@@ -88,12 +86,12 @@ export function uiRapidPowerUserFeaturesDialog(context) {
     headerEnter
       .append('h3')
       .attr('class', 'modal-heading')
-      .html(t('rapid_poweruser_features.heading.label'));
+      .html(context.t('rapid_poweruser_features.heading.label'));
 
     headerEnter
       .append('div')
       .attr('class', 'modal-heading-desc')
-      .text(t('rapid_poweruser_features.heading.description'))
+      .text(context.t('rapid_poweruser_features.heading.description'))
       .append('span')
       .attr('class', 'smile')
       .text('😎');
@@ -123,7 +121,7 @@ export function uiRapidPowerUserFeaturesDialog(context) {
       .append('button')
       .attr('class', 'button ok-button action')
       .on('click', () => _modalSelection.remove())
-      .text(t('confirm.okay'));
+      .text(context.t('confirm.okay'));
   }
 
 
@@ -146,13 +144,13 @@ export function uiRapidPowerUserFeaturesDialog(context) {
         selection
           .append('div')
           .attr('class', 'rapid-feature-label')
-          .text(d => t(`rapid_poweruser_features.${d}.label`));
+          .text(d => context.t(`rapid_poweruser_features.${d}.label`));
 
         // line2: description
         selection
           .append('div')
           .attr('class', 'rapid-feature-description')
-          .text(d => t(`rapid_poweruser_features.${d}.description`));
+          .text(d => context.t(`rapid_poweruser_features.${d}.description`));
       });
 
     let inputsEnter = rowsEnter
diff --git a/modules/ui/rapid_service_license.js b/modules/ui/rapid_service_license.js
index f2a052386e..5a4f2179aa 100644
--- a/modules/ui/rapid_service_license.js
+++ b/modules/ui/rapid_service_license.js
@@ -1,11 +1,9 @@
-import { t } from '../core/localizer';
 
-
-export function uiRapidServiceLicense() {
+export function uiRapidServiceLicense(context) {
   return function(selection) {
     selection.append('a')
       .attr('href', 'https://mapwith.ai/doc/license/MapWithAILicense.pdf')
       .attr('target', '_blank')
-      .text(t('rapid_feature_license'));
+      .text(context.t('rapid_feature_license'));
   };
 }
diff --git a/modules/ui/rapid_splash.js b/modules/ui/rapid_splash.js
index 620302e524..a7ec372217 100644
--- a/modules/ui/rapid_splash.js
+++ b/modules/ui/rapid_splash.js
@@ -1,15 +1,14 @@
-import { t } from '../core/localizer';
-import { uiIntro } from './intro';
+import { uiIntro } from './intro/intro';
 import { icon } from './intro/helper';
 import { uiModal } from './modal';
-import { prefs } from '../core/preferences';
 
 
 export function uiRapidSplash(context) {
 
-  return function(selection) {
-    if (prefs('sawRapidSplash')) return;
-    prefs('sawRapidSplash', true);
+  return function render(selection) {
+    const prefs = context.storageSystem();
+    if (prefs.getItem('sawRapidSplash')) return;
+    prefs.setItem('sawRapidSplash', true);
 
     const modalSelection = uiModal(selection);
 
@@ -21,13 +20,13 @@ export function uiRapidSplash(context) {
     introModal
       .append('div')
       .attr('class','modal-section')
-      .append('h3').text(t('rapid_splash.welcome'));
+      .append('h3').text(context.t('rapid_splash.welcome'));
 
     introModal
       .append('div')
       .attr('class','modal-section')
       .append('p')
-      .html(t('rapid_splash.text', {
+      .html(context.t('rapid_splash.text', {
         rapidicon: icon('#rapid-logo-rapid-wordmark', 'logo-rapid'),
         walkthrough: icon('#rapid-logo-walkthrough', 'logo-walkthrough'),
         edit: icon('#rapid-logo-features', 'logo-features')
@@ -53,7 +52,7 @@ export function uiRapidSplash(context) {
 
     walkthrough
       .append('div')
-      .text(t('rapid_splash.walkthrough'));
+      .text(context.t('rapid_splash.walkthrough'));
 
     let rapidWalkthrough = buttonWrap
       .append('button')
@@ -71,7 +70,7 @@ export function uiRapidSplash(context) {
 
     rapidWalkthrough
       .append('div')
-      .text(t('rapid_splash.skip_to_rapid'));
+      .text(context.t('rapid_splash.skip_to_rapid'));
 
     let startEditing = buttonWrap
       .append('button')
@@ -88,7 +87,7 @@ export function uiRapidSplash(context) {
 
     startEditing
       .append('div')
-      .text(t('rapid_splash.start'));
+      .text(context.t('rapid_splash.start'));
 
     modalSelection.select('button.close')
       .attr('class', 'hide');
diff --git a/modules/ui/rapid_view_manage_datasets.js b/modules/ui/rapid_view_manage_datasets.js
index 71c1d51b65..da001de79d 100644
--- a/modules/ui/rapid_view_manage_datasets.js
+++ b/modules/ui/rapid_view_manage_datasets.js
@@ -3,16 +3,13 @@ import { select as d3_select } from 'd3-selection';
 import { Extent } from '@rapid-sdk/math';
 import { marked } from 'marked';
 
-import { t } from '../core/localizer';
-import { prefs } from '../core/preferences';
-import { services } from '../services';
 import { uiIcon } from './icon';
 import { uiCombobox} from './combobox';
 import { utilKeybinding, utilNoAuto, utilRebind } from '../util';
 
 
 export function uiRapidViewManageDatasets(context, parentModal) {
-  const rapidContext = context.rapidContext();
+  const rapid = context.rapidSystem();
   const dispatch = d3_dispatch('done');
   const categoryCombo = uiCombobox(context, 'dataset-categories');
   const MAXRESULTS = 100;
@@ -108,7 +105,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
     line1
       .append('div')
       .attr('class', 'rapid-view-manage-header-text')
-      .text(t('rapid_feature_toggle.esri.title'));
+      .text(context.t('rapid_feature_toggle.esri.title'));
 
     let line2 = headerEnter
       .append('div');
@@ -116,7 +113,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
     line2
       .append('div')
       .attr('class', 'rapid-view-manage-header-about')
-      .html(marked.parse(t('rapid_feature_toggle.esri.about')));
+      .html(marked.parse(context.t('rapid_feature_toggle.esri.about')));
 
     line2.selectAll('a')
       .attr('target', '_blank');
@@ -140,7 +137,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
     filterSearchEnter
       .append('input')
       .attr('class', 'rapid-view-manage-filter-search')
-      .attr('placeholder', t('rapid_feature_toggle.esri.filter_datasets'))
+      .attr('placeholder', context.t('rapid_feature_toggle.esri.filter_datasets'))
       .call(utilNoAuto)
       .on('input', d3_event => {
         const element = d3_event.currentTarget;
@@ -157,7 +154,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
     filterTypeEnter
       .append('input')
       .attr('class', 'rapid-view-manage-filter-type')
-      .attr('placeholder', t('rapid_feature_toggle.esri.any_type'))
+      .attr('placeholder', context.t('rapid_feature_toggle.esri.any_type'))
       .call(utilNoAuto)
       .call(categoryCombo)
       .on('blur change', d3_event => {
@@ -178,7 +175,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
       .attr('class', 'rapid-view-manage-filter-clear')
       .append('a')
       .attr('href', '#')
-      .text(t('rapid_feature_toggle.esri.clear_filters'))
+      .text(context.t('rapid_feature_toggle.esri.clear_filters'))
       .on('click', d3_event => {
         d3_event.preventDefault();
         const element = d3_event.currentTarget;
@@ -228,7 +225,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
       .append('button')
       .attr('class', 'button ok-button action')
       .on('click', _myClose)
-      .text(t('confirm.okay'));
+      .text(context.t('confirm.okay'));
   }
 
 
@@ -236,19 +233,20 @@ export function uiRapidViewManageDatasets(context, parentModal) {
     const status = selection.selectAll('.rapid-view-manage-datasets-status');
     const results = selection.selectAll('.rapid-view-manage-datasets');
 
-    const showPreview = prefs('rapid-internal-feature.previewDatasets') === 'true';
-    const service = services.esriData;
+    const prefs = context.storageSystem();
+    const showPreview = prefs.getItem('rapid-internal-feature.previewDatasets') === 'true';
+    const service = context.services.get('esri');
 
     if (!service || (Array.isArray(_datasetInfo) && !_datasetInfo.length)) {
       results.classed('hide', true);
-      status.classed('hide', false).text(t('rapid_feature_toggle.esri.no_datasets'));
+      status.classed('hide', false).text(context.t('rapid_feature_toggle.esri.no_datasets'));
       return;
     }
 
     if (!_datasetInfo) {
       results.classed('hide', true);
       status.classed('hide', false)
-        .text(t('rapid_feature_toggle.esri.fetching_datasets'));
+        .text(context.t('rapid_feature_toggle.esri.fetching_datasets'));
 
       status
         .append('br');
@@ -258,7 +256,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
         .attr('class', 'rapid-view-manage-datasets-spinner')
         .attr('src', context.asset('img/loader-black.gif'));
 
-      service.loadDatasets()
+      service.loadDatasetsAsync()
         .then(results => {
           // Build set of available categories
           let categories = new Set();
@@ -342,7 +340,7 @@ export function uiRapidViewManageDatasets(context, parentModal) {
       .attr('class', 'rapid-view-manage-dataset-link')
       .attr('target', '_blank')
       .attr('href', d => d.itemURL)
-      .text(t('rapid_feature_toggle.esri.more_info'))
+      .text(context.t('rapid_feature_toggle.esri.more_info'))
       .call(uiIcon('#rapid-icon-out-link', 'inline'));
 
     let featuredEnter = labelsEnter.selectAll('.rapid-view-manage-dataset-featured')
@@ -357,14 +355,14 @@ export function uiRapidViewManageDatasets(context, parentModal) {
 
     featuredEnter
       .append('span')
-      .text(t('rapid_feature_toggle.esri.featured'));
+      .text(context.t('rapid_feature_toggle.esri.featured'));
 
     labelsEnter.selectAll('.rapid-view-manage-dataset-beta')
       .data(d => d.groupCategories.filter(d => d.toLowerCase() === '/categories/preview'))
       .enter()
       .append('div')
       .attr('class', 'rapid-view-manage-dataset-beta beta')
-      .attr('title', t('rapid_poweruser_features.beta'));
+      .attr('title', context.t('rapid_poweruser_features.beta'));
 
     labelsEnter
       .append('div')
@@ -398,12 +396,12 @@ export function uiRapidViewManageDatasets(context, parentModal) {
 
     datasets.selectAll('.rapid-view-manage-dataset-action')
       .classed('secondary', d => datasetAdded(d))
-      .text(d => datasetAdded(d) ? t('rapid_feature_toggle.esri.remove') : t('rapid_feature_toggle.esri.add_to_map'));
+      .text(d => datasetAdded(d) ? context.t('rapid_feature_toggle.esri.remove') : context.t('rapid_feature_toggle.esri.add_to_map'));
 
     const numShown = _datasetInfo.filter(d => !d.filtered).length;
     const gt = (count > MAXRESULTS && numShown === MAXRESULTS) ? '>' : '';
     _content.selectAll('.rapid-view-manage-filter-results')
-      .text(t('rapid_feature_toggle.esri.datasets_found', { num: `${gt}${numShown}` }));
+      .text(context.t('rapid_feature_toggle.esri.datasets_found', { num: `${gt}${numShown}` }));
   }
 
 
@@ -426,24 +424,24 @@ export function uiRapidViewManageDatasets(context, parentModal) {
 
 
   function toggleDataset(d3_event, d) {
-    const datasets = rapidContext.datasets();
-    const ds = datasets[d.id];
+    const datasets = rapid.datasets;
+    const ds = datasets.get(d.id);
 
     if (ds) {
       ds.added = !ds.added;
 
     } else {  // hasn't been added yet
-      const service = services.esriData;
-      if (service) {   // start fetching layer info (the mapping between attributes and tags)
-        service.loadLayer(d.id);
+      const esri = context.services.get('esri');
+      if (esri) {   // start fetching layer info (the mapping between attributes and tags)
+        esri.loadLayerAsync(d.id);
       }
 
       const isBeta = d.groupCategories.some(cat => cat.toLowerCase() === '/categories/preview');
       const isBuildings = d.groupCategories.some(cat => cat.toLowerCase() === '/categories/buildings');
 
       // pick a new color
-      const colors = rapidContext.colors();
-      const colorIndex = Object.keys(datasets).length % colors.length;
+      const colors = rapid.colors;
+      const colorIndex = datasets.size % colors.length;
 
       let dataset = {
         id: d.id,
@@ -454,46 +452,46 @@ export function uiRapidViewManageDatasets(context, parentModal) {
         service: 'esri',
         color: colors[colorIndex],
         label: d.title,
-        license_markdown: t('rapid_feature_toggle.esri.license_markdown')
+        license_markdown: context.t('rapid_feature_toggle.esri.license_markdown')
       };
 
       if (d.extent) {
         dataset.extent = new Extent(d.extent[0], d.extent[1]);
       }
 
-      // Test running building layers through FBML conflation service
+      // Test running building layers through MapWithAI conflation service
       if (isBuildings) {
-       dataset.conflated = true;
-       dataset.service = 'fbml';
+        dataset.conflated = true;
+        dataset.service = 'mapwithai';
 
         // and disable the Microsoft buildings to avoid clutter
-        if (datasets.msBuildings) {
-          datasets.msBuildings.enabled = false;
+        const msBuildings = datasets.get('msBuildings');
+        if (msBuildings) {
+          msBuildings.enabled = false;
         }
       }
 
-      datasets[d.id] = dataset;
+      datasets.set(d.id, dataset);
     }
 
     // update url hash
-    const urlhash = context.urlhash();
-    const datasetIDs = Object.values(datasets)
+    const urlhash = context.urlHashSystem();
+    const datasetIDs = [...rapid.datasets.values()]
       .filter(ds => ds.added && ds.enabled)
       .map(ds => ds.id)
       .join(',');
     urlhash.setParam('datasets', datasetIDs.length ? datasetIDs : null);
 
-
     _content.call(renderModalContent);
 
     context.enter('browse');   // return to browse mode (in case something was selected)
-    context.map().immediateRedraw();
+    context.mapSystem().immediateRedraw();
   }
 
 
   function datasetAdded(d) {
-    const datasets = rapidContext.datasets();
-    return datasets[d.id] && datasets[d.id].added;
+    const ds = rapid.datasets.get(d.id);
+    return ds?.added;
   }
 
 
diff --git a/modules/ui/rapid_whatsnew.js b/modules/ui/rapid_whatsnew.js
index e760553aef..f4c90e7115 100644
--- a/modules/ui/rapid_whatsnew.js
+++ b/modules/ui/rapid_whatsnew.js
@@ -1,19 +1,17 @@
-import { t } from '../core/localizer';
 import { icon } from './intro/helper';
 import { uiModal } from './modal';
-import { prefs } from '../core/preferences';
 import { marked } from 'marked';
 
 
-export function uiRapidWhatsNew(context) {   // eslint-disable-line no-unused-vars
+export function uiRapidWhatsNew(context) {
+  // If user has not seen this version of the what's new screen, show it again.
+  // Just bump the version to a higher number to get it to come back.
+  const currWhatsNewVersion = 20230323;
   let _dontShowAgain = false;
 
-
-  return function(selection) {
-    // If user has not seen this version of the what's new screen, show it again.
-    // Just bump the version to a higher number to get it to come back.
-    const currWhatsNewVersion = 20230323;
-    const sawWhatsNewVersion = parseInt(prefs('sawWhatsNewVersion'), 10) || 0;
+  return function render(selection) {
+    const prefs = context.storageSystem();
+    const sawWhatsNewVersion = parseInt(prefs.getItem('sawWhatsNewVersion'), 10) || 0;
     if (sawWhatsNewVersion === currWhatsNewVersion) return;
 
     const modalSelection = uiModal(selection);
@@ -26,12 +24,12 @@ export function uiRapidWhatsNew(context) {   // eslint-disable-line no-unused-va
       .append('div')
       .attr('class', 'modal-section')
       .append('h2')
-      .html(t('rapid_whats_new.welcome', { rapidicon: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }));
+      .html(context.t('rapid_whats_new.welcome', { rapidicon: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid') }));
 
     let body = whatsNewModal
       .append('div')
       .attr('class', 'modal-section body')
-      .html(marked.parse(t('rapid_whats_new.text', {
+      .html(marked.parse(context.t('rapid_whats_new.text', {
         rapidicon: icon('#rapid-logo-rapid-wordmark', 'pre-text rapid'),
         bugicon: icon('#rapid-icon-bug', 'bugnub')
       })));
@@ -66,7 +64,7 @@ export function uiRapidWhatsNew(context) {   // eslint-disable-line no-unused-va
     checkbox
       .append('span')
       .attr('class', 'rapid-checkbox-text')
-      .text(t('rapid_whats_new.dontshowagain'));
+      .text(context.t('rapid_whats_new.dontshowagain'));
 
     checkbox
       .append('input')
@@ -92,7 +90,7 @@ export function uiRapidWhatsNew(context) {   // eslint-disable-line no-unused-va
 
     // nothanks
     //   .append('div')
-    //   .text(t('rapid_whats_new.nope'));
+    //   .text(context.t('rapid_whats_new.nope'));
 
     let okayButton = buttonWrap
       .append('button')
@@ -100,10 +98,10 @@ export function uiRapidWhatsNew(context) {   // eslint-disable-line no-unused-va
 
     okayButton
       .append('div')
-      .text(t('rapid_whats_new.ok'))
+      .text(context.t('rapid_whats_new.ok'))
       .on('click', () => {
         if (_dontShowAgain) {
-          prefs('sawWhatsNewVersion', currWhatsNewVersion);
+          prefs.setItem('sawWhatsNewVersion', currWhatsNewVersion);
         }
         modalSelection.close();
       });
diff --git a/modules/ui/restore.js b/modules/ui/restore.js
index 7abdbe54ce..dc9d80e148 100644
--- a/modules/ui/restore.js
+++ b/modules/ui/restore.js
@@ -1,10 +1,9 @@
-import { t } from '../core/localizer';
 import { uiModal } from './modal';
 
 
 export function uiRestore(context) {
   return function(selection) {
-    if (!context.history().hasRestorableChanges()) return;
+    if (!context.editSystem().hasRestorableChanges()) return;
 
     let modalSelection = uiModal(selection, true);
 
@@ -17,13 +16,13 @@ export function uiRestore(context) {
       .append('div')
       .attr('class', 'modal-section')
       .append('h3')
-      .html(t.html('restore.heading'));
+      .text(context.t('restore.heading'));
 
     introModal
       .append('div')
       .attr('class','modal-section')
       .append('p')
-      .html(t.html('restore.description'));
+      .text(context.t('restore.description'));
 
     let buttonWrap = introModal
       .append('div')
@@ -33,7 +32,7 @@ export function uiRestore(context) {
       .append('button')
       .attr('class', 'restore')
       .on('click', () => {
-        context.history().restore();
+        context.editSystem().restore();
         modalSelection.remove();
       });
 
@@ -45,13 +44,13 @@ export function uiRestore(context) {
 
     restore
       .append('div')
-      .html(t.html('restore.restore'));
+      .text(context.t('restore.restore'));
 
     let reset = buttonWrap
       .append('button')
       .attr('class', 'reset')
       .on('click', () => {
-        context.history().clearSaved();
+        context.editSystem().clearSaved();
         modalSelection.remove();
       });
 
@@ -63,7 +62,7 @@ export function uiRestore(context) {
 
     reset
       .append('div')
-      .html(t.html('restore.reset'));
+      .text(context.t('restore.reset'));
 
     restore.node().focus();
   };
diff --git a/modules/ui/scale.js b/modules/ui/scale.js
index a88cfd6fa6..c9402dfadd 100644
--- a/modules/ui/scale.js
+++ b/modules/ui/scale.js
@@ -1,15 +1,13 @@
 import { geoLonToMeters, geoMetersToLon } from '@rapid-sdk/math';
 
-import { displayLength } from '../util/units';
-import { localizer } from '../core/localizer';
-
 
 export function uiScale(context) {
   const projection = context.projection;
   const MAXLENGTH = 180;
   const TICKHEIGHT = 8;
 
-  let _isImperial = !localizer.usesMetric();
+  const l10n = context.localizationSystem();
+  let _isImperial = !l10n.usesMetric();
 
 
   function scaleDefs(loc1, loc2) {
@@ -38,23 +36,24 @@ export function uiScale(context) {
 
     const dLon = geoMetersToLon(scale.dist / conversion, lat);
     scale.px = Math.round(projection.project([loc1[0] + dLon, loc1[1]])[0]);
-    scale.text = displayLength(scale.dist / conversion, _isImperial);
+    scale.text = l10n.displayLength(scale.dist / conversion, _isImperial);
     return scale;
   }
 
 
   function update(selection) {
     // choose loc1, loc2 along bottom of viewport (near where the scale will be drawn)
-    const dims = context.map().dimensions;
+    const dims = context.mapSystem().dimensions;
     const loc1 = projection.invert([0, dims[1]]);
     const loc2 = projection.invert([MAXLENGTH, dims[1]]);
     const scale = scaleDefs(loc1, loc2);
+    const isRTL = l10n.isRTL();
 
     selection.select('.scale-path')
       .attr('d', 'M0.5,0.5v' + TICKHEIGHT + 'h' + scale.px + 'v-' + TICKHEIGHT);
 
     selection.select('.scale-text')
-      .style(localizer.textDirection() === 'ltr' ? 'left' : 'right', (scale.px + 16) + 'px')
+      .style(isRTL ? 'right' : 'left', (scale.px + 16) + 'px')
       .html(scale.text);
   }
 
@@ -79,7 +78,7 @@ export function uiScale(context) {
       .append('div')
       .attr('class', 'scale-text');
 
-    context.map().on('draw', () => {
+    context.mapSystem().on('draw', () => {
       window.requestIdleCallback(() => update(selection));
     });
   };
diff --git a/modules/ui/sections/background_display_options.js b/modules/ui/sections/background_display_options.js
index c059d6213e..fa043023f2 100644
--- a/modules/ui/sections/background_display_options.js
+++ b/modules/ui/sections/background_display_options.js
@@ -1,18 +1,20 @@
-import { prefs } from '../../core/preferences';
-import { t, localizer } from '../../core/localizer';
 import { uiIcon } from '../icon';
 import { uiSection } from '../section';
 
 
 export function uiSectionBackgroundDisplayOptions(context) {
+  const l10n = context.localizationSystem();
+  const storageSystem = context.storageSystem();
+  const imagerySystem = context.imagerySystem();
+
   const section = uiSection('background-display-options', context)
-    .label(t.html('background.display_options'))
+    .label(l10n.tHtml('background.display_options'))
     .disclosureContent(renderDisclosureContent);
 
-  let _storedOpacity = prefs('background-opacity');
+  let _storedOpacity = storageSystem.getItem('background-opacity');
   const MINVAL = 0;
   const MAXVAL = 3;
-  const SETTINGS = ['brightness', 'contrast', 'saturation', 'sharpness'];
+  const settings = ['brightness', 'contrast', 'saturation', 'sharpness'];
 
   let _options = {
     brightness: (_storedOpacity !== null ? (+_storedOpacity) : 1),
@@ -29,17 +31,16 @@ export function uiSectionBackgroundDisplayOptions(context) {
   function updateValue(d, val) {
     val = clamp(val, MINVAL, MAXVAL);
 
-    const imagery = context.imagery();
     _options[d] = val;
     if (d === 'brightness') {
-      prefs('background-opacity', val);
-      imagery.brightness = val;
+      storageSystem.setItem('background-opacity', val);
+      imagerySystem.brightness = val;
     } else if (d === 'contrast') {
-      imagery.contrast = val;
+      imagerySystem.contrast = val;
     } else if (d === 'saturation') {
-      imagery.saturation = val;
+      imagerySystem.saturation = val;
     } else if (d === 'sharpness') {
-      imagery.sharpness = val;
+      imagerySystem.sharpness = val;
     }
     section.reRender();
   }
@@ -55,14 +56,14 @@ export function uiSectionBackgroundDisplayOptions(context) {
 
     // add slider controls
     let slidersEnter = containerEnter.selectAll('.display-control')
-      .data(SETTINGS)
+      .data(settings)
       .enter()
       .append('div')
       .attr('class', d => `display-control display-control-${d}`);
 
     slidersEnter
       .append('h5')
-      .html(d => t.html(`background.${d}`))
+      .html(d => l10n.tHtml(`background.${d}`))
       .append('span')
       .attr('class', d => `display-option-value display-option-value-${d}`);
 
@@ -83,24 +84,24 @@ export function uiSectionBackgroundDisplayOptions(context) {
 
     sildersControlEnter
       .append('button')
-      .attr('title', t('background.reset'))
+      .attr('title', l10n.t('background.reset'))
       .attr('class', d => `display-option-reset display-option-reset-${d}`)
       .on('click', (d3_event, d) => {
         if (d3_event.button !== 0) return;  // left click only
         updateValue(d, 1);
       })
-      .call(uiIcon('#rapid-icon-' + (localizer.textDirection() === 'rtl' ? 'redo' : 'undo')));
+      .call(uiIcon('#rapid-icon-' + (l10n.isRTL() ? 'redo' : 'undo')));
 
     // reset all button
     containerEnter
       .append('a')
       .attr('class', 'display-option-resetlink')
       .attr('href', '#')
-      .html(t.html('background.reset_all'))
+      .html(l10n.tHtml('background.reset_all'))
       .on('click', d3_event => {
         d3_event.preventDefault();
-        for (let i = 0; i < SETTINGS.length; i++) {
-          updateValue(SETTINGS[i], 1);
+        for (const s of settings) {
+          updateValue(s, 1);
         }
       });
 
@@ -119,7 +120,7 @@ export function uiSectionBackgroundDisplayOptions(context) {
 
     // first time only, set brightness if needed
     if (containerEnter.size() && _options.brightness !== 1) {
-      context.imagery().brightness = _options.brightness;
+      imagerySystem.brightness = _options.brightness;
     }
   }
 
diff --git a/modules/ui/sections/background_list.js b/modules/ui/sections/background_list.js
index 878951ba36..799fe8c7f0 100644
--- a/modules/ui/sections/background_list.js
+++ b/modules/ui/sections/background_list.js
@@ -1,41 +1,43 @@
-import _debounce from 'lodash-es/debounce';
 import { descending as d3_descending, ascending as d3_ascending } from 'd3-array';
 import { select as d3_select } from 'd3-selection';
 import { easeCubicInOut as d3_easeCubicInOut } from 'd3-ease';
+import debounce from 'lodash-es/debounce';
 
-import { prefs } from '../../core/preferences';
-import { t, localizer } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
-import { RendererImagerySource } from '../../renderer/RendererImagerySource';
+import { ImagerySource } from '../../core/lib';
 import { uiIcon } from '../icon';
 import { uiCmd } from '../cmd';
 import { uiSettingsCustomBackground } from '../settings/custom_background';
 import { uiMapInMap } from '../map_in_map';
-import { ui3DMap } from '../tools/3dmap/3d_map';
+import { uiMap3dViewer } from '../map3d_viewer';
 import { uiSection } from '../section';
 
 
 export function uiSectionBackgroundList(context) {
+  const l10n = context.localizationSystem();
+  const imagerySystem = context.imagerySystem();
+  const storageSystem = context.storageSystem();
+
   const section = uiSection('background-list', context)
-    .label(t('background.backgrounds'))
+    .label(l10n.t('background.backgrounds'))
     .disclosureContent(renderDisclosureContent);
 
   let _backgroundList = d3_select(null);
 
-  const customSource = context.imagery().findSource('custom');
+  const customSource = imagerySystem.findSource('custom');
   const settingsCustomBackground = uiSettingsCustomBackground(context)
     .on('change', customChanged);
 
-
-  const favoriteBackgroundsJSON = prefs('background-favorites');
+  const favoriteBackgroundsJSON = storageSystem.getItem('background-favorites');
   const _favoriteBackgrounds = favoriteBackgroundsJSON ? JSON.parse(favoriteBackgroundsJSON) : {};
 
+
   function previousBackgroundID() {
-    return prefs('background-last-used-toggle');
+    return storageSystem.getItem('background-last-used-toggle');
   }
 
-  function renderDisclosureContent(selection) {
 
+  function renderDisclosureContent(selection) {
     // the background list
     const container = selection.selectAll('.layer-background-list')
       .data([0]);
@@ -58,9 +60,9 @@ export function uiSectionBackgroundList(context) {
       .append('li')
       .attr('class', 'minimap-toggle-item')
       .append('label')
-      .call(uiTooltip()
-        .title(t('background.minimap.tooltip'))
-        .keys([t('background.minimap.key')])
+      .call(uiTooltip(context)
+        .title(l10n.t('background.minimap.tooltip'))
+        .keys([l10n.t('background.minimap.key')])
         .placement('top')
       );
 
@@ -74,40 +76,39 @@ export function uiSectionBackgroundList(context) {
 
     minimapLabelEnter
       .append('span')
-      .text(t('background.minimap.description'));
+      .text(l10n.t('background.minimap.description'));
 
 
-      const threeDmapLabelEnter = bgExtrasListEnter
+    const threeDmapLabelEnter = bgExtrasListEnter
       .append('li')
       .attr('class', 'three-d-map-toggle-item')
       .append('label')
-      .call(uiTooltip()
-        .title(t('background.3dmap.tooltip'))
-        .keys([uiCmd('⌘' + t('background.3dmap.key'))])
+      .call(uiTooltip(context)
+        .title(l10n.t('background.3dmap.tooltip'))
+        .keys([uiCmd('⌘' + l10n.t('background.3dmap.key'))])
         .placement('top')
       );
 
-      threeDmapLabelEnter
+    threeDmapLabelEnter
       .append('input')
       .attr('type', 'checkbox')
       .on('change', (d3_event) => {
         d3_event.preventDefault();
-        ui3DMap.toggle();
+        uiMap3dViewer.toggle();
       });
 
-      threeDmapLabelEnter
+    threeDmapLabelEnter
       .append('span')
-      .text(t('background.3dmap.description'));
-
+      .text(l10n.t('background.3dmap.description'));
 
 
     const panelLabelEnter = bgExtrasListEnter
       .append('li')
       .attr('class', 'background-panel-toggle-item')
       .append('label')
-      .call(uiTooltip()
-        .title(t('background.panel.tooltip'))
-        .keys([uiCmd('⌘⇧' + t('info_panels.background.key'))])
+      .call(uiTooltip(context)
+        .title(l10n.t('background.panel.tooltip'))
+        .keys([uiCmd('⌘⇧' + l10n.t('info_panels.background.key'))])
         .placement('top')
       );
 
@@ -121,15 +122,15 @@ export function uiSectionBackgroundList(context) {
 
     panelLabelEnter
       .append('span')
-      .text(t('background.panel.description'));
+      .text(l10n.t('background.panel.description'));
 
     const locPanelLabelEnter = bgExtrasListEnter
       .append('li')
       .attr('class', 'location-panel-toggle-item')
       .append('label')
-      .call(uiTooltip()
-        .title(t('background.location_panel.tooltip'))
-        .keys([uiCmd('⌘⇧' + t('info_panels.location.key'))])
+      .call(uiTooltip(context)
+        .title(l10n.t('background.location_panel.tooltip'))
+        .keys([uiCmd('⌘⇧' + l10n.t('info_panels.location.key'))])
         .placement('top')
       );
 
@@ -143,7 +144,7 @@ export function uiSectionBackgroundList(context) {
 
     locPanelLabelEnter
       .append('span')
-      .text(t('background.location_panel.description'));
+      .text(l10n.t('background.location_panel.description'));
 
 
     // "Info / Report a Problem" link
@@ -157,7 +158,7 @@ export function uiSectionBackgroundList(context) {
       .call(uiIcon('#rapid-icon-out-link', 'inline'))
       .attr('href', 'https://github.com/openstreetmap/iD/blob/develop/FAQ.md#how-can-i-report-an-issue-with-background-imagery')
       .append('span')
-      .text(t('background.imagery_problem_faq'));
+      .text(l10n.t('background.imagery_problem_faq'));
 
     _backgroundList
       .call(drawListItems, 'radio', chooseBackground, (d) => { return !d.isHidden() && !d.overlay; });
@@ -171,16 +172,16 @@ export function uiSectionBackgroundList(context) {
       const placement = (i < nodes.length / 2) ? 'bottom' : 'top';
       const isOverflowing = (span.property('clientWidth') !== span.property('scrollWidth'));
 
-      item.call(uiTooltip().destroyAny);
+      item.call(uiTooltip(context).destroyAny);
 
       if (d.id === previousBackgroundID()) {
-        item.call(uiTooltip()
+        item.call(uiTooltip(context)
           .placement(placement)
-          .title('<div>' + t('background.switch') + '</div>')
-          .keys([uiCmd('⌘' + t('background.key'))])
+          .title('<div>' + l10n.t('background.switch') + '</div>')
+          .keys([uiCmd('⌘' + l10n.t('background.key'))])
         );
       } else if (d.description || isOverflowing) {
-        item.call(uiTooltip()
+        item.call(uiTooltip(context)
           .placement(placement)
           .title(d.description || d.name)
         );
@@ -199,8 +200,8 @@ export function uiSectionBackgroundList(context) {
 
 
   function drawListItems(layerList, type, change, filter) {
-    const sources = context.imagery()
-      .sources(context.map().extent(), context.map().zoom())
+    const sources = imagerySystem
+      .sources(context.mapSystem().extent(), context.mapSystem().zoom())
       .filter(filter);
 
     const layerLinks = layerList.selectAll('li')
@@ -242,7 +243,7 @@ export function uiSectionBackgroundList(context) {
           d3_select(d3_event.currentTarget).classed('active', true);
           _favoriteBackgrounds[d.id] = true;
         }
-        prefs('background-favorites', JSON.stringify(_favoriteBackgrounds));
+        storageSystem.setItem('background-favorites', JSON.stringify(_favoriteBackgrounds));
 
         d3_select(d3_event.currentTarget.parentElement)
           .transition()
@@ -263,9 +264,9 @@ export function uiSectionBackgroundList(context) {
     layerLinksEnter.filter(d => d.id === 'custom')
       .append('button')
       .attr('class', 'layer-browse')
-      .call(uiTooltip()
-        .title(t('settings.custom_background.tooltip'))
-        .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
+      .call(uiTooltip(context)
+        .title(l10n.t('settings.custom_background.tooltip'))
+        .placement(l10n.isRTL() ? 'right' : 'left')
       )
       .on('click', editCustom)
       .call(uiIcon('#rapid-icon-more'));
@@ -274,8 +275,8 @@ export function uiSectionBackgroundList(context) {
       .selectAll('label')
       .append('span')
       .attr('class', 'best')
-      .call(uiTooltip()
-        .title(t('background.best_imagery'))
+      .call(uiTooltip(context)
+        .title(l10n.t('background.best_imagery'))
         .placement('bottom')
       )
       .call(uiIcon('#rapid-icon-best-background'));
@@ -290,7 +291,7 @@ export function uiSectionBackgroundList(context) {
 
   function updateLayerSelections(selection) {
     function active(d) {
-      return context.imagery().showsLayer(d);
+      return imagerySystem.showsLayer(d);
     }
 
     selection.selectAll('li')
@@ -307,12 +308,12 @@ export function uiSectionBackgroundList(context) {
       return editCustom();
     }
 
-    const previousBackground = context.imagery().baseLayerSource();
-    if (previousBackground instanceof RendererImagerySource) {
-      prefs('background-last-used-toggle', previousBackground.id);
+    const previousBackground = imagerySystem.baseLayerSource();
+    if (previousBackground instanceof ImagerySource) {
+      storageSystem.setItem('background-last-used-toggle', previousBackground.id);
     }
-    prefs('background-last-used', d.id);
-    context.imagery().baseLayerSource(d);
+    storageSystem.setItem('background-last-used', d.id);
+    imagerySystem.baseLayerSource(d);
   }
 
 
@@ -322,7 +323,7 @@ export function uiSectionBackgroundList(context) {
       chooseBackground(undefined, customSource);
     } else {
       customSource.template = '';
-      chooseBackground(undefined, context.imagery().findSource('none'));
+      chooseBackground(undefined, imagerySystem.findSource('none'));
     }
   }
 
@@ -334,15 +335,15 @@ export function uiSectionBackgroundList(context) {
   }
 
   function getBackgrounds(filter) {
-    return context.imagery()
-      .sources(context.map().extent(), context.map().zoom())
+    return imagerySystem
+      .sources(context.mapSystem().extent(), context.mapSystem().zoom())
       .filter(filter);
   }
 
   function chooseBackgroundAtOffset(offset) {
     const backgrounds = getBackgrounds((d) => { return !d.isHidden() && !d.overlay; });
     backgrounds.sort(sortSources);
-    const currentBackground = context.imagery().baseLayerSource();
+    const currentBackground = imagerySystem.baseLayerSource();
     const foundIndex = backgrounds.indexOf(currentBackground);
     if (foundIndex === -1) {
       // Can't find the current background, so just do nothing
@@ -367,19 +368,19 @@ export function uiSectionBackgroundList(context) {
   }
 
 
-  context.imagery()
+  imagerySystem
     .on('imagerychange', () => _backgroundList.call(updateLayerSelections));
 
-  context.map()
-    .on('draw', _debounce(() => {
+  context.mapSystem()
+    .on('draw', debounce(() => {
         // layers in-view may have changed due to map move
         window.requestIdleCallback(section.reRender);
       }, 1000)
     );
 
   context.keybinding()
-    .on(t('background.next_background.key'), nextBackground)
-    .on(t('background.previous_background.key'), previousBackground);
+    .on(l10n.t('background.next_background.key'), nextBackground)
+    .on(l10n.t('background.previous_background.key'), previousBackground);
 
   return section;
 }
diff --git a/modules/ui/sections/background_offset.js b/modules/ui/sections/background_offset.js
index d4eac7f781..e64442d539 100644
--- a/modules/ui/sections/background_offset.js
+++ b/modules/ui/sections/background_offset.js
@@ -1,14 +1,16 @@
 import { select as d3_select } from 'd3-selection';
 import { geoMetersToOffset, geoOffsetToMeters } from '@rapid-sdk/math';
 
-import { t, localizer } from '../../core/localizer';
 import { uiIcon } from '../icon';
 import { uiSection } from '../section';
 
 
 export function uiSectionBackgroundOffset(context) {
+  const l10n = context.localizationSystem();
+  const imagerySystem = context.imagerySystem();
+
   const section = uiSection('background-offset', context)
-    .label(t.html('background.fix_misalignment'))
+    .label(l10n.tHtml('background.fix_misalignment'))
     .disclosureContent(renderDisclosureContent)
     .expandedByDefault(false);
 
@@ -21,7 +23,7 @@ export function uiSectionBackgroundOffset(context) {
 
 
   function updateValue() {
-    const meters = geoOffsetToMeters(context.imagery().offset);
+    const meters = geoOffsetToMeters(imagerySystem.offset);
     const x = +meters[0].toFixed(2);
     const y = +meters[1].toFixed(2);
 
@@ -36,13 +38,13 @@ export function uiSectionBackgroundOffset(context) {
 
 
   function resetOffset() {
-    context.imagery().offset = [0, 0];
+    imagerySystem.offset = [0, 0];
     updateValue();
   }
 
 
   function nudge(d) {
-    context.imagery().nudge(d, context.map().zoom());
+    imagerySystem.nudge(d, context.mapSystem().zoom());
     updateValue();
   }
 
@@ -53,7 +55,7 @@ export function uiSectionBackgroundOffset(context) {
 
     if (val === '') return resetOffset();
 
-    val = val.replace(/;/g, ',').split(',').map(function(n) {
+    val = val.replace(/;/g, ',').split(',').map(n => {
       // if n is NaN, it will always get mapped to false.
       return !isNaN(n) && n;
     });
@@ -63,7 +65,7 @@ export function uiSectionBackgroundOffset(context) {
       return;
     }
 
-    context.imagery().offset = geoMetersToOffset(val);
+    imagerySystem.offset = geoMetersToOffset(val);
     updateValue();
   }
 
@@ -121,7 +123,7 @@ export function uiSectionBackgroundOffset(context) {
     containerEnter
       .append('div')
       .attr('class', 'nudge-instructions')
-      .html(t.html('background.offset'));
+      .html(l10n.tHtml('background.offset'));
 
     let nudgeWrapEnter = containerEnter
       .append('div')
@@ -150,18 +152,18 @@ export function uiSectionBackgroundOffset(context) {
 
     nudgeWrapEnter
       .append('button')
-      .attr('title', t('background.reset'))
+      .attr('title', l10n.t('background.reset'))
       .attr('class', 'nudge-reset disabled')
       .on('click', d3_event => {
         d3_event.preventDefault();
         resetOffset();
       })
-      .call(uiIcon('#rapid-icon-' + (localizer.textDirection() === 'rtl' ? 'redo' : 'undo')));
+      .call(uiIcon('#rapid-icon-' + (l10n.isRTL() ? 'redo' : 'undo')));
 
     updateValue();
   }
 
-  context.imagery().on('imagerychange', updateValue);
+  imagerySystem.on('imagerychange', updateValue);
 
   return section;
 }
diff --git a/modules/ui/sections/changes.js b/modules/ui/sections/changes.js
index 00eec0ed1b..c1815ccf9a 100644
--- a/modules/ui/sections/changes.js
+++ b/modules/ui/sections/changes.js
@@ -1,159 +1,156 @@
 import { select as d3_select } from 'd3-selection';
 import { utilEntityOrMemberSelector } from '@rapid-sdk/util';
 
-import { presetManager } from '../../presets';
-import { fileFetcher } from '../../core/file_fetcher';
-import { t } from '../../core/localizer';
 import { JXON } from '../../util/jxon';
 import { actionDiscardTags } from '../../actions/discard_tags';
 import { osmChangeset } from '../../osm';
 import { uiIcon } from '../icon';
 import { uiSection } from '../section';
-import { utilDetect, utilDisplayName, utilDisplayType } from '../../util';
+import { utilDetect } from '../../util';
 
 
 export function uiSectionChanges(context) {
-    var detected = utilDetect();
-
-    var _discardTags = {};
-    fileFetcher.get('discarded')
-        .then(function(d) { _discardTags = d; })
-        .catch(function() { /* ignore */ });
-
-    var section = uiSection('changes-list', context)
-        .label(function() {
-            var history = context.history();
-            var summary = history.difference().summary();
-            return t('inspector.title_count', { title: t.html('commit.changes'), count: summary.size });
-        })
-        .disclosureContent(renderDisclosureContent);
-
-    function renderDisclosureContent(selection) {
-        var history = context.history();
-        var summary = [...history.difference().summary().values()];
-
-        var container = selection.selectAll('.commit-section')
-            .data([0]);
-
-        var containerEnter = container.enter()
-            .append('div')
-            .attr('class', 'commit-section');
-
-        containerEnter
-            .append('ul')
-            .attr('class', 'changeset-list');
-
-        container = containerEnter
-            .merge(container);
-
-
-        var items = container.select('ul').selectAll('li')
-            .data(summary);
-
-        var itemsEnter = items.enter()
-            .append('li')
-            .attr('class', 'change-item');
-
-        var buttons = itemsEnter
-            .append('button')
-            .on('mouseover', mouseover)
-            .on('mouseout', mouseout)
-            .on('click', click);
-
-        buttons
-            .each(function(d) {
-                d3_select(this)
-                    .call(uiIcon('#rapid-icon-' + d.entity.geometry(d.graph), 'pre-text ' + d.changeType));
-            });
-
-        buttons
-            .append('span')
-            .attr('class', 'change-type')
-            .html(function(d) { return t.html('commit.' + d.changeType) + ' '; });
-
-        buttons
-            .append('strong')
-            .attr('class', 'entity-type')
-            .html(function(d) {
-                var matched = presetManager.match(d.entity, d.graph);
-                return (matched && matched.name()) || utilDisplayType(d.entity.id);
-            });
-
-        buttons
-            .append('span')
-            .attr('class', 'entity-name')
-            .html(function(d) {
-                var name = utilDisplayName(d.entity) || '',
-                    string = '';
-                if (name !== '') {
-                    string += ':';
-                }
-                return string += ' ' + name;
-            });
-
-        items = itemsEnter
-            .merge(items);
-
-
-        // Download changeset link
-        var changeset = new osmChangeset().update({ id: undefined });
-        var changes = history.changes(actionDiscardTags(history.difference(), _discardTags));
-
-        delete changeset.id;  // Export without chnageset_id
-
-        var data = JXON.stringify(changeset.osmChangeJXON(changes));
-        var blob = new Blob([data], {type: 'text/xml;charset=utf-8;'});
-        var fileName = 'changes.osc';
-
-        var linkEnter = container.selectAll('.download-changes')
-            .data([0])
-            .enter()
-            .append('a')
-            .attr('class', 'download-changes');
-
-        if (detected.download) {      // All except IE11 and Edge
-            linkEnter                 // download the data as a file
-                .attr('href', window.URL.createObjectURL(blob))
-                .attr('download', fileName);
-
-        } else {                      // IE11 and Edge
-            linkEnter                 // open data uri in a new tab
-                .attr('target', '_blank')
-                .on('click.download', function() {
-                    navigator.msSaveBlob(blob, fileName);
-                });
+  const l10n = context.localizationSystem();
+  let detected = utilDetect();
+
+  let _discardTags = {};
+  const dataLoaderSystem = context.dataLoaderSystem();
+  dataLoaderSystem.get('discarded')
+    .then(d => _discardTags = d)
+    .catch(() => { /* ignore */ });
+
+  let section = uiSection('changes-list', context)
+    .label(() => {
+      const editSystem = context.editSystem();
+      const summary = editSystem.difference().summary();
+      return l10n.t('inspector.title_count', { title: l10n.tHtml('commit.changes'), count: summary.size });
+    })
+    .disclosureContent(renderDisclosureContent);
+
+
+  function renderDisclosureContent(selection) {
+    const editSystem = context.editSystem();
+    const summary = [...editSystem.difference().summary().values()];
+
+    let container = selection.selectAll('.commit-section')
+      .data([0]);
+
+    let containerEnter = container.enter()
+      .append('div')
+      .attr('class', 'commit-section');
+
+    containerEnter
+      .append('ul')
+      .attr('class', 'changeset-list');
+
+    container = containerEnter
+      .merge(container);
+
+
+    let items = container.select('ul').selectAll('li')
+      .data(summary);
+
+    let itemsEnter = items.enter()
+      .append('li')
+      .attr('class', 'change-item');
+
+    let buttons = itemsEnter
+      .append('button')
+      .on('mouseover', mouseover)
+      .on('mouseout', mouseout)
+      .on('click', click);
+
+    buttons
+      .each((d, i, nodes) => {
+        const geom = d.entity.geometry(d.graph);
+        d3_select(nodes[i])
+          .call(uiIcon(`#rapid-icon-${geom}`, `pre-text ${d.changeType}`));
+      });
+
+    buttons
+      .append('span')
+      .attr('class', 'change-type')
+      .html(d => l10n.tHtml(`commit.${d.changeType}`) + ' ');
+
+    buttons
+      .append('strong')
+      .attr('class', 'entity-type')
+      .html(d => {
+        const matched = context.presetSystem().match(d.entity, d.graph);
+        return (matched && matched.name()) || l10n.displayType(d.entity.id);
+      });
+
+    buttons
+      .append('span')
+      .attr('class', 'entity-name')
+      .html(d => {
+        const name = l10n.displayName(d.entity) || '';
+        let string = '';
+        if (name !== '') {
+          string += ':';
         }
+        return string += ' ' + name;
+      });
 
-        linkEnter
-            .call(uiIcon('#rapid-icon-load', 'inline'))
-            .append('span')
-            .html(t.html('commit.download_changes'));
+    items = itemsEnter
+      .merge(items);
 
 
-        function mouseover(d) {
-            if (d.entity) {
-                context.surface().selectAll(
-                    utilEntityOrMemberSelector([d.entity.id], context.graph())
-                ).classed('hover', true);
-            }
-        }
+    // Download changeset link
+    let changeset = new osmChangeset().update({ id: undefined });
+    const changes = editSystem.changes(actionDiscardTags(editSystem.difference(), _discardTags));
 
+    delete changeset.id;  // Export without chnageset_id
 
-        function mouseout() {
-            context.surface().selectAll('.hover')
-                .classed('hover', false);
-        }
+    const data = JXON.stringify(changeset.osmChangeJXON(changes));
+    const blob = new Blob([data], {type: 'text/xml;charset=utf-8;'});
+    const fileName = 'changes.osc';
 
+    let linkEnter = container.selectAll('.download-changes')
+      .data([0])
+      .enter()
+      .append('a')
+      .attr('class', 'download-changes');
 
-        function click(d3_event, change) {
-            if (change.changeType !== 'deleted') {
-                var entity = change.entity;
-                context.map().zoomToEase(entity);
-                context.surface().selectAll(utilEntityOrMemberSelector([entity.id], context.graph()))
-                    .classed('hover', true);
-            }
-        }
+    if (detected.download) {    // All except IE11 and Edge
+      linkEnter                 // download the data as a file
+        .attr('href', window.URL.createObjectURL(blob))
+        .attr('download', fileName);
+
+    } else {                    // IE11 and Edge
+      linkEnter                 // open data uri in a new tab
+        .attr('target', '_blank')
+        .on('click.download', () => navigator.msSaveBlob(blob, fileName));
+    }
+
+    linkEnter
+      .call(uiIcon('#rapid-icon-load', 'inline'))
+      .append('span')
+      .html(l10n.tHtml('commit.download_changes'));
+
+
+    function mouseover(d) {
+      if (d.entity) {
+        context.surface().selectAll(
+          utilEntityOrMemberSelector([d.entity.id], context.graph())
+        ).classed('hover', true);
+      }
+    }
+
+    function mouseout() {
+      context.surface().selectAll('.hover')
+        .classed('hover', false);
+    }
+
+    function click(d3_event, change) {
+      if (change.changeType !== 'deleted') {
+        let entity = change.entity;
+        context.mapSystem().zoomToEase(entity);
+        context.surface().selectAll(utilEntityOrMemberSelector([entity.id], context.graph()))
+          .classed('hover', true);
+      }
     }
+  }
 
-    return section;
+  return section;
 }
diff --git a/modules/ui/sections/data_layers.js b/modules/ui/sections/data_layers.js
index 6003b7d922..bdf1003c1b 100644
--- a/modules/ui/sections/data_layers.js
+++ b/modules/ui/sections/data_layers.js
@@ -1,6 +1,5 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t, localizer } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { uiIcon } from '../icon';
 import { uiCmd } from '../cmd';
@@ -9,8 +8,9 @@ import { uiSettingsCustomData } from '../settings/custom_data';
 
 
 export function uiSectionDataLayers(context) {
+  const l10n = context.localizationSystem();
   const section = uiSection('data-layers', context)
-    .label(t.html('map_data.data_layers'))
+    .label(l10n.tHtml('map_data.data_layers'))
     .disclosureContent(renderDisclosureContent);
 
   const settingsCustomData = uiSettingsCustomData(context)
@@ -89,15 +89,15 @@ export function uiSectionDataLayers(context) {
       .each((d, i, nodes) => {
         if (d.id === 'osm') {
           d3_select(nodes[i])
-            .call(uiTooltip()
-              .title(t.html(`map_data.layers.${d.id}.tooltip`))
-              .keys([uiCmd('⌥' + t('area_fill.wireframe.key'))])
+            .call(uiTooltip(context)
+              .title(l10n.tHtml(`map_data.layers.${d.id}.tooltip`))
+              .keys([uiCmd('⌥' + l10n.t('area_fill.wireframe.key'))])
               .placement('bottom')
             );
         } else {
           d3_select(nodes[i])
-            .call(uiTooltip()
-              .title(t.html(`map_data.layers.${d.id}.tooltip`))
+            .call(uiTooltip(context)
+              .title(l10n.tHtml(`map_data.layers.${d.id}.tooltip`))
               .placement('bottom')
             );
         }
@@ -110,7 +110,7 @@ export function uiSectionDataLayers(context) {
 
     labelEnter
       .append('span')
-      .html(d => t.html(`map_data.layers.${d.id}.title`));
+      .html(d => l10n.tHtml(`map_data.layers.${d.id}.title`));
 
     // Update
     li
@@ -148,8 +148,8 @@ export function uiSectionDataLayers(context) {
       .append('label')
       .each((d, i, nodes) => {
         d3_select(nodes[i])
-          .call(uiTooltip()
-            .title(t.html(`map_data.layers.${d.id}.tooltip`))
+          .call(uiTooltip(context)
+            .title(l10n.tHtml(`map_data.layers.${d.id}.tooltip`))
             .placement('bottom')
           );
       });
@@ -161,7 +161,7 @@ export function uiSectionDataLayers(context) {
 
     labelEnter
       .append('span')
-      .html(d => t.html(`map_data.layers.${d.id}.title`));
+      .html(d => l10n.tHtml(`map_data.layers.${d.id}.title`));
 
     // Update
     li
@@ -176,6 +176,7 @@ export function uiSectionDataLayers(context) {
     const dataLayer = scene.layers.get('custom-data');
     const hasData = dataLayer && dataLayer.hasData();
     const showsData = hasData && dataLayer.enabled;
+    const isRTL = l10n.isRTL();
 
     let ul = selection
       .selectAll('.layer-list-data')
@@ -196,8 +197,8 @@ export function uiSectionDataLayers(context) {
 
     let labelEnter = liEnter
       .append('label')
-      .call(uiTooltip()
-        .title(t.html('map_data.layers.custom.tooltip'))
+      .call(uiTooltip(context)
+        .title(l10n.tHtml('map_data.layers.custom.tooltip'))
         .placement('top')
       );
 
@@ -208,14 +209,14 @@ export function uiSectionDataLayers(context) {
 
     labelEnter
       .append('span')
-      .html(t.html('map_data.layers.custom.title'));
+      .html(l10n.tHtml('map_data.layers.custom.title'));
 
     liEnter
       .append('button')
       .attr('class', 'open-data-options')
-      .call(uiTooltip()
-        .title(t.html('settings.custom_data.tooltip'))
-        .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
+      .call(uiTooltip(context)
+        .title(l10n.tHtml('settings.custom_data.tooltip'))
+        .placement(isRTL ? 'right' : 'left')
       )
       .on('click', d3_event => {
         d3_event.preventDefault();
@@ -226,9 +227,9 @@ export function uiSectionDataLayers(context) {
     liEnter
       .append('button')
       .attr('class', 'zoom-to-data')
-      .call(uiTooltip()
-        .title(t.html('map_data.layers.custom.zoom'))
-        .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
+      .call(uiTooltip(context)
+        .title(l10n.tHtml('map_data.layers.custom.zoom'))
+        .placement(isRTL ? 'right' : 'left')
       )
       .on('click', function(d3_event) {
         if (d3_select(this).classed('disabled')) return;
@@ -284,9 +285,9 @@ export function uiSectionDataLayers(context) {
       .append('li')
       .attr('class', 'history-panel-toggle-item')
       .append('label')
-      .call(uiTooltip()
-        .title(t.html('map_data.history_panel.tooltip'))
-        .keys([uiCmd('⌘⇧' + t('info_panels.history.key'))])
+      .call(uiTooltip(context)
+        .title(l10n.tHtml('map_data.history_panel.tooltip'))
+        .keys([uiCmd('⌘⇧' + l10n.t('info_panels.history.key'))])
         .placement('top')
       );
 
@@ -300,15 +301,15 @@ export function uiSectionDataLayers(context) {
 
     historyPanelLabelEnter
       .append('span')
-      .html(t.html('map_data.history_panel.title'));
+      .html(l10n.tHtml('map_data.history_panel.title'));
 
     let measurementPanelLabelEnter = panelsListEnter
       .append('li')
       .attr('class', 'measurement-panel-toggle-item')
       .append('label')
-      .call(uiTooltip()
-        .title(t.html('map_data.measurement_panel.tooltip'))
-        .keys([uiCmd('⌘⇧' + t('info_panels.measurement.key'))])
+      .call(uiTooltip(context)
+        .title(l10n.tHtml('map_data.measurement_panel.tooltip'))
+        .keys([uiCmd('⌘⇧' + l10n.t('info_panels.measurement.key'))])
         .placement('top')
       );
 
@@ -322,7 +323,7 @@ export function uiSectionDataLayers(context) {
 
     measurementPanelLabelEnter
       .append('span')
-      .html(t.html('map_data.measurement_panel.title'));
+      .html(l10n.tHtml('map_data.measurement_panel.title'));
   }
 
 
diff --git a/modules/ui/sections/entity_issues.js b/modules/ui/sections/entity_issues.js
index b6aff527a5..a7ccc885f7 100644
--- a/modules/ui/sections/entity_issues.js
+++ b/modules/ui/sections/entity_issues.js
@@ -1,271 +1,254 @@
 import { select as d3_select } from 'd3-selection';
 import { utilArrayIdentical } from '@rapid-sdk/util';
 
-import { prefs } from '../../core/preferences';
 import { uiIcon } from '../icon';
-import { t } from '../../core/localizer';
 import { utilHighlightEntities } from '../../util';
 import { uiSection } from '../section';
 
 
 export function uiSectionEntityIssues(context) {
-    // Does the user prefer to expand the active issue?  Useful for viewing tag diff.
-    // Expand by default so first timers see it - #6408, #8143
-    var preference = prefs('entity-issues.reference.expanded');
-    var _expanded = preference === null ? true : (preference === 'true');
+  const validator = context.validationSystem();
+  // Does the user prefer to expand the active issue?  Useful for viewing tag diff.
+  // Expand by default so first timers see it - iD#6408, iD#8143
+  const prefs = context.storageSystem();
+  let preference = prefs.getItem('entity-issues.reference.expanded') ?? 'true';
+  let _expanded = (preference === 'true');
+
+  let _entityIDs = [];
+  let _issues = [];
+  let _activeIssueID;
+
+
+  let section = uiSection('entity-issues', context)
+    .shouldDisplay(() => _issues.length)
+    .label(() => {
+      return context.t('inspector.title_count', { title: context.tHtml('issues.list_title'), count: _issues.length });
+    })
+    .disclosureContent(renderDisclosureContent);
+
+
+  function reloadIssues() {
+    _issues = validator.getSharedEntityIssues(_entityIDs, { includeDisabledRules: true });
+  }
+
+
+  function makeActiveIssue(issueID) {
+    _activeIssueID = issueID;
+    section.selection().selectAll('.issue-container')
+      .classed('active', d => d.id === _activeIssueID);
+  }
+
+
+  function renderDisclosureContent(selection) {
+    selection.classed('grouped-items-area', true);
+    _activeIssueID = _issues.length ? _issues[0].id : null;
+
+    let containers = selection.selectAll('.issue-container')
+      .data(_issues, d => d.key);
+
+    // Exit
+    containers.exit()
+      .remove();
+
+    // Enter
+    let containersEnter = containers.enter()
+      .append('div')
+      .attr('class', 'issue-container');
+
+
+    let itemsEnter = containersEnter
+      .append('div')
+      .attr('class', d => `issue severity-${d.severity}`)
+      .on('mouseover.highlight', function(d3_event, d) {
+        // don't hover-highlight the selected entity
+        const otherIDs = d.entityIds.filter(id => !_entityIDs.includes(id));
+        utilHighlightEntities(otherIDs, true, context);
+      })
+      .on('mouseout.highlight', function(d3_event, d) {
+        const otherIDs = d.entityIds.filter(id => !_entityIDs.includes(id));
+        utilHighlightEntities(otherIDs, false, context);
+      });
+
+    let labelsEnter = itemsEnter
+      .append('div')
+      .attr('class', 'issue-label');
+
+    let textEnter = labelsEnter
+      .append('button')
+      .attr('class', 'issue-text')
+      .on('click', function(d3_event, d) {
+        makeActiveIssue(d.id);    // expand only the clicked item
+        const extent = d.extent(context.graph());
+        if (extent) {
+          const setZoom = Math.max(context.mapSystem().zoom(), 19);
+          context.mapSystem().centerZoomEase(extent.center(), setZoom);
+        }
+      });
+
+    textEnter
+      .each((d, i, nodes) => {
+        const which = (d.severity === 'warning') ? 'alert' : 'error';
+        d3_select(nodes[i])
+          .call(uiIcon(`#rapid-icon-${which}`, 'issue-icon'));
+      });
+
+    textEnter
+      .append('span')
+      .attr('class', 'issue-message');
+
+
+    let infoButton = labelsEnter
+      .append('button')
+      .attr('class', 'issue-info-button')
+      .attr('title', context.t('icons.information'))
+      .call(uiIcon('#rapid-icon-inspect'));
+
+    infoButton
+      .on('click', function(d3_event) {
+        d3_event.stopPropagation();
+        d3_event.preventDefault();
+        this.blur();    // avoid keeping focus on the button - iD#4641
+
+        const container = d3_select(this.parentNode.parentNode.parentNode);
+        const info = container.selectAll('.issue-info');
+        const isExpanded = info.classed('expanded');
+        _expanded = !isExpanded;
+        prefs.setItem('entity-issues.reference.expanded', _expanded);  // update preference
+
+        if (isExpanded) {
+          info
+            .transition()
+            .duration(200)
+            .style('max-height', '0px')
+            .style('opacity', '0')
+            .on('end', () => info.classed('expanded', false));
+        } else {
+          info
+            .classed('expanded', true)
+            .transition()
+            .duration(200)
+            .style('max-height', '200px')
+            .style('opacity', '1')
+            .on('end', () => info.style('max-height', null));
+        }
+      });
+
+    itemsEnter
+      .append('ul')
+      .attr('class', 'issue-fix-list');
+
+    containersEnter
+      .append('div')
+      .attr('class', 'issue-info' + (_expanded ? ' expanded' : ''))
+      .style('max-height', (_expanded ? null : '0'))
+      .style('opacity', (_expanded ? '1' : '0'))
+      .each((d, i, nodes) => {
+        const selection = d3_select(nodes[i]);
+        if (typeof d.reference === 'function') {
+          selection.call(d.reference);
+        } else {
+          selection.html(context.tHtml('inspector.no_documentation_key'));
+        }
+      });
 
-    var _entityIDs = [];
-    var _issues = [];
-    var _activeIssueID;
 
+    // Update
+    containers = containers
+      .merge(containersEnter)
+      .classed('active', d => d.id === _activeIssueID);
 
-    var section = uiSection('entity-issues', context)
-        .shouldDisplay(function() {
-            return _issues.length > 0;
-        })
-        .label(function() {
-            return t('inspector.title_count', { title: t.html('issues.list_title'), count: _issues.length });
-        })
-        .disclosureContent(renderDisclosureContent);
+    containers.selectAll('.issue-message')
+      .html(d => d.message(context));
+
+    // fixes
+    let fixLists = containers.selectAll('.issue-fix-list');
+
+    let fixes = fixLists.selectAll('.issue-fix-item')
+      .data(d => (d.fixes ? d.fixes() : []), d => d.id);
 
-    context.validator()
-        .on('validated.entity_issues', function() {
-            // Refresh on validated events
-            reloadIssues();
-            section.reRender();
+    fixes.exit()
+      .remove();
+
+    let fixesEnter = fixes.enter()
+      .append('li')
+      .attr('class', 'issue-fix-item');
+
+    let buttons = fixesEnter
+      .append('button')
+      .on('click', function(d3_event, d) {
+        // not all fixes are actionable
+        if (d3_select(this).attr('disabled') || !d.onClick) return;
+
+        // Don't run another fix for this issue within a second of running one
+        // (Necessary for "Select a feature type" fix. Most fixes should only ever run once)
+        if (d.issue.dateLastRanFix && new Date() - d.issue.dateLastRanFix < 1000) return;
+        d.issue.dateLastRanFix = new Date();
+
+        // remove hover-highlighting
+        utilHighlightEntities(d.issue.entityIds.concat(d.entityIds), false, context);
+
+        new Promise(function(resolve, reject) {
+          d.onClick(context, resolve, reject);
+          if (d.onClick.length <= 1) {
+            // if the fix doesn't take any completion parameters then consider it resolved
+            resolve();
+          }
         })
-        .on('focusedIssue.entity_issues', function(issue) {
-             makeActiveIssue(issue.id);
-        });
+        .then(() => validator.validate());   // revalidate after the fix has finished running
+      })
+      .on('mouseover.highlight', function(d3_event, d) {
+          utilHighlightEntities(d.entityIds, true, context);
+      })
+      .on('mouseout.highlight', function(d3_event, d) {
+          utilHighlightEntities(d.entityIds, false, context);
+      });
 
-    function reloadIssues() {
-        _issues = context.validator().getSharedEntityIssues(_entityIDs, { includeDisabledRules: true });
-    }
+    buttons
+      .each((d, i, nodes) => {
+        const iconName = d.icon ?? 'rapid-icon-wrench';
+        d3_select(nodes[i]).call(uiIcon(`#${iconName}`, 'fix-icon'));
+      });
 
-    function makeActiveIssue(issueID) {
-        _activeIssueID = issueID;
-        section.selection().selectAll('.issue-container')
-            .classed('active', function(d) { return d.id === _activeIssueID; });
-    }
+    buttons
+      .append('span')
+      .attr('class', 'fix-message')
+      .html(d => d.title);
 
-    function renderDisclosureContent(selection) {
-
-        selection.classed('grouped-items-area', true);
-
-        _activeIssueID = _issues.length > 0 ? _issues[0].id : null;
-
-        var containers = selection.selectAll('.issue-container')
-            .data(_issues, function(d) { return d.key; });
-
-        // Exit
-        containers.exit()
-            .remove();
-
-        // Enter
-        var containersEnter = containers.enter()
-            .append('div')
-            .attr('class', 'issue-container');
-
-
-        var itemsEnter = containersEnter
-            .append('div')
-            .attr('class', function(d) { return 'issue severity-' + d.severity; })
-            .on('mouseover.highlight', function(d3_event, d) {
-                // don't hover-highlight the selected entity
-                var ids = d.entityIds
-                    .filter(function(e) { return _entityIDs.indexOf(e) === -1; });
-
-                utilHighlightEntities(ids, true, context);
-            })
-            .on('mouseout.highlight', function(d3_event, d) {
-                var ids = d.entityIds
-                    .filter(function(e) { return _entityIDs.indexOf(e) === -1; });
-
-                utilHighlightEntities(ids, false, context);
-            });
-
-        var labelsEnter = itemsEnter
-            .append('div')
-            .attr('class', 'issue-label');
-
-        var textEnter = labelsEnter
-            .append('button')
-            .attr('class', 'issue-text')
-            .on('click', function(d3_event, d) {
-
-                makeActiveIssue(d.id); // expand only the clicked item
-
-                var extent = d.extent(context.graph());
-                if (extent) {
-                    var setZoom = Math.max(context.map().zoom(), 19);
-                    context.map().centerZoomEase(extent.center(), setZoom);
-                }
-            });
-
-        textEnter
-            .each(function(d) {
-                var iconName = '#rapid-icon-' + (d.severity === 'warning' ? 'alert' : 'error');
-                d3_select(this)
-                    .call(uiIcon(iconName, 'issue-icon'));
-            });
-
-        textEnter
-            .append('span')
-            .attr('class', 'issue-message');
-
-
-        var infoButton = labelsEnter
-            .append('button')
-            .attr('class', 'issue-info-button')
-            .attr('title', t('icons.information'))
-            .call(uiIcon('#rapid-icon-inspect'));
-
-        infoButton
-            .on('click', function (d3_event) {
-                d3_event.stopPropagation();
-                d3_event.preventDefault();
-                this.blur();    // avoid keeping focus on the button - #4641
-
-                var container = d3_select(this.parentNode.parentNode.parentNode);
-                var info = container.selectAll('.issue-info');
-                var isExpanded = info.classed('expanded');
-                _expanded = !isExpanded;
-                prefs('entity-issues.reference.expanded', _expanded);  // update preference
-
-                if (isExpanded) {
-                    info
-                        .transition()
-                        .duration(200)
-                        .style('max-height', '0px')
-                        .style('opacity', '0')
-                        .on('end', function () {
-                            info.classed('expanded', false);
-                        });
-                } else {
-                    info
-                        .classed('expanded', true)
-                        .transition()
-                        .duration(200)
-                        .style('max-height', '200px')
-                        .style('opacity', '1')
-                        .on('end', function () {
-                            info.style('max-height', null);
-                        });
-                }
-            });
-
-        itemsEnter
-            .append('ul')
-            .attr('class', 'issue-fix-list');
-
-        containersEnter
-            .append('div')
-            .attr('class', 'issue-info' + (_expanded ? ' expanded' : ''))
-            .style('max-height', (_expanded ? null : '0'))
-            .style('opacity', (_expanded ? '1' : '0'))
-            .each(function(d) {
-                if (typeof d.reference === 'function') {
-                    d3_select(this)
-                        .call(d.reference);
-                } else {
-                    d3_select(this)
-                        .html(t.html('inspector.no_documentation_key'));
-                }
-            });
-
-
-        // Update
-        containers = containers
-            .merge(containersEnter)
-            .classed('active', function(d) { return d.id === _activeIssueID; });
-
-        containers.selectAll('.issue-message')
-            .html(function(d) {
-                return d.message(context);
-            });
-
-        // fixes
-        var fixLists = containers.selectAll('.issue-fix-list');
-
-        var fixes = fixLists.selectAll('.issue-fix-item')
-            .data(function(d) { return d.fixes ? d.fixes(context) : []; }, function(fix) { return fix.id; });
-
-        fixes.exit()
-            .remove();
-
-        var fixesEnter = fixes.enter()
-            .append('li')
-            .attr('class', 'issue-fix-item');
-
-        var buttons = fixesEnter
-            .append('button')
-            .on('click', function(d3_event, d) {
-                // not all fixes are actionable
-                if (d3_select(this).attr('disabled') || !d.onClick) return;
-
-                // Don't run another fix for this issue within a second of running one
-                // (Necessary for "Select a feature type" fix. Most fixes should only ever run once)
-                if (d.issue.dateLastRanFix && new Date() - d.issue.dateLastRanFix < 1000) return;
-                d.issue.dateLastRanFix = new Date();
-
-                // remove hover-highlighting
-                utilHighlightEntities(d.issue.entityIds.concat(d.entityIds), false, context);
-
-                new Promise(function(resolve, reject) {
-                    d.onClick(context, resolve, reject);
-                    if (d.onClick.length <= 1) {
-                        // if the fix doesn't take any completion parameters then consider it resolved
-                        resolve();
-                    }
-                })
-                .then(function() {
-                    // revalidate whenever the fix has finished running successfully
-                    context.validator().validate();
-                });
-            })
-            .on('mouseover.highlight', function(d3_event, d) {
-                utilHighlightEntities(d.entityIds, true, context);
-            })
-            .on('mouseout.highlight', function(d3_event, d) {
-                utilHighlightEntities(d.entityIds, false, context);
-            });
-
-        buttons
-            .each(function(d) {
-                var iconName = d.icon || 'rapid-icon-wrench';
-                d3_select(this).call(uiIcon(`#${iconName}`, 'fix-icon'));
-            });
-
-        buttons
-            .append('span')
-            .attr('class', 'fix-message')
-            .html(function(d) { return d.title; });
-
-        fixesEnter.merge(fixes)
-            .selectAll('button')
-            .classed('actionable', function(d) {
-                return d.onClick;
-            })
-            .attr('disabled', function(d) {
-                return d.onClick ? null : 'true';
-            })
-            .attr('title', function(d) {
-                if (d.disabledReason) {
-                    return d.disabledReason;
-                }
-                return null;
-            });
-    }
+    fixesEnter.merge(fixes)
+      .selectAll('button')
+      .classed('actionable', d => typeof d.onClick === 'function')
+      .attr('disabled', d => typeof d.onClick === 'function' ? null : 'true')
+      .attr('title', d => d.disabledReason ?? null);
+  }
 
-    section.entityIDs = function(val) {
-        if (!arguments.length) return _entityIDs;
-        if (!_entityIDs || !val || !utilArrayIdentical(_entityIDs, val)) {
-            _entityIDs = val;
-            _activeIssueID = null;
-            reloadIssues();
-        }
-        return section;
-    };
 
+  const _onValidated = () => {
+    reloadIssues();   // Refresh on validated events
+    section.reRender();
+  };
+
+  const _onFocused = (issue) => {
+    makeActiveIssue(issue.id);
+  };
+
+
+  // do we need to .off?  not sure!  I think this component stays around forever?
+  validator.on('validated', _onValidated);
+  validator.on('focusedIssue', _onFocused);
+
+
+
+  section.entityIDs = function(val) {
+    if (val === undefined) return _entityIDs;
+
+    if (!_entityIDs || !val || !utilArrayIdentical(_entityIDs, val)) {
+      _entityIDs = val;
+      _activeIssueID = null;
+      reloadIssues();
+    }
     return section;
+  };
+
+
+  return section;
 }
diff --git a/modules/ui/sections/feature_type.js b/modules/ui/sections/feature_type.js
index c1950ca5f8..1fd2fec6fb 100644
--- a/modules/ui/sections/feature_type.js
+++ b/modules/ui/sections/feature_type.js
@@ -1,8 +1,6 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { utilArrayIdentical } from '@rapid-sdk/util';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { utilRebind } from '../../util';
 import { uiPresetIcon } from '../preset_icon';
@@ -11,142 +9,138 @@ import { uiTagReference } from '../tag_reference';
 
 
 export function uiSectionFeatureType(context) {
-
-    var dispatch = d3_dispatch('choose');
-
-    var _entityIDs = [];
-    var _presets = [];
-
-    var _tagReference;
-
-    var section = uiSection('feature-type', context)
-        .label(t.html('inspector.feature_type'))
-        .disclosureContent(renderDisclosureContent);
-
-    function renderDisclosureContent(selection) {
-
-        selection.classed('preset-list-item', true);
-        selection.classed('mixed-types', _presets.length > 1);
-
-        var presetButtonWrap = selection
-            .selectAll('.preset-list-button-wrap')
-            .data([0])
-            .enter()
-            .append('div')
-            .attr('class', 'preset-list-button-wrap');
-
-        var presetButton = presetButtonWrap
-            .append('button')
-            .attr('class', 'preset-list-button preset-reset')
-            .call(uiTooltip()
-                .title(t.html('inspector.back_tooltip'))
-                .placement('bottom')
-            );
-
-        presetButton.append('div')
-            .attr('class', 'preset-icon-container');
-
-        presetButton
-            .append('div')
-            .attr('class', 'label')
-            .append('div')
-            .attr('class', 'label-inner');
-
-        presetButtonWrap.append('div')
-            .attr('class', 'accessory-buttons');
-
-        var tagReferenceBodyWrap = selection
-            .selectAll('.tag-reference-body-wrap')
-            .data([0]);
-
-        tagReferenceBodyWrap = tagReferenceBodyWrap
-            .enter()
-            .append('div')
-            .attr('class', 'tag-reference-body-wrap')
-            .merge(tagReferenceBodyWrap);
-
-        // update header
-        if (_tagReference) {
-            selection.selectAll('.preset-list-button-wrap .accessory-buttons')
-                .style('display', _presets.length === 1 ? null : 'none')
-                .call(_tagReference.button);
-
-            tagReferenceBodyWrap
-                .style('display', _presets.length === 1 ? null : 'none')
-                .call(_tagReference.body);
-        }
-
-        selection.selectAll('.preset-reset')
-            .on('click', function() {
-                 dispatch.call('choose', this, _presets);
-            })
-            .on('pointerdown pointerup mousedown mouseup', function(d3_event) {
-                d3_event.preventDefault();
-                d3_event.stopPropagation();
-            });
-
-        var geometries = entityGeometries();
-        selection.select('.preset-list-item button')
-            .call(uiPresetIcon()
-                .geometry(_presets.length === 1 ? (geometries.length === 1 && geometries[0]) : null)
-                .preset(_presets.length === 1 ? _presets[0] : presetManager.item('point'))
-            );
-
-        var names = _presets.length === 1 ? [
-            _presets[0].nameLabel(),
-            _presets[0].subtitleLabel()
-        ].filter(Boolean) : [t('inspector.multiple_types')];
-
-        var label = selection.select('.label-inner');
-        var nameparts = label.selectAll('.namepart')
-            .data(names, function(d) { return d; });
-
-        nameparts.exit()
-            .remove();
-
-        nameparts
-            .enter()
-            .append('div')
-            .attr('class', 'namepart')
-            .html(function(d) { return d; });
+  const dispatch = d3_dispatch('choose');
+
+  let _entityIDs = [];
+  let _presets = [];
+  let _tagReference;
+
+  let section = uiSection('feature-type', context)
+    .label(context.tHtml('inspector.feature_type'))
+    .disclosureContent(renderDisclosureContent);
+
+
+  function renderDisclosureContent(selection) {
+    selection.classed('preset-list-item', true);
+    selection.classed('mixed-types', _presets.length > 1);
+
+    let presetButtonWrap = selection
+      .selectAll('.preset-list-button-wrap')
+      .data([0])
+      .enter()
+      .append('div')
+      .attr('class', 'preset-list-button-wrap');
+
+    let presetButton = presetButtonWrap
+      .append('button')
+      .attr('class', 'preset-list-button preset-reset')
+      .call(uiTooltip(context)
+        .title(context.tHtml('inspector.back_tooltip'))
+        .placement('bottom')
+      );
+
+    presetButton.append('div')
+      .attr('class', 'preset-icon-container');
+
+    presetButton
+      .append('div')
+      .attr('class', 'label')
+      .append('div')
+      .attr('class', 'label-inner');
+
+    presetButtonWrap.append('div')
+      .attr('class', 'accessory-buttons');
+
+    let tagReferenceBodyWrap = selection
+      .selectAll('.tag-reference-body-wrap')
+      .data([0]);
+
+    tagReferenceBodyWrap = tagReferenceBodyWrap
+      .enter()
+      .append('div')
+      .attr('class', 'tag-reference-body-wrap')
+      .merge(tagReferenceBodyWrap);
+
+    // update header
+    if (_tagReference) {
+      selection.selectAll('.preset-list-button-wrap .accessory-buttons')
+        .style('display', _presets.length === 1 ? null : 'none')
+        .call(_tagReference.button);
+
+      tagReferenceBodyWrap
+        .style('display', _presets.length === 1 ? null : 'none')
+        .call(_tagReference.body);
     }
 
-    section.entityIDs = function(val) {
-        if (!arguments.length) return _entityIDs;
-        _entityIDs = val;
-        return section;
-    };
-
-    section.presets = function(val) {
-        if (!arguments.length) return _presets;
-
-        // don't reload the same preset
-        if (!utilArrayIdentical(val, _presets)) {
-            _presets = val;
-
-            if (_presets.length === 1) {
-                _tagReference = uiTagReference(_presets[0].reference(), context)
-                    .showing(false);
-            }
-        }
-
-        return section;
-    };
+    selection.selectAll('.preset-reset')
+      .on('click', function() {
+         dispatch.call('choose', this, _presets);
+      })
+      .on('pointerdown pointerup mousedown mouseup', function(d3_event) {
+        d3_event.preventDefault();
+        d3_event.stopPropagation();
+      });
+
+    let geometries = entityGeometries();
+    selection.select('.preset-list-item button')
+      .call(uiPresetIcon(context)
+        .geometry(_presets.length === 1 ? (geometries.length === 1 && geometries[0]) : null)
+        .preset(_presets.length === 1 ? _presets[0] : context.presetSystem().item('point'))
+      );
+
+    let names = _presets.length === 1 ? [
+      _presets[0].nameLabel(),
+      _presets[0].subtitleLabel()
+    ].filter(Boolean) : [context.t('inspector.multiple_types')];
+
+    let label = selection.select('.label-inner');
+    let nameparts = label.selectAll('.namepart')
+      .data(names, d => d);
+
+    nameparts.exit()
+      .remove();
+
+    nameparts
+      .enter()
+      .append('div')
+      .attr('class', 'namepart')
+      .html(d => d);
+  }
+
+  section.entityIDs = function(val) {
+    if (!arguments.length) return _entityIDs;
+    _entityIDs = val;
+    return section;
+  };
+
+  section.presets = function(val) {
+    if (!arguments.length) return _presets;
+
+    // don't reload the same preset
+    if (!utilArrayIdentical(val, _presets)) {
+      _presets = val;
+
+      if (_presets.length === 1) {
+        _tagReference = uiTagReference(context, _presets[0].reference()).showing(false);
+      }
+    }
 
-    function entityGeometries() {
+    return section;
+  };
 
-        var counts = {};
 
-        for (var i in _entityIDs) {
-            var geometry = context.graph().geometry(_entityIDs[i]);
-            if (!counts[geometry]) counts[geometry] = 0;
-            counts[geometry] += 1;
-        }
+  function entityGeometries() {
+    let counts = {};
 
-        return Object.keys(counts).sort(function(geom1, geom2) {
-            return counts[geom2] - counts[geom1];
-        });
+    for (const entityID of _entityIDs) {
+      const geometry = context.graph().geometry(entityID);
+      if (!counts[geometry]) counts[geometry] = 0;
+      counts[geometry] += 1;
     }
 
-    return utilRebind(section, dispatch, 'on');
+    return Object.keys(counts)
+      .sort((geom1, geom2) => counts[geom2] - counts[geom1]);
+  }
+
+  return utilRebind(section, dispatch, 'on');
 }
diff --git a/modules/ui/sections/grid_display_options.js b/modules/ui/sections/grid_display_options.js
index bc749b52fa..dbdce28476 100644
--- a/modules/ui/sections/grid_display_options.js
+++ b/modules/ui/sections/grid_display_options.js
@@ -1,81 +1,80 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../../core/localizer';
 import { uiSection } from '../section';
 
 
 export function uiSectionGridDisplayOptions(context) {
-
-    var section = uiSection('grid-display-options', context)
-        .label(t('background.grid.grids'))
-        .disclosureContent(gridDisplayOptions);
-
-
-    function chooseGrid(d3_event, d) {
-        d3_event.preventDefault();
-        context.imagery().numGridSplits = d.numSplit;
-    }
-
-
-    function render(selection) {
-        // the grid list
-        var container = selection.selectAll('.layer-grid-list')
-            .data([0]);
-
-        var gridList = container.enter()
-            .append('ul')
-            .attr('class', 'layer-list layer-grid-list')
-            .attr('dir', 'auto')
-            .merge(container);
-
-            var gridItems = gridList.selectAll('li')
-                .data(
-                    [{ numSplit: 0, name: t('background.grid.no_grid')},
-                     { numSplit: 2, name: t('background.grid.n_by_n', { num: 2 }) },
-                     { numSplit: 3, name: t('background.grid.n_by_n', { num: 3 }) },
-                     { numSplit: 4, name: t('background.grid.n_by_n', { num: 4 }) },
-                     { numSplit: 5, name: t('background.grid.n_by_n', { num: 5 }) },
-                     { numSplit: 6, name: t('background.grid.n_by_n', { num: 6 }) }],
-                    function(d) { return d.name; }
-                );
-
-            var enter = gridItems.enter()
-                .insert('li', '.custom-gridsopt')
-                .attr('class', 'gridsopt');
-
-            var label = enter.append('label');
-            label.append('input')
-                .attr('type', 'radio')
-                .attr('name', 'grids')
-                .property('checked', function(d) {
-                    return (d.numSplit === context.imagery().numGridSplits);
-                })
-                .on('change', chooseGrid);
-
-            label.append('span')
-                .text(function(d) { return d.name; });
-
-            gridItems.exit()
-                .remove();
-        }
-
-
-    function gridDisplayOptions(selection) {
-        var gridOptionsSection = d3_select('.section-grid-display-options');
-
-        context.rapidContext().on('task_extent_set.grid_display_options', function() {
-            if (context.rapidContext().isTaskRectangular()) {
-                gridOptionsSection.classed('hide', false);
-                selection.call(render);
-            }
-        });
-
-        if (!context.rapidContext().isTaskRectangular()){
-            gridOptionsSection.classed('hide', true);
-            return;
-        }
+  const imagerySystem = context.imagerySystem();
+  const rapid = context.rapidSystem();
+
+  let section = uiSection('grid-display-options', context)
+    .label(context.t('background.grid.grids'))
+    .disclosureContent(gridDisplayOptions);
+
+  const gridData = [
+    { numSplit: 0, name: context.t('background.grid.no_grid')},
+    { numSplit: 2, name: context.t('background.grid.n_by_n', { num: 2 }) },
+    { numSplit: 3, name: context.t('background.grid.n_by_n', { num: 3 }) },
+    { numSplit: 4, name: context.t('background.grid.n_by_n', { num: 4 }) },
+    { numSplit: 5, name: context.t('background.grid.n_by_n', { num: 5 }) },
+    { numSplit: 6, name: context.t('background.grid.n_by_n', { num: 6 }) }
+  ];
+
+  function chooseGrid(d3_event, d) {
+    d3_event.preventDefault();
+    imagerySystem.numGridSplits = d.numSplit;
+  }
+
+
+  function render(selection) {
+    let container = selection.selectAll('.layer-grid-list')
+      .data([0]);
+
+    let gridList = container.enter()
+      .append('ul')
+      .attr('class', 'layer-list layer-grid-list')
+      .attr('dir', 'auto')
+      .merge(container);
+
+    let gridItems = gridList.selectAll('li')
+      .data(gridData, d => d.name);
+
+    let enter = gridItems.enter()
+      .insert('li', '.custom-gridsopt')
+      .attr('class', 'gridsopt');
+
+    let label = enter.append('label');
+
+    label.append('input')
+      .attr('type', 'radio')
+      .attr('name', 'grids')
+      .property('checked', d => d.numSplit === imagerySystem.numGridSplits)
+      .on('change', chooseGrid);
+
+    label.append('span')
+      .text(d => d.name);
+
+    gridItems.exit()
+      .remove();
+  }
+
+
+  function gridDisplayOptions(selection) {
+    let gridOptionsSection = d3_select('.section-grid-display-options');
+
+    rapid.on('taskchanged', () => {
+      if (rapid.isTaskRectangular()) {
+        gridOptionsSection.classed('hide', false);
+        selection.call(render);
+      }
+    });
+
+    if (!rapid.isTaskRectangular()) {
+      gridOptionsSection.classed('hide', true);
+      return;
     }
+  }
 
 
-    return section;
+  return section;
 }
diff --git a/modules/ui/sections/map_features.js b/modules/ui/sections/map_features.js
index d36179a540..6f8ca9f72c 100644
--- a/modules/ui/sections/map_features.js
+++ b/modules/ui/sections/map_features.js
@@ -1,16 +1,14 @@
-import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { uiSection } from '../section';
 
 
 export function uiSectionMapFeatures(context) {
+  const filterSystem = context.filterSystem();
   const section = uiSection('map-features', context)
-    .label(t.html('map_data.map_features'))
+    .label(context.tHtml('map_data.map_features'))
     .disclosureContent(renderDisclosureContent)
     .expandedByDefault(false);
 
-  const featureKeys = context.features().keys();
-
 
   function renderDisclosureContent(selection) {
     let container = selection.selectAll('.layer-feature-list-container')
@@ -32,20 +30,20 @@ export function uiSectionMapFeatures(context) {
       .append('a')
       .attr('class', 'feature-list-link')
       .attr('href', '#')
-      .html(t.html('issues.disable_all'))
+      .html(context.tHtml('issues.disable_all'))
       .on('click', d3_event => {
         d3_event.preventDefault();
-        context.features().disableAll();
+        filterSystem.disableAll();
       });
 
     footer
       .append('a')
       .attr('class', 'feature-list-link')
       .attr('href', '#')
-      .html(t.html('issues.enable_all'))
+      .html(context.tHtml('issues.enable_all'))
       .on('click', d3_event => {
         d3_event.preventDefault();
-        context.features().enableAll();
+        filterSystem.enableAll();
       });
 
     // Update
@@ -53,7 +51,7 @@ export function uiSectionMapFeatures(context) {
       .merge(containerEnter);
 
     container.selectAll('.layer-feature-list')
-      .call(drawListItems, featureKeys, 'checkbox', 'feature', clickFeature, showsFeature);
+      .call(drawListItems, filterSystem.keys, 'checkbox', 'feature', clickFeature, showsFeature);
   }
 
 
@@ -68,15 +66,8 @@ export function uiSectionMapFeatures(context) {
     // Enter
     let enter = items.enter()
       .append('li')
-      .call(uiTooltip()
-        .title(function(d) {
-          let tip = t.html(`${name}.${d}.tooltip`);
-          if (autoHiddenFeature(d)) {
-            const msg = showsLayer('osm') ? t.html('map_data.autohidden') : t.html('map_data.osmhidden');
-            tip += `<div>${msg}</div>`;
-          }
-          return tip;
-        })
+      .call(uiTooltip(context)
+        .title(d => context.tHtml(`${name}.${d}.tooltip`))
         .placement('top')
       );
 
@@ -91,7 +82,7 @@ export function uiSectionMapFeatures(context) {
 
     label
       .append('span')
-      .html(d => t.html(`${name}.${d}.description`));
+      .html(d => context.tHtml(`${name}.${d}.description`));
 
     // Update
     items = items
@@ -100,20 +91,15 @@ export function uiSectionMapFeatures(context) {
     items
       .classed('active', active)
       .selectAll('input')
-      .property('checked', active)
-      .property('indeterminate', autoHiddenFeature);
-  }
-
-  function autoHiddenFeature(d) {
-    return context.features().autoHidden(d);
+      .property('checked', active);
   }
 
   function showsFeature(d) {
-    return context.features().enabled(d);
+    return filterSystem.isEnabled(d);
   }
 
   function clickFeature(d3_event, d) {
-    context.features().toggle(d);
+    filterSystem.toggle(d);
   }
 
   function showsLayer(id) {
@@ -122,8 +108,7 @@ export function uiSectionMapFeatures(context) {
   }
 
 
-  context.features()
-    .on('change.map_features', section.reRender);
+  filterSystem.on('filterchange', section.reRender);
 
   return section;
 }
diff --git a/modules/ui/sections/map_interaction_options.js b/modules/ui/sections/map_interaction_options.js
index 8a5798bee6..ec4e4de30e 100644
--- a/modules/ui/sections/map_interaction_options.js
+++ b/modules/ui/sections/map_interaction_options.js
@@ -1,12 +1,11 @@
-import { t } from '../../core/localizer';
-import { prefs } from '../../core/preferences';
 import { uiTooltip } from '../tooltip';
 import { uiSection } from '../section';
 
 
 export function uiSectionMapInteractionOptions(context) {
+  const prefs = context.storageSystem();
   const section = uiSection('map-interaction', context)
-    .label(t.html('preferences.map_interaction.title'))
+    .label(context.tHtml('preferences.map_interaction.title'))
     .disclosureContent(renderDisclosureContent)
     .expandedByDefault(true);
 
@@ -25,7 +24,7 @@ export function uiSectionMapInteractionOptions(context) {
     enter
       .append('div')
       .attr('class', 'mouse-wheel-title')
-      .text(t('preferences.map_interaction.mouse_wheel.title'));
+      .text(context.t('preferences.map_interaction.mouse_wheel.title'));
 
     enter
       .append('ul')
@@ -50,8 +49,8 @@ export function uiSectionMapInteractionOptions(context) {
     // Enter
     let enter = items.enter()
       .append('li')
-      .call(uiTooltip()
-        .title(d => t(`preferences.map_interaction.${name}.${d}.tooltip`))
+      .call(uiTooltip(context)
+        .title(d => context.t(`preferences.map_interaction.${name}.${d}.tooltip`))
         .placement('top')
       );
 
@@ -66,7 +65,7 @@ export function uiSectionMapInteractionOptions(context) {
 
     label
       .append('span')
-      .text(d => t(`preferences.map_interaction.${name}.${d}.title`));
+      .text(d => context.t(`preferences.map_interaction.${name}.${d}.title`));
 
     // Update
     items.merge(enter)
@@ -78,12 +77,12 @@ export function uiSectionMapInteractionOptions(context) {
 
 
   function isActiveWheelOption(d) {
-    const curr = prefs('prefs.mouse_wheel.interaction') ?? 'auto';
+    const curr = prefs.getItem('prefs.mouse_wheel.interaction') ?? 'auto';
     return curr === d;
   }
 
   function setWheelOption(d3_event, d) {
-    prefs('prefs.mouse_wheel.interaction', d);
+    prefs.setItem('prefs.mouse_wheel.interaction', d);
     section.reRender();
   }
 
diff --git a/modules/ui/sections/map_style_options.js b/modules/ui/sections/map_style_options.js
index a346991fc2..904da9ba2f 100644
--- a/modules/ui/sections/map_style_options.js
+++ b/modules/ui/sections/map_style_options.js
@@ -1,11 +1,10 @@
-import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { uiSection } from '../section';
 
 
 export function uiSectionMapStyleOptions(context) {
   const section = uiSection('fill-area', context)
-      .label(t.html('map_data.style_options'))
+      .label(context.tHtml('map_data.style_options'))
       .disclosureContent(renderDisclosureContent)
       .expandedByDefault(false);
 
@@ -18,7 +17,7 @@ export function uiSectionMapStyleOptions(context) {
       .append('ul')
       .attr('class', 'layer-list layer-fill-list')
       .merge(container)
-      .call(drawListItems, context.map().areaFillOptions, 'radio', 'area_fill', setFill, isActiveFill);
+      .call(drawListItems, context.mapSystem().areaFillOptions, 'radio', 'area_fill', setFill, isActiveFill);
 
     let container2 = selection.selectAll('.layer-visual-diff-list')
       .data([0]);
@@ -42,12 +41,12 @@ export function uiSectionMapStyleOptions(context) {
     // Enter
     let enter = items.enter()
       .append('li')
-      .call(uiTooltip()
-        .title(d => t.html(`${name}.${d}.tooltip`))
+      .call(uiTooltip(context)
+        .title(d => context.tHtml(`${name}.${d}.tooltip`))
         .keys(d => {
-          let key = (d === 'wireframe' ? t('area_fill.wireframe.key') : null);
+          let key = (d === 'wireframe' ? context.t('area_fill.wireframe.key') : null);
           if (d === 'highlight_edits') {
-            key = t('map_data.highlight_edits.key');
+            key = context.t('map_data.highlight_edits.key');
           }
           return key ? [key] : null;
         })
@@ -65,7 +64,7 @@ export function uiSectionMapStyleOptions(context) {
 
     label
       .append('span')
-      .html(d => t.html(`${name}.${d}.description`));
+      .html(d => context.tHtml(`${name}.${d}.description`));
 
     // Update
     items = items
@@ -80,24 +79,24 @@ export function uiSectionMapStyleOptions(context) {
 
 
   function isActiveFill(d) {
-    return context.map().areaFillMode === d;
+    return context.mapSystem().areaFillMode === d;
   }
 
   function setFill(d3_event, d) {
-    context.map().areaFillMode = d;
+    context.mapSystem().areaFillMode = d;
   }
 
   function isHighlightChecked() {
-    return context.map().highlightEdits;
+    return context.mapSystem().highlightEdits;
   }
 
   function setHighlighted(d3_event) {
     const input = d3_event.currentTarget;
-    context.map().highlightEdits = input.checked;
+    context.mapSystem().highlightEdits = input.checked;
   }
 
 
-  context.map().on('mapchange', section.reRender);
+  context.mapSystem().on('mapchange', section.reRender);
 
   return section;
 }
diff --git a/modules/ui/sections/overlay_list.js b/modules/ui/sections/overlay_list.js
index 7ca007aef7..cd87ecd83f 100644
--- a/modules/ui/sections/overlay_list.js
+++ b/modules/ui/sections/overlay_list.js
@@ -1,15 +1,15 @@
-import _debounce from 'lodash-es/debounce';
 import { descending as d3_descending, ascending as d3_ascending } from 'd3-array';
 import { select as d3_select } from 'd3-selection';
+import debounce from 'lodash-es/debounce';
 
-import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { uiSection } from '../section';
 
 
 export function uiSectionOverlayList(context) {
+  const imagerySystem = context.imagerySystem();
   const section = uiSection('overlay-list', context)
-    .label(t.html('background.overlays'))
+    .label(context.tHtml('background.overlays'))
     .disclosureContent(renderDisclosureContent);
 
   let _overlayList = d3_select(null);
@@ -21,10 +21,10 @@ export function uiSectionOverlayList(context) {
       const placement = (i < nodes.length / 2) ? 'bottom' : 'top';
       const isOverflowing = (span.property('clientWidth') !== span.property('scrollWidth'));
 
-      item.call(uiTooltip().destroyAny);
+      item.call(uiTooltip(context).destroyAny);
 
       if (d.description || isOverflowing) {
-        item.call(uiTooltip()
+        item.call(uiTooltip(context)
           .placement(placement)
           .title(d.description || d.name)
         );
@@ -35,7 +35,7 @@ export function uiSectionOverlayList(context) {
 
   function updateLayerSelections(selection) {
     function isActive(d) {
-      return context.imagery().showsLayer(d);
+      return imagerySystem.showsLayer(d);
     }
 
     selection.selectAll('li')
@@ -47,8 +47,8 @@ export function uiSectionOverlayList(context) {
 
 
   function drawListItems(layerList, type, change, filter) {
-    let sources = context.imagery()
-      .sources(context.map().extent(), context.map().zoom())
+    let sources = imagerySystem
+      .sources(context.mapSystem().extent(), context.mapSystem().zoom())
       .filter(filter);
 
     let layerLinks = layerList.selectAll('li')
@@ -91,7 +91,7 @@ export function uiSectionOverlayList(context) {
 
   function chooseOverlay(d3_event, d) {
     d3_event.preventDefault();
-    context.imagery().toggleOverlayLayer(d);
+    imagerySystem.toggleOverlayLayer(d);
     _overlayList.call(updateLayerSelections);
   }
 
@@ -114,11 +114,11 @@ export function uiSectionOverlayList(context) {
   }
 
 
-  context.imagery()
+  imagerySystem
     .on('imagerychange', () => section.reRender);
 
-  context.map()
-    .on('draw', _debounce(() => {
+  context.mapSystem()
+    .on('draw', debounce(() => {
       // layers in-view may have changed due to map move
       window.requestIdleCallback(section.reRender);
     }, 1000)
diff --git a/modules/ui/sections/photo_overlays.js b/modules/ui/sections/photo_overlays.js
index 46ff0b517d..4f1373184c 100644
--- a/modules/ui/sections/photo_overlays.js
+++ b/modules/ui/sections/photo_overlays.js
@@ -1,14 +1,14 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { uiSection } from '../section';
 import { utilGetSetValue, utilNoAuto } from '../../util';
 
 
 export function uiSectionPhotoOverlays(context) {
+  const photoSystem = context.photoSystem();
   const section = uiSection('photo-overlays', context)
-    .label(t.html('photo_overlays.title'))
+    .label(context.tHtml('photo_overlays.title'))
     .disclosureContent(renderDisclosureContent)
     .expandedByDefault(false);
 
@@ -55,7 +55,7 @@ export function uiSectionPhotoOverlays(context) {
 
 
   function drawPhotoItems(selection) {
-    const photoKeys = context.photos().overlayLayerIDs;
+    const photoKeys = photoSystem.overlayLayerIDs;
     const photoLayers = photoKeys.map(layerID => scene.layers.get(layerID)).filter(Boolean);
     const data = photoLayers.filter(layer => layer.supported);
 
@@ -100,8 +100,8 @@ export function uiSectionPhotoOverlays(context) {
         else if (d.id === 'kartaview') titleID = 'kartaview_images.tooltip';
         else titleID = d.id.replace(/-/g, '_') + '.tooltip';
         d3_select(nodes[i])
-          .call(uiTooltip()
-            .title(t.html(titleID))
+          .call(uiTooltip(context)
+            .title(context.tHtml(titleID))
             .placement('top')
           );
       });
@@ -116,7 +116,7 @@ export function uiSectionPhotoOverlays(context) {
       .html(d => {
         let titleID = d.id;
         if (titleID === 'mapillary-signs') titleID = 'photo_overlays.traffic_signs';
-        return t.html(titleID.replace(/-/g, '_') + '.title');
+        return context.tHtml(titleID.replace(/-/g, '_') + '.title');
       });
 
     // Update
@@ -129,10 +129,10 @@ export function uiSectionPhotoOverlays(context) {
 
 
   function drawPhotoTypeItems(selection) {
-    const photoTypes = context.photos().allPhotoTypes;
+    const photoTypes = photoSystem.allPhotoTypes;
 
     function typeEnabled(d) {
-      return context.photos().showsPhotoType(d);
+      return photoSystem.showsPhotoType(d);
     }
 
     let ul = selection
@@ -148,7 +148,7 @@ export function uiSectionPhotoOverlays(context) {
       .merge(ul);
 
     let li = ul.selectAll('.list-item-photo-types')
-      .data(context.photos().shouldFilterByPhotoType() ? photoTypes : []);
+      .data(photoSystem.shouldFilterByPhotoType() ? photoTypes : []);
 
     li.exit()
       .remove();
@@ -161,8 +161,8 @@ export function uiSectionPhotoOverlays(context) {
       .append('label')
       .each(function(d) {
         d3_select(this)
-          .call(uiTooltip()
-            .title(t.html(`photo_overlays.photo_type.${d}.tooltip`))
+          .call(uiTooltip(context)
+            .title(context.tHtml(`photo_overlays.photo_type.${d}.tooltip`))
             .placement('top')
           );
       });
@@ -170,11 +170,11 @@ export function uiSectionPhotoOverlays(context) {
     labelEnter
       .append('input')
       .attr('type', 'checkbox')
-      .on('change', (d3_event, d) => context.photos().togglePhotoType(d));
+      .on('change', (d3_event, d) => photoSystem.togglePhotoType(d));
 
     labelEnter
       .append('span')
-      .html(d => t.html(`photo_overlays.photo_type.${d}.title`));
+      .html(d => context.tHtml(`photo_overlays.photo_type.${d}.title`));
 
     // Update
     li
@@ -186,10 +186,10 @@ export function uiSectionPhotoOverlays(context) {
 
 
   function drawDateFilter(selection) {
-    const dateFilterTypes = context.photos().dateFilters;
+    const dateFilterTypes = photoSystem.dateFilters;
 
     function filterEnabled(d) {
-      return context.photos().dateFilterValue(d);
+      return photoSystem.dateFilterValue(d);
     }
 
     let ul = selection
@@ -205,7 +205,7 @@ export function uiSectionPhotoOverlays(context) {
       .merge(ul);
 
     let li = ul.selectAll('.list-item-date-filter')
-      .data(context.photos().shouldFilterByDate() ? dateFilterTypes : []);
+      .data(photoSystem.shouldFilterByDate() ? dateFilterTypes : []);
 
     li.exit()
       .remove();
@@ -218,32 +218,32 @@ export function uiSectionPhotoOverlays(context) {
       .append('label')
       .each((d, i, nodes) => {
         d3_select(nodes[i])
-          .call(uiTooltip()
-            .title(t.html(`photo_overlays.date_filter.${d}.tooltip`))
+          .call(uiTooltip(context)
+            .title(context.tHtml(`photo_overlays.date_filter.${d}.tooltip`))
             .placement('top')
           );
       });
 
     labelEnter
       .append('span')
-      .html(d => t.html(`photo_overlays.date_filter.${d}.title`));
+      .html(d => context.tHtml(`photo_overlays.date_filter.${d}.title`));
 
     labelEnter
       .append('input')
       .attr('type', 'date')
       .attr('class', 'list-item-input')
-      .attr('placeholder', t('units.year_month_day'))
+      .attr('placeholder', context.t('units.year_month_day'))
       .call(utilNoAuto)
       .each((d, i, nodes) => {
-        utilGetSetValue(d3_select(nodes[i]), context.photos().dateFilterValue(d) || '');
+        utilGetSetValue(d3_select(nodes[i]), photoSystem.dateFilterValue(d) || '');
       })
       .on('change', function(d3_event, d) {
         let value = utilGetSetValue(d3_select(this)).trim();
-        context.photos().setDateFilter(d, value, true);
+        photoSystem.setDateFilter(d, value, true);
         // reload the displayed dates
         li.selectAll('input')
           .each(function(d) {
-            utilGetSetValue(d3_select(this), context.photos().dateFilterValue(d) || '');
+            utilGetSetValue(d3_select(this), photoSystem.dateFilterValue(d) || '');
           });
       });
 
@@ -255,7 +255,7 @@ export function uiSectionPhotoOverlays(context) {
 
   function drawUsernameFilter(selection) {
     function filterEnabled() {
-      return context.photos().usernames;
+      return photoSystem.usernames;
     }
 
     let ul = selection
@@ -271,7 +271,7 @@ export function uiSectionPhotoOverlays(context) {
       .merge(ul);
 
     let li = ul.selectAll('.list-item-username-filter')
-      .data(context.photos().shouldFilterByUsername() ? ['username-filter'] : []);
+      .data(photoSystem.shouldFilterByUsername() ? ['username-filter'] : []);
 
     li.exit()
       .remove();
@@ -284,15 +284,15 @@ export function uiSectionPhotoOverlays(context) {
       .append('label')
       .each((d, i, nodes) => {
         d3_select(nodes[i])
-          .call(uiTooltip()
-            .title(t.html('photo_overlays.username_filter.tooltip'))
+          .call(uiTooltip(context)
+            .title(context.tHtml('photo_overlays.username_filter.tooltip'))
             .placement('top')
           );
       });
 
     labelEnter
       .append('span')
-      .html(t.html('photo_overlays.username_filter.title'));
+      .html(context.tHtml('photo_overlays.username_filter.title'));
 
     labelEnter
       .append('input')
@@ -302,7 +302,7 @@ export function uiSectionPhotoOverlays(context) {
       .property('value', usernameValue)
       .on('change', function() {
         let value = d3_select(this).property('value');
-        context.photos().setUsernameFilter(value, true);
+        photoSystem.setUsernameFilter(value, true);
         d3_select(this).property('value', usernameValue);
       });
 
@@ -311,7 +311,7 @@ export function uiSectionPhotoOverlays(context) {
       .classed('active', filterEnabled);
 
     function usernameValue() {
-      let usernames = context.photos().usernames;
+      let usernames = photoSystem.usernames;
       if (usernames) return usernames.join('; ');
       return usernames;
     }
@@ -319,7 +319,7 @@ export function uiSectionPhotoOverlays(context) {
 
 
   context.scene().on('layerchange', section.reRender);
-  context.photos().on('photochange', section.reRender);
+  photoSystem.on('photochange', section.reRender);
 
   return section;
 }
diff --git a/modules/ui/sections/preset_fields.js b/modules/ui/sections/preset_fields.js
index 5e21c39aaa..a4590463b5 100644
--- a/modules/ui/sections/preset_fields.js
+++ b/modules/ui/sections/preset_fields.js
@@ -1,165 +1,146 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { utilArrayIdentical, utilArrayUnion } from '@rapid-sdk/util';
 
-import { presetManager } from '../../presets';
-import { t, localizer } from '../../core/localizer';
-import { uiField } from '../field';
+import { UiField } from '../UiField';
 import { uiFormFields } from '../form_fields';
 import { uiSection } from '../section';
 import { utilRebind } from '../../util';
 
 
 export function uiSectionPresetFields(context) {
+  let section = uiSection('preset-fields', context)
+    .label(context.tHtml('inspector.fields'))
+    .disclosureContent(renderDisclosureContent);
+
+  const dispatch = d3_dispatch('change', 'revert');
+  const formFields = uiFormFields(context);
+  let _state;
+  let _uifields;
+  let _presets = [];
+  let _tags;
+  let _entityIDs;
+
+
+  function renderDisclosureContent(selection) {
+    if (!_uifields) {
+      const graph = context.graph();
+      const presetSystem = context.presetSystem();
+
+      const geometries = Object.keys(_entityIDs.reduce((geoms, entityID) => {
+        geoms[graph.entity(entityID).geometry(graph)] = true;
+        return geoms;
+      }, {}));
+
+      let allFields = [];
+      let allMoreFields = [];
+      let sharedTotalFields;
+
+      for (const preset of _presets) {
+        let fields = preset.fields();
+        let moreFields = preset.moreFields();
+
+        allFields = utilArrayUnion(allFields, fields);
+        allMoreFields = utilArrayUnion(allMoreFields, moreFields);
+
+        if (!sharedTotalFields) {
+          sharedTotalFields = utilArrayUnion(fields, moreFields);
+        } else {
+          sharedTotalFields = sharedTotalFields.filter(field => {
+            return fields.includes(field) || moreFields.includes(field);
+          });
+        }
+      }
+
+      const sharedFields = allFields.filter(field => sharedTotalFields.includes(field));
+      const sharedMoreFields = allMoreFields.filter(field => sharedTotalFields.includes(field));
 
-    var section = uiSection('preset-fields', context)
-        .label(t.html('inspector.fields'))
-        .disclosureContent(renderDisclosureContent);
-
-    var dispatch = d3_dispatch('change', 'revert');
-    var formFields = uiFormFields(context);
-    var _state;
-    var _fieldsArr;
-    var _presets = [];
-    var _tags;
-    var _entityIDs;
-
-    function renderDisclosureContent(selection) {
-        if (!_fieldsArr) {
-
-            var graph = context.graph();
-
-            var geometries = Object.keys(_entityIDs.reduce(function(geoms, entityID) {
-                geoms[graph.entity(entityID).geometry(graph)] = true;
-                return geoms;
-            }, {}));
-
-            var presetsManager = presetManager;
-
-            var allFields = [];
-            var allMoreFields = [];
-            var sharedTotalFields;
-
-            _presets.forEach(function(preset) {
-                var fields = preset.fields();
-                var moreFields = preset.moreFields();
-
-                allFields = utilArrayUnion(allFields, fields);
-                allMoreFields = utilArrayUnion(allMoreFields, moreFields);
-
-                if (!sharedTotalFields) {
-                    sharedTotalFields = utilArrayUnion(fields, moreFields);
-                } else {
-                    sharedTotalFields = sharedTotalFields.filter(function(field) {
-                        return fields.indexOf(field) !== -1 || moreFields.indexOf(field) !== -1;
-                    });
-                }
-            });
-
-            var sharedFields = allFields.filter(function(field) {
-                return sharedTotalFields.indexOf(field) !== -1;
-            });
-            var sharedMoreFields = allMoreFields.filter(function(field) {
-                return sharedTotalFields.indexOf(field) !== -1;
-            });
-
-            _fieldsArr = [];
-
-            sharedFields.forEach(function(field) {
-                if (field.matchAllGeometry(geometries)) {
-                    _fieldsArr.push(
-                        uiField(context, field, _entityIDs)
-                    );
-                }
-            });
-
-//            var singularEntity = _entityIDs.length === 1 && graph.hasEntity(_entityIDs[0]);
-//            if (singularEntity && singularEntity.isHighwayIntersection(graph) && presetsManager.field('restrictions')) {
-//                _fieldsArr.push(
-//                    uiField(context, presetsManager.field('restrictions'), _entityIDs)
-//                );
-//            }
-
-            var additionalFields = utilArrayUnion(sharedMoreFields, presetsManager.universal());
-            additionalFields.sort(function(field1, field2) {
-                return field1.label().localeCompare(field2.label(), localizer.localeCode());
-            });
-
-            additionalFields.forEach(function(field) {
-                if (sharedFields.indexOf(field) === -1 &&
-                    field.matchAllGeometry(geometries)) {
-                    _fieldsArr.push(
-                        uiField(context, field, _entityIDs, { show: false })
-                    );
-                }
-            });
-
-            _fieldsArr.forEach(function(field) {
-                field
-                    .on('change', function(t, onInput) {
-                        dispatch.call('change', field, _entityIDs, t, onInput);
-                    })
-                    .on('revert', function(keys) {
-                        dispatch.call('revert', field, keys);
-                    });
-            });
+      _uifields = [];
+      for (const field of sharedFields) {
+        if (field.matchAllGeometry(geometries)) {
+          _uifields.push(new UiField(context, field, _entityIDs));
+        }
+      }
+
+//    let singularEntity = _entityIDs.length === 1 && graph.hasEntity(_entityIDs[0]);
+//    if (singularEntity && singularEntity.isHighwayIntersection(graph) && presetSystem.field('restrictions')) {
+//      _uifields.push(new UiField(context, presetSystem.field('restrictions'), _entityIDs));
+//    }
+
+      const localeCode = context.localizationSystem().localeCode();
+      let additionalFields = utilArrayUnion(sharedMoreFields, presetSystem.universal());
+      additionalFields.sort((field1, field2) => {
+        return field1.label().localeCompare(field2.label(), localeCode);
+      });
+
+      for (const field of additionalFields) {
+        if (!sharedFields.includes(field) && field.matchAllGeometry(geometries)) {
+          _uifields.push(new UiField(context, field, _entityIDs, { show: false }) );
         }
+      }
 
-        _fieldsArr.forEach(function(field) {
-            field
-                .state(_state)
-                .tags(_tags);
+      const ids = _entityIDs.slice();  // make copy (eslint warning)
+      for (const uifield of _uifields) {
+        uifield.on('change', (t, onInput) => {
+          dispatch.call('change', uifield, ids, t, onInput);
         });
+        uifield.on('revert', (keys) => {
+          dispatch.call('revert', uifield, keys);
+        });
+      }
+    }
 
-
-        selection
-            .call(formFields
-                .fieldsArr(_fieldsArr)
-                .state(_state)
-                .klass('grouped-items-area')
-            );
+    for (const uifield of _uifields) {
+      uifield.state(_state).tags(_tags);
+    }
 
 
-        selection.selectAll('.wrap-form-field input')
-            .on('keydown', function(d3_event) {
-                // if user presses enter, and combobox is not active, accept edits..
-                if (d3_event.keyCode === 13 && // ↩ Return
-                    context.container().select('.combobox').empty()) {
+    selection
+      .call(formFields
+        .fieldsArr(_uifields)
+        .state(_state)
+        .klass('grouped-items-area')
+      );
 
-                    context.enter('browse');
-                }
-            });
-    }
 
-    section.presets = function(val) {
-        if (!arguments.length) return _presets;
-        if (!_presets || !val || !utilArrayIdentical(_presets, val)) {
-            _presets = val;
-            _fieldsArr = null;
-        }
-        return section;
-    };
-
-    section.state = function(val) {
-        if (!arguments.length) return _state;
-        _state = val;
-        return section;
-    };
-
-    section.tags = function(val) {
-        if (!arguments.length) return _tags;
-        _tags = val;
-        // Don't reset _fieldsArr here.
-        return section;
-    };
-
-    section.entityIDs = function(val) {
-        if (!arguments.length) return _entityIDs;
-        if (!val || !_entityIDs || !utilArrayIdentical(_entityIDs, val)) {
-            _entityIDs = val;
-            _fieldsArr = null;
+    selection.selectAll('.wrap-form-field input')
+      .on('keydown', function(d3_event) {
+        // if user presses enter, and combobox is not active, accept edits..
+        if (d3_event.keyCode === 13 && context.container().select('.combobox').empty()) {   // ↩ Return
+          context.enter('browse');
         }
-        return section;
-    };
+      });
+  }
+
+  section.presets = function(val) {
+    if (!arguments.length) return _presets;
+    if (!_presets || !val || !utilArrayIdentical(_presets, val)) {
+      _presets = val;
+      _uifields = null;
+    }
+    return section;
+  };
+
+  section.state = function(val) {
+    if (!arguments.length) return _state;
+    _state = val;
+    return section;
+  };
+
+  section.tags = function(val) {
+    if (!arguments.length) return _tags;
+    _tags = val;
+    // Don't reset _uifields here.
+    return section;
+  };
+
+  section.entityIDs = function(val) {
+    if (!arguments.length) return _entityIDs;
+    if (!val || !_entityIDs || !utilArrayIdentical(_entityIDs, val)) {
+      _entityIDs = val;
+      _uifields = null;
+    }
+    return section;
+  };
 
-    return utilRebind(section, dispatch, 'on');
+  return utilRebind(section, dispatch, 'on');
 }
diff --git a/modules/ui/sections/privacy.js b/modules/ui/sections/privacy.js
index a92e11cc0f..d29a663a2a 100644
--- a/modules/ui/sections/privacy.js
+++ b/modules/ui/sections/privacy.js
@@ -1,16 +1,15 @@
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { uiIcon } from '../icon';
 import { uiSection } from '../section';
 
 
 export function uiSectionPrivacy(context) {
+  const prefs = context.storageSystem();
   const section = uiSection('preferences-third-party', context)
-    .label(t.html('preferences.privacy.title'))
+    .label(context.tHtml('preferences.privacy.title'))
     .disclosureContent(renderDisclosureContent);
 
-  let _showThirdPartyIcons = prefs('preferences.privacy.thirdpartyicons') || 'true';
+  let _showThirdPartyIcons = prefs.getItem('preferences.privacy.thirdpartyicons') || 'true';
 
   function renderDisclosureContent(selection) {
     // enter
@@ -24,8 +23,8 @@ export function uiSectionPrivacy(context) {
       .append('li')
       .attr('class', 'privacy-third-party-icons-item')
       .append('label')
-      .call(uiTooltip()
-        .title(t.html('preferences.privacy.third_party_icons.tooltip'))
+      .call(uiTooltip(context)
+        .title(context.tHtml('preferences.privacy.third_party_icons.tooltip'))
         .placement('bottom')
       );
 
@@ -35,13 +34,13 @@ export function uiSectionPrivacy(context) {
       .on('change', d3_event => {
         d3_event.preventDefault();
         _showThirdPartyIcons = (_showThirdPartyIcons === 'true') ? 'false' : 'true';
-        prefs('preferences.privacy.thirdpartyicons', _showThirdPartyIcons);
+        prefs.setItem('preferences.privacy.thirdpartyicons', _showThirdPartyIcons);
         update();
       });
 
     thirdPartyIconsEnter
       .append('span')
-      .html(t.html('preferences.privacy.third_party_icons.description'));
+      .html(context.tHtml('preferences.privacy.third_party_icons.description'));
 
 
     // Privacy Policy link
@@ -55,7 +54,7 @@ export function uiSectionPrivacy(context) {
       .call(uiIcon('#rapid-icon-out-link', 'inline'))
       .attr('href', 'https://mapwith.ai/doc/license/MapWithAIPrivacyPolicy.pdf')
       .append('span')
-      .html(t.html('preferences.privacy.privacy_link'));
+      .html(context.tHtml('preferences.privacy.privacy_link'));
 
     update();
 
diff --git a/modules/ui/sections/raw_member_editor.js b/modules/ui/sections/raw_member_editor.js
index b0a3752ab8..b498e18960 100644
--- a/modules/ui/sections/raw_member_editor.js
+++ b/modules/ui/sections/raw_member_editor.js
@@ -2,21 +2,20 @@ import { drag as d3_drag } from 'd3-drag';
 import { select as d3_select } from 'd3-selection';
 import { utilUniqueString } from '@rapid-sdk/util';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
 import { actionChangeMember } from '../../actions/change_member';
 import { actionDeleteMember } from '../../actions/delete_member';
 import { actionMoveMember } from '../../actions/move_member';
-import { modeSelect } from '../../modes/select';
 import { osmEntity } from '../../osm';
 import { uiIcon } from '../icon';
-import { services } from '../../services';
 import { uiCombobox } from '../combobox';
 import { uiSection } from '../section';
-import { utilDisplayName, utilDisplayType, utilHighlightEntities, utilNoAuto } from '../../util';
+import { utilHighlightEntities, utilNoAuto } from '../../util';
+
+const MAX_MEMBERS = 1000;
 
 
 export function uiSectionRawMemberEditor(context) {
+    const l10n = context.localizationSystem();
 
     var section = uiSection('raw-member-editor', context)
         .shouldDisplay(function() {
@@ -29,15 +28,14 @@ export function uiSectionRawMemberEditor(context) {
             var entity = context.hasEntity(_entityIDs[0]);
             if (!entity) return '';
 
-            var gt = entity.members.length > _maxMembers ? '>' : '';
-            var count = gt + entity.members.slice(0, _maxMembers).length;
-            return t('inspector.title_count', { title: t.html('inspector.members'), count: count });
+            var gt = entity.members.length > MAX_MEMBERS ? '>' : '';
+            var count = gt + entity.members.slice(0, MAX_MEMBERS).length;
+            return l10n.t('inspector.title_count', { title: l10n.tHtml('inspector.members'), count: count });
         })
         .disclosureContent(renderDisclosureContent);
 
-    var taginfo = services.taginfo;
+    var taginfo = context.services.get('taginfo');
     var _entityIDs;
-    var _maxMembers = 1000;
 
     function downloadMember(d3_event, d) {
         d3_event.preventDefault();
@@ -53,7 +51,7 @@ export function uiSectionRawMemberEditor(context) {
         d3_event.preventDefault();
 
         var entity = context.entity(d.id);
-        context.map().zoomToEase(entity);
+        context.mapSystem().zoomToEase(entity);
 
         // highlight the feature in case it wasn't previously on-screen
         utilHighlightEntities([d.id], true, context);
@@ -67,13 +65,13 @@ export function uiSectionRawMemberEditor(context) {
         utilHighlightEntities([d.id], false, context);
 
         var entity = context.entity(d.id);
-        var mapExtent = context.map().extent();
+        var mapExtent = context.mapSystem().extent();
         if (!entity.intersects(mapExtent, context.graph())) {
             // zoom to the entity if its extent is not visible now
-            context.map().zoomToEase(entity);
+            context.mapSystem().zoomToEase(entity);
         }
 
-        context.enter(modeSelect(context, [d.id]));
+        context.enter('select-osm', { selectedIDs: [d.id] });
     }
 
 
@@ -85,25 +83,19 @@ export function uiSectionRawMemberEditor(context) {
             var member = { id: d.id, type: d.type, role: newRole };
             context.perform(
                 actionChangeMember(d.relation.id, member, d.index),
-                t('operations.change_role.annotation', {
-                    n: 1
-                })
+                l10n.t('operations.change_role.annotation', { n: 1 })
             );
-            context.validator().validate();
+            context.validationSystem().validate();
         }
     }
 
 
     function deleteMember(d3_event, d) {
-
-        // remove the hover-highlight styling
-        utilHighlightEntities([d.id], false, context);
+        utilHighlightEntities([d.id], false, context);  // remove the hover-highlight styling
 
         context.perform(
             actionDeleteMember(d.relation.id, d.index),
-            t('operations.delete_member.annotation', {
-                n: 1
-            })
+            l10n.t('operations.delete_member.annotation', { n: 1 })
         );
 
         if (!context.hasEntity(d.relation.id)) {
@@ -113,17 +105,15 @@ export function uiSectionRawMemberEditor(context) {
         } else {
             // Changing the mode also runs `validate`, but otherwise we need to
             // rerun it manually
-            context.validator().validate();
+            context.validationSystem().validate();
         }
     }
 
     function renderDisclosureContent(selection) {
-
         var entityID = _entityIDs[0];
-
         var memberships = [];
         var entity = context.entity(entityID);
-        entity.members.slice(0, _maxMembers).forEach(function(member, index) {
+        entity.members.slice(0, MAX_MEMBERS).forEach(function(member, index) {
             memberships.push({
                 index: index,
                 id: member.id,
@@ -131,7 +121,7 @@ export function uiSectionRawMemberEditor(context) {
                 role: member.role,
                 relation: entity,
                 member: context.hasEntity(member.id),
-                domId: utilUniqueString(entityID + '-member-' + index)
+                uid: utilUniqueString(entityID + '-member-' + index)
             });
         });
 
@@ -166,7 +156,7 @@ export function uiSectionRawMemberEditor(context) {
                 var label = item
                     .append('label')
                     .attr('class', 'field-label')
-                    .attr('for', d.domId);
+                    .attr('for', d.uid);
 
                 if (d.member) {
                     // highlight the member feature in the map while hovering on the list item
@@ -189,25 +179,25 @@ export function uiSectionRawMemberEditor(context) {
                         .append('span')
                         .attr('class', 'member-entity-type')
                         .html(function(d) {
-                            var matched = presetManager.match(d.member, context.graph());
-                            return (matched && matched.name()) || utilDisplayType(d.member.id);
+                            var matched = context.presetSystem().match(d.member, context.graph());
+                            return (matched && matched.name()) || l10n.displayType(d.member.id);
                         });
 
                     labelLink
                         .append('span')
                         .attr('class', 'member-entity-name')
-                        .html(function(d) { return utilDisplayName(d.member); });
+                        .html(function(d) { return l10n.displayName(d.member); });
 
                     label
                         .append('button')
-                        .attr('title', t('icons.remove'))
+                        .attr('title', l10n.t('icons.remove'))
                         .attr('class', 'remove member-delete')
                         .call(uiIcon('#rapid-operation-delete'));
 
                     label
                         .append('button')
                         .attr('class', 'member-zoom')
-                        .attr('title', t('icons.zoom_to'))
+                        .attr('title', l10n.t('icons.zoom_to'))
                         .call(uiIcon('#rapid-icon-framed-dot', 'monochrome'))
                         .on('click', zoomToMember);
 
@@ -219,17 +209,17 @@ export function uiSectionRawMemberEditor(context) {
                     labelText
                         .append('span')
                         .attr('class', 'member-entity-type')
-                        .html(t.html('inspector.' + d.type, { id: d.id }));
+                        .html(l10n.tHtml('inspector.' + d.type, { id: d.id }));
 
                     labelText
                         .append('span')
                         .attr('class', 'member-entity-name')
-                        .html(t.html('inspector.incomplete', { id: d.id }));
+                        .html(l10n.tHtml('inspector.incomplete', { id: d.id }));
 
                     label
                         .append('button')
                         .attr('class', 'member-download')
-                        .attr('title', t('icons.download'))
+                        .attr('title', l10n.t('icons.download'))
                         .call(uiIcon('#rapid-icon-load'))
                         .on('click', downloadMember);
                 }
@@ -242,11 +232,9 @@ export function uiSectionRawMemberEditor(context) {
         wrapEnter
             .append('input')
             .attr('class', 'member-role')
-            .attr('id', function(d) {
-                return d.domId;
-            })
+            .attr('id', d => d.uid)
             .property('type', 'text')
-            .attr('placeholder', t('inspector.role'))
+            .attr('placeholder', l10n.t('inspector.role'))
             .call(utilNoAuto);
 
         if (taginfo) {
@@ -259,7 +247,7 @@ export function uiSectionRawMemberEditor(context) {
             .order();
 
         items.select('input.member-role')
-            .property('value', function(d) { return d.role; })
+            .property('value', d => d.role)
             .on('blur', changeRole)
             .on('change', changeRole);
 
@@ -326,9 +314,9 @@ export function uiSectionRawMemberEditor(context) {
                     // dragged to a new position, reorder
                     context.perform(
                         actionMoveMember(d.relation.id, index, targetIndex),
-                        t('operations.reorder_members.annotation')
+                        l10n.t('operations.reorder_members.annotation')
                     );
-                    context.validator().validate();
+                    context.validationSystem().validate();
                 }
             })
         );
diff --git a/modules/ui/sections/raw_membership_editor.js b/modules/ui/sections/raw_membership_editor.js
index 4c716fadff..6cd4fdfd8e 100644
--- a/modules/ui/sections/raw_membership_editor.js
+++ b/modules/ui/sections/raw_membership_editor.js
@@ -1,37 +1,37 @@
 import { select as d3_select } from 'd3-selection';
 import { utilArrayGroupBy, utilArrayIntersection, utilUniqueString } from '@rapid-sdk/util';
 
-import { presetManager } from '../../presets';
-import { t, localizer } from '../../core/localizer';
 import { actionAddEntity } from '../../actions/add_entity';
 import { actionAddMember } from '../../actions/add_member';
 import { actionChangeMember } from '../../actions/change_member';
 import { actionDeleteMembers } from '../../actions/delete_members';
-import { modeSelect } from '../../modes/select';
 import { osmEntity, osmRelation } from '../../osm';
-import { services } from '../../services';
 import { uiIcon } from '../icon';
 import { uiCombobox } from '../combobox';
 import { uiSection } from '../section';
 import { uiTooltip } from '../tooltip';
-import { utilDisplayName, utilNoAuto, utilHighlightEntities } from '../../util';
+import { utilNoAuto, utilHighlightEntities } from '../../util';
+
+const MAX_MEMBERSHIPS = 1000;
 
 
 export function uiSectionRawMembershipEditor(context) {
+    const l10n = context.localizationSystem();
 
+    var presetSystem = context.presetSystem();
     var section = uiSection('raw-membership-editor', context)
         .shouldDisplay(function() {
             return _entityIDs && _entityIDs.length;
         })
         .label(function() {
             var parents = getSharedParentRelations();
-            var gt = parents.length > _maxMemberships ? '>' : '';
-            var count = gt + parents.slice(0, _maxMemberships).length;
-            return t('inspector.title_count', { title: t.html('inspector.relations'), count: count });
+            var gt = parents.length > MAX_MEMBERSHIPS ? '>' : '';
+            var count = gt + parents.slice(0, MAX_MEMBERSHIPS).length;
+            return l10n.t('inspector.title_count', { title: l10n.tHtml('inspector.relations'), count: count });
         })
         .disclosureContent(renderDisclosureContent);
 
-    var taginfo = services.taginfo;
+    var taginfo = context.services.get('taginfo');
     var nearbyCombo = uiCombobox(context, 'parent-relation')
         .minItems(1)
         .fetcher(fetchNearbyRelations)
@@ -44,7 +44,6 @@ export function uiSectionRawMembershipEditor(context) {
     var _inChange = false;
     var _entityIDs = [];
     var _showBlank;
-    var _maxMemberships = 1000;
 
     function getSharedParentRelations() {
         var parents = [];
@@ -65,7 +64,7 @@ export function uiSectionRawMembershipEditor(context) {
     function getMemberships() {
 
         var memberships = [];
-        var relations = getSharedParentRelations().slice(0, _maxMemberships);
+        var relations = getSharedParentRelations().slice(0, MAX_MEMBERSHIPS);
 
         var isMultiselect = _entityIDs.length > 1;
 
@@ -101,7 +100,7 @@ export function uiSectionRawMembershipEditor(context) {
         }
 
         memberships.forEach(function(membership) {
-            membership.domId = utilUniqueString('membership-' + membership.relation.id);
+            membership.uid = utilUniqueString('membership-' + membership.relation.id);
             var roles = [];
             membership.members.forEach(function(member) {
                 if (roles.indexOf(member.role) === -1) roles.push(member.role);
@@ -118,14 +117,14 @@ export function uiSectionRawMembershipEditor(context) {
         // remove the hover-highlight styling
         utilHighlightEntities([d.relation.id], false, context);
 
-        context.enter(modeSelect(context, [d.relation.id]));
+        context.enter('select-osm', { selectedIDs: [d.relation.id] });
     }
 
     function zoomToRelation(d3_event, d) {
         d3_event.preventDefault();
 
         var entity = context.entity(d.relation.id);
-        context.map().zoomToEase(entity);
+        context.mapSystem().zoomToEase(entity);
 
         // highlight the relation in case it wasn't previously on-screen
         utilHighlightEntities([d.relation.id], true, context);
@@ -155,11 +154,9 @@ export function uiSectionRawMembershipEditor(context) {
                     });
                     return graph;
                 },
-                t('operations.change_role.annotation', {
-                    n: membersToUpdate.length
-                })
+                l10n.t('operations.change_role.annotation', { n: membersToUpdate.length })
             );
-            context.validator().validate();
+            context.validationSystem().validate();
         }
         _inChange = false;
     }
@@ -182,21 +179,19 @@ export function uiSectionRawMembershipEditor(context) {
         if (d.relation) {
             context.perform(
                 actionAddMembers(d.relation.id, _entityIDs, role),
-                t('operations.add_member.annotation', {
-                    n: _entityIDs.length
-                })
+                l10n.t('operations.add_member.annotation', { n: _entityIDs.length })
             );
-            context.validator().validate();
+            context.validationSystem().validate();
 
         } else {
             var relation = osmRelation();
             context.perform(
                 actionAddEntity(relation),
                 actionAddMembers(relation.id, _entityIDs, role),
-                t('operations.add.annotation.relation')
+                l10n.t('operations.add.annotation.relation')
             );
             // changing the mode also runs `validate`
-            context.enter(modeSelect(context, [relation.id]).newFeature(true));
+            context.enter('select-osm', { selectedIDs: [relation.id], newFeature: true });
         }
     }
 
@@ -214,31 +209,27 @@ export function uiSectionRawMembershipEditor(context) {
 
         context.perform(
             actionDeleteMembers(d.relation.id, indexes),
-            t('operations.delete_member.annotation', {
-                n: _entityIDs.length
-            })
+            l10n.t('operations.delete_member.annotation', { n: _entityIDs.length })
         );
-        context.validator().validate();
+        context.validationSystem().validate();
     }
 
 
     function fetchNearbyRelations(q, callback) {
         var newRelation = {
             relation: null,
-            value: t('inspector.new_relation'),
-            display: t.html('inspector.new_relation')
+            value: l10n.t('inspector.new_relation'),
+            display: l10n.tHtml('inspector.new_relation')
         };
 
         var entityID = _entityIDs[0];
-
         var result = [];
-
         var graph = context.graph();
 
         function baseDisplayLabel(entity) {
-            var matched = presetManager.match(entity, graph);
-            var presetName = (matched && matched.name()) || t('inspector.relation');
-            var entityName = utilDisplayName(entity) || '';
+            var matched = presetSystem.match(entity, graph);
+            var presetName = (matched && matched.name()) || l10n.t('inspector.relation');
+            var entityName = l10n.displayName(entity) || '';
 
             return presetName + ' ' + entityName;
         }
@@ -246,14 +237,13 @@ export function uiSectionRawMembershipEditor(context) {
         var explicitRelation = q && context.hasEntity(q.toLowerCase());
         if (explicitRelation && explicitRelation.type === 'relation' && explicitRelation.id !== entityID) {
             // loaded relation is specified explicitly, only show that
-
             result.push({
                 relation: explicitRelation,
                 value: baseDisplayLabel(explicitRelation) + ' ' + explicitRelation.id
             });
-        } else {
 
-            context.history().intersects(context.map().extent()).forEach(function(entity) {
+        } else {
+            context.editSystem().intersects(context.mapSystem().extent()).forEach(function(entity) {
                 if (entity.type !== 'relation' || entity.id === entityID) return;
 
                 var value = baseDisplayLabel(entity);
@@ -286,9 +276,7 @@ export function uiSectionRawMembershipEditor(context) {
     }
 
     function renderDisclosureContent(selection) {
-
         var memberships = getMemberships();
-
         var list = selection.selectAll('.member-list')
             .data([0]);
 
@@ -324,7 +312,7 @@ export function uiSectionRawMembershipEditor(context) {
             .append('label')
             .attr('class', 'field-label')
             .attr('for', function(d) {
-                return d.domId;
+                return d.uid;
             });
 
         var labelLink = labelEnter
@@ -338,17 +326,17 @@ export function uiSectionRawMembershipEditor(context) {
             .append('span')
             .attr('class', 'member-entity-type')
             .html(function(d) {
-                var matched = presetManager.match(d.relation, context.graph());
-                return (matched && matched.name()) || t('inspector.relation');
+                var matched = presetSystem.match(d.relation, context.graph());
+                return (matched && matched.name()) || l10n.t('inspector.relation');
             });
 
         labelLink
             .append('span')
             .attr('class', 'member-entity-name')
             .html(function(d) {
-                const matched = presetManager.match(d.relation, context.graph());
+                const matched = presetSystem.match(d.relation, context.graph());
                 // hide the network from the name if there is NSI match
-                return utilDisplayName(d.relation, matched.suggestion);
+                return l10n.displayName(d.relation, matched.suggestion);
             });
 
         labelEnter
@@ -360,7 +348,7 @@ export function uiSectionRawMembershipEditor(context) {
         labelEnter
             .append('button')
             .attr('class', 'member-zoom')
-            .attr('title', t('icons.zoom_to'))
+            .attr('title', l10n.t('icons.zoom_to'))
             .call(uiIcon('#rapid-icon-framed-dot', 'monochrome'))
             .on('click', zoomToRelation);
 
@@ -372,7 +360,7 @@ export function uiSectionRawMembershipEditor(context) {
             .append('input')
             .attr('class', 'member-role')
             .attr('id', function(d) {
-                return d.domId;
+                return d.uid;
             })
             .property('type', 'text')
             .property('value', function(d) {
@@ -382,7 +370,7 @@ export function uiSectionRawMembershipEditor(context) {
                 return Array.isArray(d.role) ? d.role.filter(Boolean).join('\n') : d.role;
             })
             .attr('placeholder', function(d) {
-                return Array.isArray(d.role) ? t('inspector.multiple_roles') : t('inspector.role');
+                return Array.isArray(d.role) ? l10n.t('inspector.multiple_roles') : l10n.t('inspector.role');
             })
             .classed('mixed', function(d) {
                 return Array.isArray(d.role);
@@ -413,7 +401,7 @@ export function uiSectionRawMembershipEditor(context) {
 
         newLabelEnter
             .append('input')
-            .attr('placeholder', t('inspector.choose_relation'))
+            .attr('placeholder', l10n.t('inspector.choose_relation'))
             .attr('type', 'text')
             .attr('class', 'member-entity-input')
             .call(utilNoAuto);
@@ -435,7 +423,7 @@ export function uiSectionRawMembershipEditor(context) {
             .append('input')
             .attr('class', 'member-role')
             .property('type', 'text')
-            .attr('placeholder', t('inspector.role'))
+            .attr('placeholder', l10n.t('inspector.role'))
             .call(utilNoAuto);
 
         // Update
@@ -466,7 +454,10 @@ export function uiSectionRawMembershipEditor(context) {
         addRelationButton
             .call(uiIcon('#rapid-icon-plus', 'light'));
         addRelationButton
-            .call(uiTooltip().title(t.html('inspector.add_to_relation')).placement(localizer.textDirection() === 'ltr' ? 'right' : 'left'));
+            .call(uiTooltip(context)
+              .title(l10n.tHtml('inspector.add_to_relation'))
+              .placement(l10n.isRTL() ? 'left' : 'right')
+             );
 
         addRowEnter
             .append('div')
diff --git a/modules/ui/sections/raw_tag_editor.js b/modules/ui/sections/raw_tag_editor.js
index 48de9eb395..685cd37db5 100644
--- a/modules/ui/sections/raw_tag_editor.js
+++ b/modules/ui/sections/raw_tag_editor.js
@@ -2,35 +2,32 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 import { utilArrayDifference, utilArrayIdentical, utilTagDiff } from '@rapid-sdk/util';
 
-import { services } from '../../services';
 import { uiIcon } from '../icon';
 import { uiCombobox } from '../combobox';
 import { uiSection } from '../section';
 import { uiTagReference } from '../tag_reference';
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 
-export function uiSectionRawTagEditor(id, context) {
-
+export function uiSectionRawTagEditor(context, id) {
+    const prefs = context.storageSystem();
     var section = uiSection(id, context)
         .classes('raw-tag-editor')
         .label(function() {
             var count = Object.keys(_tags).filter(function(d) { return d; }).length;
-            return t('inspector.title_count', { title: t.html('inspector.tags'), count: count });
+            return context.t('inspector.title_count', { title: context.tHtml('inspector.tags'), count: count });
         })
         .expandedByDefault(false)
         .disclosureContent(renderDisclosureContent);
 
-    var taginfo = services.taginfo;
+    var taginfo = context.services.get('taginfo');
     var dispatch = d3_dispatch('change');
     var availableViews = [
         { id: 'list', icon: '#fas-th-list' },
         { id: 'text', icon: '#fas-i-cursor' }
     ];
 
-    var _tagView = (prefs('raw-tag-editor-view') || 'list');   // 'list, 'text'
+    var _tagView = (prefs.getItem('raw-tag-editor-view') || 'list');   // 'list, 'text'
     var _readOnlyTags = [];
     // the keys in the order we want them to display
     var _orderedKeys = [];
@@ -47,7 +44,6 @@ export function uiSectionRawTagEditor(id, context) {
     }
 
     function renderDisclosureContent(wrap) {
-
         // remove deleted keys
         _orderedKeys = _orderedKeys.filter(function(key) {
             return _tags[key] !== undefined;
@@ -95,10 +91,10 @@ export function uiSectionRawTagEditor(id, context) {
             .attr('class', function(d) {
                 return 'raw-tag-option raw-tag-option-' + d.id + (_tagView === d.id ? ' selected' : '');
             })
-            .attr('title', function(d) { return t('icons.' + d.id); })
+            .attr('title', function(d) { return context.t('icons.' + d.id); })
             .on('click', function(d3_event, d) {
                 _tagView = d.id;
-                prefs('raw-tag-editor-view', d.id);
+                prefs.setItem('raw-tag-editor-view', d.id);
 
                 wrap.selectAll('.raw-tag-option')
                     .classed('selected', function(datum) { return datum === d; });
@@ -125,7 +121,7 @@ export function uiSectionRawTagEditor(id, context) {
             .append('textarea')
             .attr('class', 'tag-text' + (_tagView !== 'text' ? ' hide' : ''))
             .call(utilNoAuto)
-            .attr('placeholder', t('inspector.key_value'))
+            .attr('placeholder', context.t('inspector.key_value'))
             .attr('spellcheck', 'false')
             .merge(textarea);
 
@@ -214,7 +210,7 @@ export function uiSectionRawTagEditor(id, context) {
         innerWrap
             .append('button')
             .attr('class', 'form-field-button remove')
-            .attr('title', t('icons.remove'))
+            .attr('title', context.t('icons.remove'))
             .call(uiIcon('#rapid-operation-delete'));
 
 
@@ -237,7 +233,7 @@ export function uiSectionRawTagEditor(id, context) {
                 if (typeof d.value === 'string') {
                     referenceOptions.value = d.value;
                 }
-                var reference = uiTagReference(referenceOptions, context);
+                var reference = uiTagReference(context, referenceOptions);
 
                 if (_state === 'hover') {
                     reference.showing(false);
@@ -266,7 +262,7 @@ export function uiSectionRawTagEditor(id, context) {
                 return Array.isArray(d.value);
             })
             .attr('placeholder', function(d) {
-                return typeof d.value === 'string' ? null : t('inspector.multiple_values');
+                return typeof d.value === 'string' ? null : context.t('inspector.multiple_values');
             })
             .call(utilGetSetValue, function(d) {
                 return typeof d.value === 'string' ? d.value : '';
diff --git a/modules/ui/sections/react_container.jsx b/modules/ui/sections/react_container.jsx
index 1ec464a866..56739afd7e 100644
--- a/modules/ui/sections/react_container.jsx
+++ b/modules/ui/sections/react_container.jsx
@@ -1,4 +1,4 @@
-import _debounce from 'lodash-es/debounce';
+import debounce from 'lodash-es/debounce';
 
 import React from 'react';
 import ReactDom from 'react-dom';
@@ -14,12 +14,12 @@ export function uiSectionReactContainer(context) {
     .disclosureContent(content);
 
   const chooseBackground = (source) => {
-    context.imagery().baseLayerSource(source);
+    context.imagerySystem().baseLayerSource(source);
   };
 
   const content = (selection) => {
-    const sources = context.imagery()
-      .sources(context.map().extent(), context.map().zoom())
+    const sources = context.imagerySystem()
+      .sources(context.mapSystem().extent(), context.mapSystem().zoom())
       .filter(d => !d.isHidden() && !d.overlay);
 
     selection
@@ -33,8 +33,8 @@ export function uiSectionReactContainer(context) {
   };
 
 
-  context.map()
-    .on('draw', _debounce(() => {
+  context.mapSystem()
+    .on('draw', debounce(() => {
         reRenderCount++;
         window.requestIdleCallback(section.reRender);
       }, 1000)
diff --git a/modules/ui/sections/selection_list.js b/modules/ui/sections/selection_list.js
index 0c798a71a6..6b73eb39b1 100644
--- a/modules/ui/sections/selection_list.js
+++ b/modules/ui/sections/selection_list.js
@@ -1,15 +1,15 @@
 import { select as d3_select } from 'd3-selection';
 
-import { presetManager } from '../../presets';
-import { modeSelect } from '../../modes/select';
 import { osmEntity } from '../../osm';
 import { uiIcon } from '../icon';
 import { uiSection } from '../section';
-import { t } from '../../core/localizer';
-import { utilDisplayName, utilHighlightEntities } from '../../util';
+import { utilHighlightEntities } from '../../util';
 
 
 export function uiSectionSelectionList(context) {
+  const l10n = context.localizationSystem();
+  let _selectedIDs = [];
+
   const section = uiSection('selected-features', context)
     .shouldDisplay(sectionShouldDisplay)
     .label(sectionLabel)
@@ -21,27 +21,25 @@ export function uiSectionSelectionList(context) {
     return section;
   };
 
-  let _selectedIDs = [];
-
 
   function sectionShouldDisplay() {
     return _selectedIDs.length > 1;
   }
 
   function sectionLabel() {
-    return t('inspector.title_count', { title: t.html('inspector.features'), count: _selectedIDs.length });
+    return l10n.t('inspector.title_count', { title: l10n.tHtml('inspector.features'), count: _selectedIDs.length });
   }
 
   function selectEntity(d3_event, entity) {
-    context.enter(modeSelect(context, [entity.id]));
+    context.enter('select-osm', { selectedIDs: [entity.id] });
   }
 
   function deselectEntity(d3_event, entity) {
     let selectedIDs = _selectedIDs.slice();
-    let index = selectedIDs.indexOf(entity.id);
+    const index = selectedIDs.indexOf(entity.id);
     if (index > -1) {
       selectedIDs.splice(index, 1);
-      context.enter(modeSelect(context, selectedIDs));
+      context.enter('select-osm', { selectedIDs: selectedIDs });
     }
   }
 
@@ -96,7 +94,7 @@ export function uiSectionSelectionList(context) {
     enter
       .append('button')
       .attr('class', 'close')
-      .attr('title', t('icons.deselect'))
+      .attr('title', l10n.t('icons.deselect'))
       .on('click', deselectEntity)
       .call(uiIcon('#rapid-icon-close'));
 
@@ -111,19 +109,18 @@ export function uiSectionSelectionList(context) {
       });
 
     items.selectAll('.entity-type')
-      .html(entity => presetManager.match(entity, context.graph()).name());
+      .html(entity => context.presetSystem().match(entity, context.graph()).name());
 
     items.selectAll('.entity-name')
       .html(d => {
-        // fetch latest entity
-        const entity = context.entity(d.id);
-        return utilDisplayName(entity);
+        const entity = context.entity(d.id);  // current version of the entity
+        return l10n.displayName(entity);
       });
   }
 
 
-  context.history()
-    .on('change.selectionList', (difference) => {
+  context.editSystem()
+    .on('change', difference => {
       if (difference) {
         section.reRender();
       }
diff --git a/modules/ui/sections/validation_issues.js b/modules/ui/sections/validation_issues.js
index d6c8197b6a..cc3bb4562c 100644
--- a/modules/ui/sections/validation_issues.js
+++ b/modules/ui/sections/validation_issues.js
@@ -1,14 +1,14 @@
-import _debounce from 'lodash-es/debounce';
+import debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
 import { geoSphericalDistance } from '@rapid-sdk/math';
 
 import { actionNoop } from '../../actions/noop';
 import { uiIcon } from '../icon';
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { utilHighlightEntities } from '../../util';
 import { uiSection } from '../section';
 
+const MAX_ISSUES = 1000;
+
 
 /**
  *  uiSectionValidateIssues
@@ -17,6 +17,8 @@ import { uiSection } from '../section';
  *  @param  `severity`   String 'error' or 'warning'
  */
 export function uiSectionValidationIssues(context, sectionID, severity) {
+  const validator = context.validationSystem();
+  const prefs = context.storageSystem();
   const section = uiSection(sectionID, context)
     .label(sectionLabel)
     .shouldDisplay(sectionShouldDisplay)
@@ -25,9 +27,9 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
   let _issues = [];
 
   function sectionLabel() {
-    const countText = _issues.length > 1000 ? '1000+' : String(_issues.length);
-    const titleText = t(`issues.${severity}s.list_title`);
-    return t('inspector.title_count', { title: titleText, count: countText });
+    const countText = _issues.length > MAX_ISSUES ? `${MAX_ISSUES}+` : String(_issues.length);
+    const titleText = context.t(`issues.${severity}s.list_title`);
+    return context.t('inspector.title_count', { title: titleText, count: countText });
   }
 
   function sectionShouldDisplay() {
@@ -36,7 +38,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
 
   // Accepts a d3-selection to render the content into
   function renderDisclosureContent(selection) {
-    const center = context.map().center();
+    const center = context.mapSystem().center();
     const graph = context.graph();
 
     // sort issues by distance away from the center of the map
@@ -48,8 +50,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
       })
       .sort((a, b) => a.dist - b.dist);   // nearest to farthest
 
-    // cut off at 1000
-    toDisplay = toDisplay.slice(0, 1000);
+    toDisplay = toDisplay.slice(0, MAX_ISSUES);
 
     selection
       .call(drawIssuesList, toDisplay);
@@ -60,7 +61,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
   // Creates the issues list if needed and updates it with the current issues
   //
   function drawIssuesList(selection, issues) {
-    const showAutoFix = (prefs('rapid-internal-feature.showAutoFix') === 'true');
+    const showAutoFix = (prefs.getItem('rapid-internal-feature.showAutoFix') === 'true');
 
     let list = selection.selectAll('.issues-list')
       .data([0]);
@@ -85,7 +86,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
     let labelsEnter = itemsEnter
       .append('button')
       .attr('class', 'issue-label')
-      .on('click',     (d3_event, d) => context.validator().focusIssue(d))
+      .on('click',     (d3_event, d) => validator.focusIssue(d))
       .on('mouseover', (d3_event, d) => utilHighlightEntities(d.entityIds, true, context))
       .on('mouseout',  (d3_event, d) => utilHighlightEntities(d.entityIds, false, context));
 
@@ -97,9 +98,9 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
       .append('span')
       .attr('class', 'issue-icon')
       .each((d, i, nodes) => {
-        const iconName = '#rapid-icon-' + (d.severity === 'warning' ? 'alert' : 'error');
+        const which = (d.severity === 'warning') ? 'alert' : 'error';
         d3_select(nodes[i])
-          .call(uiIcon(iconName));
+          .call(uiIcon(`#rapid-icon-${which}`));
       });
 
     textEnter
@@ -115,7 +116,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
 
           d3_select(nodes[i])
             .append('button')
-            .attr('title', t('issues.fix_one.title'))
+            .attr('title', context.t('issues.fix_one.title'))
             .datum(d)  // set button datum to the issue
             .attr('class', 'autofix action')
             .on('click', (d3_event, d) => {
@@ -124,7 +125,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
 
               utilHighlightEntities(d.entityIds, false, context);  // unhighlight
               context.perform.apply(context, d.autoArgs);
-              context.validator().validate();
+              validator.validate();
             })
             .call(uiIcon('#rapid-icon-wrench'));
         });
@@ -159,7 +160,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
     linkEnter
       .append('span')
       .attr('class', 'autofix-all-link-text')
-      .html(t.html('issues.fix_all.title'));
+      .html(context.tHtml('issues.fix_all.title'));
 
     linkEnter
       .append('span')
@@ -180,11 +181,11 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
           if (typeof args[args.length - 1] !== 'function') {
             args.pop();
           }
-          args.push(t('issues.fix_all.annotation'));
+          args.push(context.t('issues.fix_all.annotation'));
           context.replace.apply(context, args);  // this does the fix
         });
         context.resumeChangeDispatch();
-        context.validator().validate();
+        validator.validate();
       });
   }
 
@@ -192,15 +193,15 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
   // get the current display options for the issues lists
   function getOptions() {
     return {
-      what: prefs('validate-what') || 'edited',
-      where: prefs('validate-where') || 'all'
+      what: prefs.getItem('validate-what') || 'edited',
+      where: prefs.getItem('validate-where') || 'all'
     };
   }
 
   // get and cache the issues to display, unordered
   function reloadIssues() {
     const options = getOptions();
-    _issues = context.validator().getIssuesBySeverity(options)[severity];
+    _issues = validator.getIssuesBySeverity(options)[severity];
   }
 
   // only update the contents if the issues pane is actually open
@@ -211,7 +212,7 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
 
   // event handlers to refresh the lists
 
-  context.validator().on(`validated.uiSectionValidationIssues-${sectionID}`, () => {
+  validator.on('validated', () => {
     window.requestIdleCallback(() => {
       if (!isVisible()) return;
       reloadIssues();
@@ -219,8 +220,8 @@ export function uiSectionValidationIssues(context, sectionID, severity) {
     });
   });
 
-  context.map().on('draw',
-    _debounce(() => {
+  context.mapSystem().on('draw',
+    debounce(() => {
       window.requestIdleCallback(() => {
         if (!isVisible()) return;
         if (getOptions().where === 'visible') {  // must refetch issues if they are viewport-dependent
diff --git a/modules/ui/sections/validation_options.js b/modules/ui/sections/validation_options.js
index 3be98715a3..af4b09b2af 100644
--- a/modules/ui/sections/validation_options.js
+++ b/modules/ui/sections/validation_options.js
@@ -1,9 +1,8 @@
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { uiSection } from '../section';
 
 
 export function uiSectionValidationOptions(context) {
+  const prefs = context.storageSystem();
   const section = uiSection('issues-options', context)
     .content(renderContent);
 
@@ -32,7 +31,7 @@ export function uiSectionValidationOptions(context) {
     optionsEnter
       .append('div')
       .attr('class', 'issues-option-title')
-      .html(d => t.html(`issues.options.${d.key}.title`));
+      .html(d => context.tHtml(`issues.options.${d.key}.title`));
 
     let valuesEnter = optionsEnter.selectAll('label')
       .data(d => {
@@ -51,13 +50,13 @@ export function uiSectionValidationOptions(context) {
 
     valuesEnter
       .append('span')
-      .html(d => t.html(`issues.options.${d.key}.${d.value}`));
+      .html(d => context.tHtml(`issues.options.${d.key}.${d.value}`));
   }
 
   function getOptions() {
     return {
-      what: prefs('validate-what') || 'edited',  // 'all', 'edited'
-      where: prefs('validate-where') || 'all'    // 'all', 'visible'
+      what: prefs.getItem('validate-what') || 'edited',  // 'all', 'edited'
+      where: prefs.getItem('validate-where') || 'all'    // 'all', 'visible'
     };
   }
 
@@ -66,8 +65,8 @@ export function uiSectionValidationOptions(context) {
       val = d3_event.target.value;
     }
 
-    prefs(`validate-${d}`, val);
-    context.validator().validate();
+    prefs.setItem(`validate-${d}`, val);
+    context.validationSystem().validate();
   }
 
   return section;
diff --git a/modules/ui/sections/validation_rules.js b/modules/ui/sections/validation_rules.js
index dc04aa500b..1ccda4bbca 100644
--- a/modules/ui/sections/validation_rules.js
+++ b/modules/ui/sections/validation_rules.js
@@ -1,7 +1,5 @@
 import { select as d3_select } from 'd3-selection';
 
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { utilGetSetValue, utilNoAuto } from '../../util';
 import { uiTooltip } from '../tooltip';
 import { uiSection } from '../section';
@@ -12,16 +10,17 @@ export function uiSectionValidationRules(context) {
   const MAXSQUARE = 20;
   const DEFAULTSQUARE = 5;  // see also unsquare_way.js
 
+  const validator = context.validationSystem();
+  const prefs = context.storageSystem();
   const section = uiSection('issues-rules', context)
     .disclosureContent(renderDisclosureContent)
-    .label(t.html('issues.rules.title'));
+    .label(context.tHtml('issues.rules.title'));
 
 
-  let _ruleKeys = context.validator().getRuleKeys()
-    .filter(key => key !== 'maprules')
+  let _ruleKeys = validator.getRuleKeys()
     .sort((key1, key2) => {
       // alphabetize by localized title
-      return t(`issues.${key1}.title`) < t(`issues.${key2}.title`) ? -1 : 1;
+      return context.t(`issues.${key1}.title`) < context.t(`issues.${key2}.title`) ? -1 : 1;
     });
 
 
@@ -45,20 +44,20 @@ export function uiSectionValidationRules(context) {
       .append('a')
       .attr('class', 'issue-rules-link')
       .attr('href', '#')
-      .html(t.html('issues.disable_all'))
+      .html(context.tHtml('issues.disable_all'))
       .on('click', d3_event => {
         d3_event.preventDefault();
-        context.validator().disableRules(_ruleKeys);
+        validator.disableRules(_ruleKeys);
       });
 
     ruleLinks
       .append('a')
       .attr('class', 'issue-rules-link')
       .attr('href', '#')
-      .html(t.html('issues.enable_all'))
+      .html(context.tHtml('issues.enable_all'))
       .on('click', d3_event => {
         d3_event.preventDefault();
-        context.validator().disableRules([]);
+        validator.disableRules([]);
       });
 
     // Update
@@ -84,8 +83,8 @@ export function uiSectionValidationRules(context) {
 
     if (name === 'rule') {
       enter
-        .call(uiTooltip()
-          .title(d => t.html(`issues.${d}.tip`))
+        .call(uiTooltip(context)
+          .title(d => context.tHtml(`issues.${d}.tip`))
           .placement('top')
         );
     }
@@ -106,7 +105,7 @@ export function uiSectionValidationRules(context) {
         if (d === 'unsquare_way') {
           params.val = '<span class="square-degrees"></span>';
         }
-        return t.html(`issues.${d}.title`, params);
+        return context.tHtml(`issues.${d}.title`, params);
       });
 
     // Update
@@ -121,7 +120,7 @@ export function uiSectionValidationRules(context) {
 
 
     // user-configurable square threshold
-    let degStr = prefs('validate-square-degrees');
+    let degStr = prefs.getItem('validate-square-degrees');
     if (degStr === null) {
       degStr = DEFAULTSQUARE.toString();
     }
@@ -175,20 +174,20 @@ export function uiSectionValidationRules(context) {
     input
       .property('value', degStr);
 
-    prefs('validate-square-degrees', degStr);
-    context.validator().revalidateUnsquare();
+    prefs.setItem('validate-square-degrees', degStr);
+    validator.revalidateUnsquare();
   }
 
   function isRuleEnabled(d) {
-    return context.validator().isRuleEnabled(d);
+    return validator.isRuleEnabled(d);
   }
 
   function toggleRule(d3_event, d) {
-    context.validator().toggleRule(d);
+    validator.toggleRule(d);
   }
 
 
-  context.validator().on(`validated.uiSectionValidationRules`, () => {
+  validator.on('validated', () => {
     window.requestIdleCallback(section.reRender);
   });
 
diff --git a/modules/ui/sections/validation_status.js b/modules/ui/sections/validation_status.js
index 7c6991f633..0133bf8ce8 100644
--- a/modules/ui/sections/validation_status.js
+++ b/modules/ui/sections/validation_status.js
@@ -1,26 +1,27 @@
-import _debounce from 'lodash-es/debounce';
+import debounce from 'lodash-es/debounce';
 
 import { uiIcon } from '../icon';
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { uiSection } from '../section';
 
 
 export function uiSectionValidationStatus(context) {
+  const validator = context.validationSystem();
+
   const section = uiSection('issues-status', context)
     .shouldDisplay(sectionShouldDisplay)
     .content(renderContent);
 
 
   function sectionShouldDisplay() {
-    let issues = context.validator().getIssues(getOptions());
+    let issues = validator.getIssues(getOptions());
     return issues.length === 0;
   }
 
   function getOptions() {
+    const prefs = context.storageSystem();
     return {
-      what: prefs('validate-what') || 'edited',
-      where: prefs('validate-where') || 'all'
+      what: prefs.getItem('validate-what') || 'edited',
+      where: prefs.getItem('validate-where') || 'all'
     };
   }
 
@@ -57,7 +58,7 @@ export function uiSectionValidationStatus(context) {
 
 
   function renderIgnoredIssuesReset(selection) {
-    let ignoredIssues = context.validator()
+    let ignoredIssues = validator
       .getIssues({ what: 'all', where: 'all', includeDisabledRules: true, includeIgnored: 'only' });
 
     let resetIgnored = selection.selectAll('.reset-ignored')
@@ -81,11 +82,11 @@ export function uiSectionValidationStatus(context) {
       .merge(resetIgnoredEnter);
 
     resetIgnored.select('a')
-      .html(t('inspector.title_count', { title: t.html('issues.reset_ignored'), count: ignoredIssues.length }));
+      .html(context.t('inspector.title_count', { title: context.tHtml('issues.reset_ignored'), count: ignoredIssues.length }));
 
     resetIgnored.on('click', d3_event => {
       d3_event.preventDefault();
-      context.validator().resetIgnoredIssues();
+      validator.resetIgnoredIssues();
     });
   }
 
@@ -97,15 +98,15 @@ export function uiSectionValidationStatus(context) {
     function checkForHiddenIssues(cases) {
       for (let type in cases) {
         let hiddenOpts = cases[type];
-        let hiddenIssues = context.validator().getIssues(hiddenOpts);
+        let hiddenIssues = validator.getIssues(hiddenOpts);
         if (hiddenIssues.length) {
           selection.select('.box .details')
-            .html(t.html('issues.no_issues.hidden_issues.' + type, { count: hiddenIssues.length.toString() } ));
+            .html(context.tHtml('issues.no_issues.hidden_issues.' + type, { count: hiddenIssues.length.toString() } ));
           return;
         }
       }
       selection.select('.box .details')
-        .html(t.html('issues.no_issues.hidden_issues.none'));
+        .html(context.tHtml('issues.no_issues.hidden_issues.none'));
     }
 
     let messageType;
@@ -152,20 +153,20 @@ export function uiSectionValidationStatus(context) {
       });
     }
 
-    if (opts.what === 'edited' && context.history().difference().summary().size === 0) {
+    if (opts.what === 'edited' && context.editSystem().difference().summary().size === 0) {
       messageType = 'no_edits';
     }
 
     selection.select('.box .message')
-      .html(t.html(`issues.no_issues.message.${messageType}`));
+      .html(context.tHtml(`issues.no_issues.message.${messageType}`));
   }
 
 
-  context.validator().on('validated.uiSectionValidationStatus', () => {
+  validator.on('validated', () => {
     window.requestIdleCallback(section.reRender);
   });
 
-  context.map().on('draw', _debounce(() => {
+  context.mapSystem().on('draw', debounce(() => {
     window.requestIdleCallback(section.reRender);
   }, 1000));
 
diff --git a/modules/ui/settings/custom_background.js b/modules/ui/settings/custom_background.js
index 3f0045a72f..a125e9bedd 100644
--- a/modules/ui/settings/custom_background.js
+++ b/modules/ui/settings/custom_background.js
@@ -1,108 +1,112 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { marked } from 'marked';
 
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { uiConfirm } from '../confirm';
 import { utilNoAuto, utilRebind } from '../../util';
 
 
-export function uiSettingsCustomBackground() {
-    var dispatch = d3_dispatch('change');
-
-    function render(selection) {
-        // keep separate copies of original and current settings
-        var _origSettings = {
-            template: prefs('background-custom-template')
-        };
-        var _currSettings = {
-            template: prefs('background-custom-template')
-        };
-
-        var example = 'https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png';
-        var modal = uiConfirm(selection).okButton();
-
-        modal
-            .classed('settings-modal settings-custom-background', true);
-
-        modal.select('.modal-section.header')
-            .append('h3')
-            .html(t.html('settings.custom_background.header'));
-
-
-        var textSection = modal.select('.modal-section.message-text');
-
-        var instructions =
-            `${t.html('settings.custom_background.instructions.info')}\n` +
-            '\n' +
-            `#### ${t.html('settings.custom_background.instructions.wms.tokens_label')}\n` +
-            `* ${t.html('settings.custom_background.instructions.wms.tokens.proj')}\n` +
-            `* ${t.html('settings.custom_background.instructions.wms.tokens.wkid')}\n` +
-            `* ${t.html('settings.custom_background.instructions.wms.tokens.dimensions')}\n` +
-            `* ${t.html('settings.custom_background.instructions.wms.tokens.bbox')}\n` +
-            '\n' +
-            `#### ${t.html('settings.custom_background.instructions.tms.tokens_label')}\n` +
-            `* ${t.html('settings.custom_background.instructions.tms.tokens.xyz')}\n` +
-            `* ${t.html('settings.custom_background.instructions.tms.tokens.flipped_y')}\n` +
-            `* ${t.html('settings.custom_background.instructions.tms.tokens.switch')}\n` +
-            `* ${t.html('settings.custom_background.instructions.tms.tokens.quadtile')}\n` +
-            `* ${t.html('settings.custom_background.instructions.tms.tokens.scale_factor')}\n` +
-            '\n' +
-            `#### ${t.html('settings.custom_background.instructions.example')}\n` +
-            `\`${example}\``;
-
-        textSection
-            .append('div')
-            .attr('class', 'instructions-template')
-            .html(marked.parse(instructions));
-
-        textSection
-            .append('textarea')
-            .attr('class', 'field-template')
-            .attr('placeholder', t('settings.custom_background.template.placeholder'))
-            .call(utilNoAuto)
-            .property('value', _currSettings.template);
-
-
-        // insert a cancel button
-        var buttonSection = modal.select('.modal-section.buttons');
-
-        buttonSection
-            .insert('button', '.ok-button')
-            .attr('class', 'button cancel-button secondary-action')
-            .html(t.html('confirm.cancel'));
-
-
-        buttonSection.select('.cancel-button')
-            .on('click.cancel', clickCancel);
-
-        buttonSection.select('.ok-button')
-            .attr('disabled', isSaveDisabled)
-            .on('click.save', clickSave);
-
-
-        function isSaveDisabled() {
-            return null;
-        }
-
-
-        // restore the original template
-        function clickCancel() {
-            textSection.select('.field-template').property('value', _origSettings.template);
-            prefs('background-custom-template', _origSettings.template);
-            this.blur();
-            modal.close();
-        }
-
-        // accept the current template
-        function clickSave() {
-            _currSettings.template = textSection.select('.field-template').property('value');
-            prefs('background-custom-template', _currSettings.template);
-            this.blur();
-            modal.close();
-            dispatch.call('change', this, _currSettings);
-        }
+export function uiSettingsCustomBackground(context) {
+  const prefs = context.storageSystem();
+  const dispatch = d3_dispatch('change');
+
+
+  function render(selection) {
+    // keep separate copies of original and current settings
+    let _origSettings = { template: prefs.getItem('background-custom-template') };
+    let _currSettings = Object.assign({}, _origSettings);
+
+    let modal = uiConfirm(context, selection).okButton();
+
+    modal
+      .classed('settings-modal settings-custom-background', true);
+
+    modal.select('.modal-section.header')
+      .append('h3')
+      .html(context.tHtml('settings.custom_background.header'));
+
+    const prefix = 'settings.custom_background.instructions';
+    const info = context.t(`${prefix}.info`);
+    const wms_label = context.t(`${prefix}.wms.tokens_label`);
+    const wms_proj = context.t(`${prefix}.wms.tokens.proj`);
+    const wms_wkid = context.t(`${prefix}.wms.tokens.wkid`);
+    const wms_dims = context.t(`${prefix}.wms.tokens.dimensions`);
+    const wms_bbox = context.t(`${prefix}.wms.tokens.bbox`);
+    const tms_label = context.t(`${prefix}.tms.tokens_label`);
+    const tms_xyz = context.t(`${prefix}.tms.tokens.xyz`);
+    const tms_flip = context.t(`${prefix}.tms.tokens.flipped_y`);
+    const tms_switch = context.t(`${prefix}.tms.tokens.switch`);
+    const tms_quad = context.t(`${prefix}.tms.tokens.quadtile`);
+    const tms_scale = context.t(`${prefix}.tms.tokens.scale_factor`);
+    const example = context.t(`${prefix}.example`);
+
+    const instructions = marked.parse(`
+${info}
+
+#### ${wms_label}
+* ${wms_proj}
+* ${wms_wkid}
+* ${wms_dims}
+* ${wms_bbox}
+
+#### ${tms_label}
+* ${tms_xyz}
+* ${tms_flip}
+* ${tms_switch}
+* ${tms_quad}
+* ${tms_scale}
+
+#### ${example}
+  'https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png'
+`);
+
+
+    let textSection = modal.select('.modal-section.message-text');
+
+    textSection
+      .append('div')
+      .attr('class', 'instructions-template')
+      .html(instructions);
+
+    textSection
+      .append('textarea')
+      .attr('class', 'field-template')
+      .attr('placeholder', context.t('settings.custom_background.template.placeholder'))
+      .call(utilNoAuto)
+      .property('value', _currSettings.template);
+
+
+    // insert a cancel button
+    let buttonSection = modal.select('.modal-section.buttons');
+
+    buttonSection
+      .insert('button', '.ok-button')
+      .attr('class', 'button cancel-button secondary-action')
+      .html(context.tHtml('confirm.cancel'));
+
+    buttonSection.select('.cancel-button')
+      .on('click.cancel', _clickCancel);
+
+    buttonSection.select('.ok-button')
+      .on('click.save', _clickSave);
+
+
+    // restore the original template
+    function _clickCancel() {
+      textSection.select('.field-template').property('value', _origSettings.template);
+      prefs.setItem('background-custom-template', _origSettings.template);
+      this.blur();
+      modal.close();
+    }
+
+    // accept the current template
+    function _clickSave() {
+      _currSettings.template = textSection.select('.field-template').property('value');
+      prefs.setItem('background-custom-template', _currSettings.template);
+      this.blur();
+      modal.close();
+      dispatch.call('change', this, _currSettings);
     }
+  }
 
-    return utilRebind(render, dispatch, 'on');
+  return utilRebind(render, dispatch, 'on');
 }
diff --git a/modules/ui/settings/custom_data.js b/modules/ui/settings/custom_data.js
index 77249bb426..4f26fc2708 100644
--- a/modules/ui/settings/custom_data.js
+++ b/modules/ui/settings/custom_data.js
@@ -1,12 +1,11 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
-import { prefs } from '../../core/preferences';
-import { t } from '../../core/localizer';
 import { uiConfirm } from '../confirm';
 import { utilNoAuto, utilRebind } from '../../util';
 
 
 export function uiSettingsCustomData(context) {
+    const prefs = context.storageSystem();
     var dispatch = d3_dispatch('change');
 
     function render(selection) {
@@ -15,22 +14,19 @@ export function uiSettingsCustomData(context) {
         // keep separate copies of original and current settings
         var _origSettings = {
             fileList: (dataLayer && dataLayer.fileList()) || null,
-            url: prefs('settings-custom-data-url')
-        };
-        var _currSettings = {
-            fileList: (dataLayer && dataLayer.fileList()) || null,
-            url: prefs('settings-custom-data-url')
+            url: prefs.getItem('settings-custom-data-url')
         };
+        var _currSettings = Object.assign({}, _origSettings);
 
         // var example = 'https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png';
-        var modal = uiConfirm(selection).okButton();
+        var modal = uiConfirm(context, selection).okButton();
 
         modal
             .classed('settings-modal settings-custom-data', true);
 
         modal.select('.modal-section.header')
             .append('h3')
-            .html(t.html('settings.custom_data.header'));
+            .html(context.tHtml('settings.custom_data.header'));
 
 
         var textSection = modal.select('.modal-section.message-text');
@@ -38,7 +34,7 @@ export function uiSettingsCustomData(context) {
         textSection
             .append('pre')
             .attr('class', 'instructions-file')
-            .html(t.html('settings.custom_data.file.instructions'));
+            .html(context.tHtml('settings.custom_data.file.instructions'));
 
         textSection
             .append('input')
@@ -58,17 +54,17 @@ export function uiSettingsCustomData(context) {
 
         textSection
             .append('h4')
-            .html(t.html('settings.custom_data.or'));
+            .html(context.tHtml('settings.custom_data.or'));
 
         textSection
             .append('pre')
             .attr('class', 'instructions-url')
-            .html(t.html('settings.custom_data.url.instructions'));
+            .html(context.tHtml('settings.custom_data.url.instructions'));
 
         textSection
             .append('textarea')
             .attr('class', 'field-url')
-            .attr('placeholder', t('settings.custom_data.url.placeholder'))
+            .attr('placeholder', context.t('settings.custom_data.url.placeholder'))
             .call(utilNoAuto)
             .property('value', _currSettings.url);
 
@@ -79,7 +75,7 @@ export function uiSettingsCustomData(context) {
         buttonSection
             .insert('button', '.ok-button')
             .attr('class', 'button cancel-button secondary-action')
-            .html(t.html('confirm.cancel'));
+            .html(context.tHtml('confirm.cancel'));
 
 
         buttonSection.select('.cancel-button')
@@ -98,7 +94,7 @@ export function uiSettingsCustomData(context) {
         // restore the original url
         function clickCancel() {
             textSection.select('.field-url').property('value', _origSettings.url);
-            prefs('settings-custom-data-url', _origSettings.url);
+            prefs.setItem('settings-custom-data-url', _origSettings.url);
             this.blur();
             modal.close();
         }
@@ -111,7 +107,7 @@ export function uiSettingsCustomData(context) {
             if (_currSettings.url) { _currSettings.fileList = null; }
             if (_currSettings.fileList) { _currSettings.url = ''; }
 
-            prefs('settings-custom-data-url', _currSettings.url);
+            prefs.setItem('settings-custom-data-url', _currSettings.url);
             this.blur();
             modal.close();
             dispatch.call('change', this, _currSettings);
diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js
index 9af7b20ca9..2bdef4057a 100644
--- a/modules/ui/shortcuts.js
+++ b/modules/ui/shortcuts.js
@@ -1,8 +1,6 @@
 import { select as d3_select } from 'd3-selection';
 import { utilArrayUniq } from '@rapid-sdk/util';
 
-import { fileFetcher } from '../core/file_fetcher';
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 import { uiCmd } from './cmd';
 import { uiModal } from './modal';
@@ -27,14 +25,15 @@ export function uiShortcuts(context) {
             .append('div')
             .attr('class', 'modal-section')
             .append('h3')
-            .html(t.html('shortcuts.title'));
-
-        fileFetcher.get('shortcuts')
-            .then(function(data) {
-                _dataShortcuts = data;
-                content.call(render);
-            })
-            .catch(e => console.error(e));  // eslint-disable-line
+            .html(context.tHtml('shortcuts.title'));
+
+        const dataLoaderSystem = context.dataLoaderSystem();
+        dataLoaderSystem.get('shortcuts')
+          .then(data => {
+            _dataShortcuts = data;
+            content.call(render);
+          })
+          .catch(e => console.error(e));  // eslint-disable-line
     }
 
 
@@ -78,7 +77,7 @@ export function uiShortcuts(context) {
 
         tabsEnter
             .append('span')
-            .html(function (d) { return t.html(d.text); });
+            .html(function (d) { return context.tHtml(d.text); });
 
         // Update
         wrapper.selectAll('.tab')
@@ -121,7 +120,7 @@ export function uiShortcuts(context) {
             .append('td')
             .attr('class', 'shortcut-section')
             .append('h3')
-            .html(function (d) { return t.html(d.text); });
+            .html(function (d) { return context.tHtml(d.text); });
 
 
         var shortcutRows = rowsEnter
@@ -152,7 +151,7 @@ export function uiShortcuts(context) {
                 selection
                     .append('kbd')
                     .attr('class', 'modifier')
-                    .html(function (d) { return uiCmd.display(d); });
+                    .html(function (d) { return uiCmd.display(context, d); });
 
                 selection
                     .append('span')
@@ -171,8 +170,8 @@ export function uiShortcuts(context) {
                 }
 
                 // replace translations
-                arr = arr.map(function(s) {
-                    return uiCmd.display(s.indexOf('.') !== -1 ? t(s) : s);
+                arr = arr.map(s => {
+                    return uiCmd.display(context, s.indexOf('.') !== -1 ? context.t(s) : s);
                 });
 
                 return utilArrayUniq(arr).map(function(s) {
@@ -208,7 +207,7 @@ export function uiShortcuts(context) {
                 if (i < nodes.length - 1) {
                     selection
                         .append('span')
-                        .html(d.separator || '\u00a0' + t.html('shortcuts.or') + '\u00a0');
+                        .html(d.separator || '\u00a0' + context.tHtml('shortcuts.or') + '\u00a0');
                 } else if (i === nodes.length - 1 && d.suffix) {
                     selection
                         .append('span')
@@ -239,14 +238,14 @@ export function uiShortcuts(context) {
                 selection
                     .append('span')
                     .attr('class', 'gesture')
-                    .html(function (d) { return t.html(d.gesture); });
+                    .html(function (d) { return context.tHtml(d.gesture); });
             });
 
 
         shortcutRows
             .append('td')
             .attr('class', 'shortcut-desc')
-            .html(function (d) { return d.text ? t.html(d.text) : '\u00a0'; });
+            .html(function (d) { return d.text ? context.tHtml(d.text) : '\u00a0'; });
 
 
         // Update
@@ -264,7 +263,7 @@ export function uiShortcuts(context) {
             _modalSelection.call(shortcutsModal);
         } else {
             context.keybinding()
-                .on([t('shortcuts.toggle.key'), '?'], function () {
+                .on([context.t('shortcuts.toggle.key'), '?'], function () {
                     if (context.container().selectAll('.modal-shortcuts').size()) {  // already showing
                         if (_modalSelection) {
                             _modalSelection.close();
diff --git a/modules/ui/sidebar.js b/modules/ui/sidebar.js
index 69da6d80b0..87faf40c17 100644
--- a/modules/ui/sidebar.js
+++ b/modules/ui/sidebar.js
@@ -6,7 +6,6 @@ import _throttle from 'lodash-es/throttle';
 
 import { utilFastMouse } from '../util';
 import { osmEntity, osmNote, QAItem } from '../osm';
-import { services } from '../services';
 import { uiDataEditor } from './data_editor';
 import { uiFeatureList } from './feature_list';
 import { uiInspector } from './inspector';
@@ -14,8 +13,6 @@ import { uiImproveOsmEditor } from './improveOSM_editor';
 import { uiKeepRightEditor } from './keepRight_editor';
 import { uiOsmoseEditor } from './osmose_editor';
 import { uiNoteEditor } from './note_editor';
-import { localizer } from '../core/localizer';
-
 import { uiRapidFeatureInspector } from './rapid_feature_inspector';
 
 
@@ -87,7 +84,6 @@ export function uiSidebar(context) {
         }
 
         function pointermove(d3_event) {
-
             if (downPointerId !== (d3_event.pointerId || 'mouse')) return;
 
             d3_event.preventDefault();
@@ -96,7 +92,7 @@ export function uiSidebar(context) {
 
             lastClientX = d3_event.clientX;
 
-            var isRTL = (localizer.textDirection() === 'rtl');
+            var isRTL = context.localizationSystem().isRTL();
             var scaleX = isRTL ? 0 : 1;
             var xMarginProperty = isRTL ? 'margin-right' : 'margin-left';
 
@@ -114,7 +110,7 @@ export function uiSidebar(context) {
                         .style(xMarginProperty, '-400px')
                         .style('width', '400px');
 
-                    context.ui().onResize([(sidebarWidth - dx) * scaleX, 0]);
+                    context.ui().resize([(sidebarWidth - dx) * scaleX, 0]);
                 }
 
             } else {
@@ -124,9 +120,9 @@ export function uiSidebar(context) {
                     .style('width', widthPct + '%');
 
                 if (isCollapsed) {
-                    context.ui().onResize([-sidebarWidth * scaleX, 0]);
+                    context.ui().resize([-sidebarWidth * scaleX, 0]);
                 } else {
-                    context.ui().onResize([-dx * scaleX, 0]);
+                    context.ui().resize([-dx * scaleX, 0]);
                 }
             }
         }
@@ -196,7 +192,7 @@ export function uiSidebar(context) {
                 if (context.mode().id === 'drag-note') return;
                 _wasNote = true;
 
-                var osm = services.osm;
+                var osm = context.services.get('osm');
                 if (osm) {
                     datum = osm.getNote(datum.id); // marker may contain stale data - get latest
                 }
@@ -210,7 +206,7 @@ export function uiSidebar(context) {
             } else if (datum instanceof QAItem) {
                 _wasQaItem = true;
 
-                var errService = services[datum.service];
+                var errService = context.services.get(datum.service);
                 if (errService) {
                     // marker may contain stale data - get latest
                     datum = errService.getError(datum.id);
@@ -366,13 +362,12 @@ export function uiSidebar(context) {
 
 
         sidebar.toggle = function(moveMap) {
-
             // Don't allow sidebar to toggle when the user is in the walkthrough.
-            if (context.inIntro()) return;
+            if (context.inIntro) return;
 
             var isCollapsed = selection.classed('collapsed');
             var isCollapsing = !isCollapsed;
-            var isRTL = (localizer.textDirection() === 'rtl');
+            var isRTL = context.localizationSystem().isRTL();
             var scaleX = isRTL ? 0 : 1;
             var xMarginProperty = isRTL ? 'margin-right' : 'margin-left';
 
@@ -403,7 +398,7 @@ export function uiSidebar(context) {
                     return function(t) {
                         var dx = lastMargin - Math.round(i(t));
                         lastMargin = lastMargin - dx;
-                        context.ui().onResize(moveMap ? undefined : [dx * scaleX, 0]);
+                        context.ui().resize(moveMap ? undefined : [dx * scaleX, 0]);
                     };
                 })
                 .on('end', function() {
diff --git a/modules/ui/source_switch.js b/modules/ui/source_switch.js
index 0933848aa4..9095966886 100644
--- a/modules/ui/source_switch.js
+++ b/modules/ui/source_switch.js
@@ -1,53 +1,50 @@
 import { select as d3_select } from 'd3-selection';
-import { t } from '../core/localizer';
 
 
 export function uiSourceSwitch(context) {
-    var keys;
+  let keys;
 
-    function click(d3_event) {
-        d3_event.preventDefault();
+  function click(d3_event) {
+    d3_event.preventDefault();
 
-        var osm = context.connection();
-        if (!osm) return;
+    const osm = context.services.get('osm');
+    if (!osm) return;
 
-        if (context.inIntro()) return;
+    if (context.inIntro) return;
+    if (context.editSystem().hasChanges() && !window.confirm(context.t('source_switch.lose_changes'))) return;
 
-        if (context.history().hasChanges() &&
-            !window.confirm(t('source_switch.lose_changes'))) return;
+    let isLive = d3_select(this)
+      .classed('live');
 
-        var isLive = d3_select(this)
-            .classed('live');
+    isLive = !isLive;
+    context.enter('browse');
+    context.editSystem().clearSaved();   // remove saved history
+    context.reset();                     // remove stored data
 
-        isLive = !isLive;
-        context.enter('browse');
-        context.history().clearSaved();          // remove saved history
-        context.flush();                         // remove stored data
+    d3_select(this)
+      .html(isLive ? context.tHtml('source_switch.live') : context.tHtml('source_switch.dev'))
+      .classed('live', isLive)
+      .classed('chip', isLive);
 
-        d3_select(this)
-            .html(isLive ? t.html('source_switch.live') : t.html('source_switch.dev'))
-            .classed('live', isLive)
-            .classed('chip', isLive);
+    osm.switch(isLive ? keys[0] : keys[1]);  // switch connection (warning: dispatches 'change' event)
+  }
 
-        osm.switch(isLive ? keys[0] : keys[1]);  // switch connection (warning: dispatches 'change' event)
-    }
+  let sourceSwitch = function(selection) {
+    selection
+      .append('a')
+      .attr('href', '#')
+      .html(context.tHtml('source_switch.live'))
+      .attr('class', 'live chip')
+      .on('click', click);
+  };
 
-    var sourceSwitch = function(selection) {
-        selection
-            .append('a')
-            .attr('href', '#')
-            .html(t.html('source_switch.live'))
-            .attr('class', 'live chip')
-            .on('click', click);
-    };
 
-
-    sourceSwitch.keys = function(val) {
-        if (!arguments.length) return keys;
-        keys = val;
-        return sourceSwitch;
-    };
+  sourceSwitch.keys = function(val) {
+    if (!arguments.length) return keys;
+    keys = val;
+    return sourceSwitch;
+  };
 
 
-    return sourceSwitch;
+  return sourceSwitch;
 }
diff --git a/modules/ui/spinner.js b/modules/ui/spinner.js
index d15d70dd79..e6faf31c88 100644
--- a/modules/ui/spinner.js
+++ b/modules/ui/spinner.js
@@ -1,5 +1,5 @@
 export function uiSpinner(context) {
-    var osm = context.connection();
+    var osm = context.services.get('osm');
 
 
     return function(selection) {
diff --git a/modules/ui/splash.js b/modules/ui/splash.js
index 129fa7c0cd..5fdd632d19 100644
--- a/modules/ui/splash.js
+++ b/modules/ui/splash.js
@@ -1,7 +1,4 @@
-import { prefs } from '../core/preferences';
-import { fileFetcher } from '../core/file_fetcher';
-import { t } from '../core/localizer';
-import { uiIntro } from './intro';
+import { uiIntro } from './intro/intro';
 import { uiModal } from './modal';
 
 
@@ -10,24 +7,26 @@ export function uiSplash(context) {
     // Exception - if there are restorable changes, skip this splash screen.
     // This is because we currently only support one `uiModal` at a time
     //  and we need to show them `uiRestore`` instead of this one.
-    if (context.history().hasRestorableChanges()) return;
+    const prefs = context.storageSystem();
+    if (context.editSystem().hasRestorableChanges()) return;
 
     // If user has not seen this version of the privacy policy, show the splash again.
     let updateMessage = '';
     const sawPrivacyVersion = prefs('sawPrivacyVersion');
     let showSplash = !prefs('sawSplash');
     if (sawPrivacyVersion !== context.privacyVersion) {
-      updateMessage = t('splash.privacy_update');
+      updateMessage = context.t('splash.privacy_update');
       showSplash = true;
     }
 
     if (!showSplash) return;
 
-    prefs('sawSplash', true);
-    prefs('sawPrivacyVersion', context.privacyVersion);
+    prefs.setItem('sawSplash', true);
+    prefs.setItem('sawPrivacyVersion', context.privacyVersion);
 
     // fetch intro graph data now, while user is looking at the splash screen
-    fileFetcher.get('intro_graph');
+    const dataLoaderSystem = context.dataLoaderSystem();
+    dataLoaderSystem.get('intro_graph');
 
     let modalSelection = uiModal(selection);
 
@@ -42,7 +41,7 @@ export function uiSplash(context) {
       .append('div')
       .attr('class','modal-section')
       .append('h3')
-      .html(t.html('splash.welcome'));
+      .text(context.t('splash.welcome'));
 
     let modalSection = introModal
       .append('div')
@@ -50,7 +49,7 @@ export function uiSplash(context) {
 
     modalSection
       .append('p')
-      .html(t.html('splash.text', {
+      .html(context.tHtml('splash.text', {
         version: context.version,
         website: '<a target="_blank" href="https://github.com/openstreetmap/iD/blob/develop/CHANGELOG.md#whats-new">changelog</a>',
         github: '<a target="_blank" href="https://github.com/openstreetmap/iD/issues">github.com</a>'
@@ -58,10 +57,10 @@ export function uiSplash(context) {
 
     modalSection
       .append('p')
-      .html(t.html('splash.privacy', {
+      .html(context.tHtml('splash.privacy', {
         updateMessage: updateMessage,
         privacyLink: '<a target="_blank" href="https://github.com/openstreetmap/iD/blob/release/PRIVACY.md">' +
-          t('splash.privacy_policy') + '</a>'
+          context.t('splash.privacy_policy') + '</a>'
       }));
 
     let buttonWrap = introModal
@@ -84,7 +83,7 @@ export function uiSplash(context) {
 
     walkthrough
       .append('div')
-      .html(t.html('splash.walkthrough'));
+      .html(context.tHtml('splash.walkthrough'));
 
     let startEditing = buttonWrap
       .append('button')
@@ -99,7 +98,7 @@ export function uiSplash(context) {
 
     startEditing
       .append('div')
-      .html(t.html('splash.start'));
+      .html(context.tHtml('splash.start'));
 
     modalSelection.select('button.close')
       .attr('class','hide');
diff --git a/modules/ui/status.js b/modules/ui/status.js
index a9a231298f..ad90c150c2 100644
--- a/modules/ui/status.js
+++ b/modules/ui/status.js
@@ -1,85 +1,84 @@
 import _throttle from 'lodash-es/throttle';
 
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 
 
 export function uiStatus(context) {
-    var osm = context.connection();
-
-
-    return function(selection) {
-        if (!osm) return;
-
-        function update(err, apiStatus) {
-            selection.html('');
-
-            if (err) {
-                if (apiStatus === 'connectionSwitched') {
-                    // if the connection was just switched, we can't rely on
-                    // the status (we're getting the status of the previous api)
-                    return;
-
-                } else if (apiStatus === 'rateLimited') {
-                    selection
-                        .html(t.html('osm_api_status.message.rateLimit'))
-                        .append('a')
-                        .attr('href', '#')
-                        .attr('class', 'api-status-login')
-                        .attr('target', '_blank')
-                        .call(uiIcon('#rapid-icon-out-link', 'inline'))
-                        .append('span')
-                        .html(t.html('login'))
-                        .on('click.login', function(d3_event) {
-                            d3_event.preventDefault();
-                            osm.authenticate();
-                        });
-                } else {
-
-                    // don't allow retrying too rapidly
-                    var throttledRetry = _throttle(function() {
-                        // try loading the visible tiles
-                        context.loadTiles(context.projection);
-                        // manually reload the status too in case all visible tiles were already loaded
-                        osm.reloadApiStatus();
-                    }, 2000);
-
-                    // eslint-disable-next-line no-warning-comments
-                    // TODO: nice messages for different error types
-                    selection
-                        .html(t.html('osm_api_status.message.error') + ' ')
-                        .append('a')
-                        .attr('href', '#')
-                        // let the user manually retry their connection directly
-                        .html(t.html('osm_api_status.retry'))
-                        .on('click.retry', function(d3_event) {
-                            d3_event.preventDefault();
-                            throttledRetry();
-                        });
-                }
-
-            } else if (apiStatus === 'readonly') {
-                selection.html(t.html('osm_api_status.message.readonly'));
-            } else if (apiStatus === 'offline') {
-                selection.html(t.html('osm_api_status.message.offline'));
-            }
-
-            selection.attr('class', 'api-status ' + (err ? 'error' : apiStatus));
+  const osm = context.services.get('osm');
+
+
+  return function(selection) {
+    if (!osm) return;
+
+    function update(err, apiStatus) {
+      selection.html('');
+
+      if (err) {
+        if (apiStatus === 'connectionSwitched') {
+          // if the connection was just switched, we can't rely on
+          // the status (we're getting the status of the previous api)
+          return;
+
+        } else if (apiStatus === 'rateLimited') {
+          selection
+            .html(context.tHtml('osm_api_status.message.rateLimit'))
+            .append('a')
+            .attr('href', '#')
+            .attr('class', 'api-status-login')
+            .attr('target', '_blank')
+            .call(uiIcon('#rapid-icon-out-link', 'inline'))
+            .append('span')
+            .html(context.tHtml('login'))
+            .on('click.login', d3_event => {
+              d3_event.preventDefault();
+              osm.authenticate();
+            });
+        } else {
+
+        // don't allow retrying too rapidly
+        const throttledRetry = _throttle(() => {
+          // try loading the visible tiles
+          context.loadTiles(context.projection);
+          // manually reload the status too in case all visible tiles were already loaded
+          osm.reloadApiStatus();
+        }, 2000);
+
+        // eslint-disable-next-line no-warning-comments
+        // TODO: nice messages for different error types
+        selection
+          .html(context.tHtml('osm_api_status.message.error') + ' ')
+          .append('a')
+          .attr('href', '#')
+          // let the user manually retry their connection directly
+          .html(context.tHtml('osm_api_status.retry'))
+          .on('click.retry', d3_event => {
+            d3_event.preventDefault();
+            throttledRetry();
+          });
         }
 
-        osm.on('apiStatusChange.uiStatus', update);
+      } else if (apiStatus === 'readonly') {
+        selection.html(context.tHtml('osm_api_status.message.readonly'));
+      } else if (apiStatus === 'offline') {
+        selection.html(context.tHtml('osm_api_status.message.offline'));
+      }
 
-        context.history().on('storage_error', () => {
-            selection.html(t.html('osm_api_status.message.local_storage_full'));
-            selection.attr('class', 'api-status error');
-        });
+      selection.attr('class', 'api-status ' + (err ? 'error' : apiStatus));
+    }
 
-        // reload the status periodically regardless of other factors
-        window.setInterval(function() {
-            osm.reloadApiStatus();
-        }, 90000);
+    osm.on('apiStatusChange.uiStatus', update);
 
-        // load the initial status in case no OSM data was loaded yet
-        osm.reloadApiStatus();
-    };
+    context.editSystem().on('storage_error', () => {
+      selection.html(context.tHtml('osm_api_status.message.local_storage_full'));
+      selection.attr('class', 'api-status error');
+    });
+
+    // reload the status periodically regardless of other factors
+    window.setInterval(() => {
+      osm.reloadApiStatus();
+    }, 90000);
+
+    // load the initial status in case no OSM data was loaded yet
+    osm.reloadApiStatus();
+  };
 }
diff --git a/modules/ui/success.js b/modules/ui/success.js
index 8b7f9acd1e..fc0b839ff7 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -3,10 +3,6 @@ import { select as d3_select } from 'd3-selection';
 
 import { resolveStrings } from 'osm-community-index';
 
-import { fileFetcher } from '../core/file_fetcher';
-import { locationManager } from '../core/LocationManager';
-import { t, localizer } from '../core/localizer';
-
 import { uiIcon } from './icon';
 import { uiDisclosure } from '../ui/disclosure';
 import { utilRebind } from '../util/rebind';
@@ -19,28 +15,29 @@ export function uiSuccess(context) {
   const dispatch = d3_dispatch('cancel');
   let _changeset;
   let _location;
-  ensureOSMCommunityIndex();   // start fetching the data
+  getCommunityIndexAsync();   // start fetching the data
 
 
-  function ensureOSMCommunityIndex() {
-    const data = fileFetcher;
+  function getCommunityIndexAsync() {
+    const dataLoaderSystem = context.dataLoaderSystem();
     return Promise.all([
-        data.get('oci_features'),
-        data.get('oci_resources'),
-        data.get('oci_defaults')
+        dataLoaderSystem.get('oci_features'),
+        dataLoaderSystem.get('oci_resources'),
+        dataLoaderSystem.get('oci_defaults')
       ])
       .then(vals => {
         if (_oci) return _oci;
 
         // Merge Custom Features
+        const locationSystem = context.locationSystem();
         if (vals[0] && Array.isArray(vals[0].features)) {
-          locationManager.mergeCustomGeoJSON(vals[0]);
+          locationSystem.mergeCustomGeoJSON(vals[0]);
         }
 
         let ociResources = Object.values(vals[1].resources);
         if (ociResources.length) {
           // Resolve all locationSet features.
-          return locationManager.mergeLocationSets(ociResources)
+          return locationSystem.mergeLocationSets(ociResources)
             .then(() => {
               _oci = {
                 resources: ociResources,
@@ -82,7 +79,7 @@ export function uiSuccess(context) {
 
     header
       .append('h3')
-      .html(t.html('success.just_edited'));
+      .html(context.tHtml('success.just_edited'));
 
     header
       .append('button')
@@ -100,20 +97,20 @@ export function uiSuccess(context) {
 
     summary
       .append('h3')
-      .html(t.html('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
+      .html(context.tHtml('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
 
     summary
       .append('p')
-      .html(t.html('success.help_html'))
+      .html(context.tHtml('success.help_html'))
       .append('a')
       .attr('class', 'link-out')
       .attr('target', '_blank')
-      .attr('href', t('success.help_link_url'))
+      .attr('href', context.t('success.help_link_url'))
       .call(uiIcon('#rapid-icon-out-link', 'inline'))
       .append('span')
-      .html(t.html('success.help_link_text'));
+      .html(context.tHtml('success.help_link_text'));
 
-    let osm = context.connection();
+    let osm = context.services.get('osm');
     if (!osm) return;
 
     let changesetURL = osm.changesetURL(_changeset.id);
@@ -146,20 +143,21 @@ export function uiSuccess(context) {
       .attr('class', 'cell-detail summary-view-on-osm')
       .attr('target', '_blank')
       .attr('href', changesetURL)
-      .html(t.html('success.view_on_osm'));
+      .html(context.tHtml('success.view_on_osm'));
 
     summaryDetail
       .append('div')
-      .html(t.html('success.changeset_id', {
+      .html(context.tHtml('success.changeset_id', {
         changeset_id: `<a href="${changesetURL}" target="_blank">${_changeset.id}</a>`
       }));
 
 
     // Get OSM community index features intersecting the map..
-    ensureOSMCommunityIndex()
+    getCommunityIndexAsync()
       .then(oci => {
-        const loc = context.map().center();
-        const validHere = locationManager.locationSetsAt(loc);
+        const loc = context.mapSystem().center();
+        const locationSystem = context.locationSystem();
+        const validHere = locationSystem.locationSetsAt(loc);
 
         // Gather the communities
         let communities = [];
@@ -168,8 +166,8 @@ export function uiSuccess(context) {
           if (!area) return;
 
           // Resolve strings
-          const localizer = (stringID) => t.html(`community.${stringID}`);
-          resource.resolved = resolveStrings(resource, oci.defaults, localizer);
+          const localize = (stringID) => context.tHtml(`community.${stringID}`);
+          resource.resolved = resolveStrings(resource, oci.defaults, localize);
 
           communities.push({
             area: area,
@@ -194,7 +192,7 @@ export function uiSuccess(context) {
 
     communityLinks
       .append('h3')
-      .html(t.html('success.like_osm'));
+      .html(context.tHtml('success.like_osm'));
 
     let table = communityLinks
       .append('table')
@@ -228,14 +226,14 @@ export function uiSuccess(context) {
     communityLinks
       .append('div')
       .attr('class', 'community-missing')
-      .html(t.html('success.missing'))
+      .html(context.tHtml('success.missing'))
       .append('a')
       .attr('class', 'link-out')
       .attr('target', '_blank')
       .call(uiIcon('#rapid-icon-out-link', 'inline'))
       .attr('href', 'https://github.com/osmlab/osm-community-index/issues')
       .append('span')
-      .html(t.html('success.tell_us'));
+      .html(context.tHtml('success.tell_us'));
   }
 
 
@@ -260,7 +258,7 @@ export function uiSuccess(context) {
         .call(uiDisclosure(context, `community-more-${d.id}`, false)
           .expanded(false)
           .updatePreference(false)
-          .label(t.html('success.more'))
+          .label(context.tHtml('success.more'))
           .content(showMore)
         );
     }
@@ -286,7 +284,7 @@ export function uiSuccess(context) {
         .call(uiDisclosure(context, `community-events-${d.id}`, false)
           .expanded(false)
           .updatePreference(false)
-          .label(t.html('success.events'))
+          .label(context.tHtml('success.events'))
           .content(showNextEvents)
         )
         .select('.hide-toggle')
@@ -313,13 +311,13 @@ export function uiSuccess(context) {
 
       if (d.languageCodes && d.languageCodes.length) {
         const languageList = d.languageCodes
-          .map(code => localizer.languageName(code))
+          .map(code => context.localizationSystem().languageName(code))
           .join(', ');
 
         moreEnter
           .append('div')
           .attr('class', 'community-languages')
-          .html(t.html('success.languages', { languages: languageList }));
+          .html(context.tHtml('success.languages', { languages: languageList }));
       }
     }
 
@@ -345,7 +343,7 @@ export function uiSuccess(context) {
         .html(d => {
           let name = d.name;
           if (d.i18n && d.id) {
-            name = t(`community.${communityID}.events.${d.id}.name`, { default: name });
+            name = context.t(`community.${communityID}.events.${d.id}.name`, { default: name });
           }
           return name;
         });
@@ -359,7 +357,8 @@ export function uiSuccess(context) {
             options.hour = 'numeric';
             options.minute = 'numeric';
           }
-          return d.date.toLocaleString(localizer.localeCode(), options);
+          const localeCode = context.localizationSystem().localeCode();
+          return d.date.toLocaleString(localeCode, options);
         });
 
       itemEnter
@@ -368,7 +367,7 @@ export function uiSuccess(context) {
         .html(d => {
           let where = d.where;
           if (d.i18n && d.id) {
-            where = t(`community.${communityID}.events.${d.id}.where`, { default: where });
+            where = context.t(`community.${communityID}.events.${d.id}.where`, { default: where });
           }
           return where;
         });
@@ -379,7 +378,7 @@ export function uiSuccess(context) {
         .html(d => {
           let description = d.description;
           if (d.i18n && d.id) {
-            description = t(`community.${communityID}.events.${d.id}.description`, { default: description });
+            description = context.t(`community.${communityID}.events.${d.id}.description`, { default: description });
           }
           return description;
         });
diff --git a/modules/ui/tag_reference.js b/modules/ui/tag_reference.js
index d7ad2e41f7..364840f41f 100644
--- a/modules/ui/tag_reference.js
+++ b/modules/ui/tag_reference.js
@@ -1,9 +1,5 @@
-import {
-    select as d3_select
-} from 'd3-selection';
+import { select as d3_select } from 'd3-selection';
 
-import { t, localizer } from '../core/localizer';
-import { services } from '../services';
 import { uiIcon } from './icon';
 
 
@@ -17,185 +13,197 @@ import { uiIcon } from './icon';
 //   qid: 'string'      // brand wikidata  (e.g. 'Q37158')
 // }
 //
-export function uiTagReference(what) {
-    var wikibase = what.qid ? services.wikidata : services.osmWikibase;
-    var tagReference = {};
+export function uiTagReference(context, what) {
+  const l10n = context.localizationSystem();
+  const wikibase = context.services.get(what.qid ? 'wikidata' : 'osmwikibase');
+  let tagReference = {};
 
-    var _button = d3_select(null);
-    var _body = d3_select(null);
-    var _loaded;
-    var _showing;
+  let _button = d3_select(null);
+  let _body = d3_select(null);
+  let _loaded;
+  let _showing;
 
 
-    function load() {
-        if (!wikibase) return;
+  function load() {
+    if (!wikibase) return;
 
-        _button
-            .classed('tag-reference-loading', true);
-
-        wikibase.getDocs(what, gotDocs);
-    }
+    _button
+        .classed('tag-reference-loading', true);
 
+    wikibase.getDocs(what, gotDocs);
+  }
 
-    function gotDocs(err, docs) {
-        _body.html('');
 
-        if (!docs || !docs.title) {
-            _body
-                .append('p')
-                .attr('class', 'tag-reference-description')
-                .html(t.html('inspector.no_documentation_key'));
-            done();
-            return;
-        }
+  function gotDocs(err, docs) {
+    _body.html('');
 
-        if (docs.imageURL) {
-            _body
-                .append('img')
-                .attr('class', 'tag-reference-wiki-image')
-                .attr('src', docs.imageURL)
-                .on('load', function() { done(); })
-                .on('error', function() { d3_select(this).remove(); done(); });
-        } else {
-            done();
-        }
+    if (!docs || !docs.title) {
+      _body
+        .append('p')
+        .attr('class', 'tag-reference-description')
+        .html(l10n.tHtml('inspector.no_documentation_key'));
+      done();
+      return;
+    }
 
-        _body
-            .append('p')
-            .attr('class', 'tag-reference-description')
-            .html(docs.description ? localizer.htmlForLocalizedText(docs.description, docs.descriptionLocaleCode) : t.html('inspector.no_documentation_key'))
-            .append('a')
-            .attr('class', 'tag-reference-edit')
-            .attr('target', '_blank')
-            .attr('title', t('inspector.edit_reference'))
-            .attr('href', docs.editURL)
-            .call(uiIcon('#rapid-icon-edit', 'inline'));
-
-        if (docs.wiki) {
-            _body
-              .append('a')
-              .attr('class', 'tag-reference-link')
-              .attr('target', '_blank')
-              .attr('href', docs.wiki.url)
-              .call(uiIcon('#rapid-icon-out-link', 'inline'))
-              .append('span')
-              .html(t.html(docs.wiki.text));
-        }
+    if (docs.imageURL) {
+      _body
+        .append('img')
+        .attr('class', 'tag-reference-wiki-image')
+        .attr('src', docs.imageURL)
+        .on('load', () => done())
+        .on('error', function() {
+          d3_select(this).remove();
+          done();
+        });
+    } else {
+      done();
+    }
 
-        // Add link to info about "good changeset comments" - #2923
-        if (what.key === 'comment') {
-            _body
-                .append('a')
-                .attr('class', 'tag-reference-comment-link')
-                .attr('target', '_blank')
-                .call(uiIcon('#rapid-icon-out-link', 'inline'))
-                .attr('href', t('commit.about_changeset_comments_link'))
-                .append('span')
-                .html(t.html('commit.about_changeset_comments'));
-        }
+    let docsHtml;
+    if (docs.description) {
+      docsHtml = l10n.htmlForLocalizedText(docs.description, docs.descriptionLocaleCode);
+    } else {
+      docsHtml = l10n.tHtml('inspector.no_documentation_key');
     }
 
+    _body
+      .append('p')
+      .attr('class', 'tag-reference-description')
+      .html(docsHtml)
+      .append('a')
+      .attr('class', 'tag-reference-edit')
+      .attr('target', '_blank')
+      .attr('title', l10n.t('inspector.edit_reference'))
+      .attr('href', docs.editURL)
+      .call(uiIcon('#rapid-icon-edit', 'inline'));
+
+    if (docs.wiki) {
+      _body
+        .append('a')
+        .attr('class', 'tag-reference-link')
+        .attr('target', '_blank')
+        .attr('href', docs.wiki.url)
+        .call(uiIcon('#rapid-icon-out-link', 'inline'))
+        .append('span')
+        .html(l10n.tHtml(docs.wiki.text));
+    }
 
-    function done() {
-        _loaded = true;
+    // Add link to info about "good changeset comments" - iD#2923
+    if (what.key === 'comment') {
+      _body
+        .append('a')
+        .attr('class', 'tag-reference-comment-link')
+        .attr('target', '_blank')
+        .call(uiIcon('#rapid-icon-out-link', 'inline'))
+        .attr('href', l10n.t('commit.about_changeset_comments_link'))
+        .append('span')
+        .html(l10n.tHtml('commit.about_changeset_comments'));
+    }
+  }
 
-        _button
-            .classed('tag-reference-loading', false);
 
-        _body
-            .classed('expanded', true)
-            .transition()
-            .duration(200)
-            .style('max-height', '200px')
-            .style('opacity', '1');
+  function done() {
+    _loaded = true;
 
-        _showing = true;
+    _button
+      .classed('tag-reference-loading', false);
 
-        _button.selectAll('svg.icon use').each(function() {
-            var iconUse = d3_select(this);
-            if (iconUse.attr('href') === '#rapid-icon-info') {
-                iconUse.attr('href', '#rapid-icon-info-filled');
-            }
-        });
-    }
+    _body
+      .classed('expanded', true)
+      .transition()
+      .duration(200)
+      .style('max-height', '200px')
+      .style('opacity', '1');
 
+    _showing = true;
 
-    function hide() {
-        _body
-            .transition()
-            .duration(200)
-            .style('max-height', '0px')
-            .style('opacity', '0')
-            .on('end', function () {
-                _body.classed('expanded', false);
-            });
+    _button.selectAll('svg.icon use')
+      .each((d, i, nodes) => {
+        let iconUse = d3_select(nodes[i]);
+        if (iconUse.attr('href') === '#rapid-icon-info') {
+          iconUse.attr('href', '#rapid-icon-info-filled');
+        }
+      });
+  }
+
+
+  function hide() {
+    _body
+      .transition()
+      .duration(200)
+      .style('max-height', '0px')
+      .style('opacity', '0')
+      .on('end', () => {
+        _body.classed('expanded', false);
+      });
+
+    _showing = false;
+
+    _button.selectAll('svg.icon use')
+      .each((d, i, nodes) => {
+        let iconUse = d3_select(nodes[i]);
+        if (iconUse.attr('href') === '#rapid-icon-info-filled') {
+          iconUse.attr('href', '#rapid-icon-info');
+        }
+      });
+  }
+
+
+  tagReference.button = function(selection, klass, iconName) {
+    _button = selection.selectAll('.tag-reference-button')
+      .data([0]);
+
+    _button = _button.enter()
+      .append('button')
+      .attr('class', 'tag-reference-button ' + (klass || ''))
+      .attr('title', l10n.t('icons.information'))
+      .call(uiIcon('#rapid-icon-' + (iconName || 'inspect')))
+      .merge(_button);
+
+    _button
+      .on('click', function (d3_event) {
+        d3_event.stopPropagation();
+        d3_event.preventDefault();
+        this.blur();    // avoid keeping focus on the button - iD#4641
+        if (_showing) {
+          hide();
+        } else if (_loaded) {
+          done();
+        } else {
+          load();
+        }
+      });
+  };
 
-        _showing = false;
 
-        _button.selectAll('svg.icon use').each(function() {
-            var iconUse = d3_select(this);
-            if (iconUse.attr('href') === '#rapid-icon-info-filled') {
-                iconUse.attr('href', '#rapid-icon-info');
-            }
-        });
+  tagReference.body = function(selection) {
+    let itemID = what.qid || (what.key + '-' + (what.value || ''));
+    _body = selection.selectAll('.tag-reference-body')
+      .data([itemID], d => d);
 
-    }
+    _body.exit()
+      .remove();
 
+    _body = _body.enter()
+      .append('div')
+      .attr('class', 'tag-reference-body')
+      .style('max-height', '0')
+      .style('opacity', '0')
+      .merge(_body);
 
-    tagReference.button = function(selection, klass, iconName) {
-        _button = selection.selectAll('.tag-reference-button')
-            .data([0]);
-
-        _button = _button.enter()
-            .append('button')
-            .attr('class', 'tag-reference-button ' + (klass || ''))
-            .attr('title', t('icons.information'))
-            .call(uiIcon('#rapid-icon-' + (iconName || 'inspect')))
-            .merge(_button);
-
-        _button
-            .on('click', function (d3_event) {
-                d3_event.stopPropagation();
-                d3_event.preventDefault();
-                this.blur();    // avoid keeping focus on the button - #4641
-                if (_showing) {
-                    hide();
-                } else if (_loaded) {
-                    done();
-                } else {
-                    load();
-                }
-            });
-    };
-
-
-    tagReference.body = function(selection) {
-        var itemID = what.qid || (what.key + '-' + (what.value || ''));
-        _body = selection.selectAll('.tag-reference-body')
-            .data([itemID], function(d) { return d; });
-
-        _body.exit()
-            .remove();
-
-        _body = _body.enter()
-            .append('div')
-            .attr('class', 'tag-reference-body')
-            .style('max-height', '0')
-            .style('opacity', '0')
-            .merge(_body);
-
-        if (_showing === false) {
-            hide();
-        }
-    };
+    if (_showing === false) {
+      hide();
+    }
+  };
 
 
-    tagReference.showing = function(val) {
-        if (!arguments.length) return _showing;
-        _showing = val;
-        return tagReference;
-    };
+  tagReference.showing = function(val) {
+    if (!arguments.length) return _showing;
+    _showing = val;
+    return tagReference;
+  };
 
 
-    return tagReference;
+  return tagReference;
 }
diff --git a/modules/ui/tools/3dmap/3d_map.js b/modules/ui/tools/3dmap/3d_map.js
deleted file mode 100644
index f0ba6c5ffd..0000000000
--- a/modules/ui/tools/3dmap/3d_map.js
+++ /dev/null
@@ -1,241 +0,0 @@
-import { select as d3_select } from 'd3-selection';
-import { styleMatch } from '../../../pixi/styles';
-import * as PIXI from 'pixi.js';
-
-import { Map } from '../../../3drenderer/Map';
-
-import { t } from '../../../core/localizer';
-import { uiCmd } from '../../cmd';
-
-/*
- * ui3DMap is a ui panel containing a maplibre 3D Map for visualizing buildings, roads, and areas.
- * @param {*} context
- * @returns
- */
-export function ui3DMap(context) {
-  function threeDMap(selection) {
-    let wrap = d3_select(null);
-    let _isHidden = true; // start out hidden
-    let _map;
-
-    function redraw() {
-      if (_isHidden) return;
-      updateProjection();
-      featuresToGeoJSON();
-    }
-
-    function updateProjection() {
-      // Since the bounds are intended to wrap a box around a perfectly orthogonal view,
-      // for a pitched, isometric view we need to enlarge the box a bit to display more buildings.
-      let extent = context.map().extent();
-      let center = extent.center();
-      extent.padByMeters(100);
-
-      _map.map.jumpTo({
-        center: center,
-        bearing: 0,
-        zoom: context.map().zoom() - 3,
-      });
-    }
-
-    function featuresToGeoJSON() {
-      let mainmap = context.map();
-      const entities = context.history().intersects(mainmap.extent());
-      const buildingEnts = entities.filter((ent) => {
-        const tags = Object.keys(ent.tags).filter((tagname) =>
-          tagname.startsWith('building')
-        );
-        return tags.length > 0;
-      });
-      const highwayEnts = entities.filter((ent) => {
-        const tags = Object.keys(ent.tags).filter((tagname) =>
-          tagname.startsWith('highway')
-        );
-        return tags.length > 0;
-      });
-      const areaEnts = entities.filter((ent) => {
-        const tags = Object.keys(ent.tags).filter(
-          (tagname) =>
-            tagname.startsWith('landuse') ||
-            tagname.startsWith('leisure') ||
-            tagname.startsWith('natural') ||
-            tagname.startsWith('area')
-        );
-        return tags.length > 0;
-      });
-      generateRoadLayer(context, highwayEnts, _map);
-      generateBuildingLayer(context, buildingEnts, _map);
-      generateAreaLayer(context, areaEnts, _map);
-    }
-
-    function toggle(d3_event) {
-      if (d3_event) d3_event.preventDefault();
-
-      _isHidden = !_isHidden;
-
-      context
-        .container()
-        .select('.three-d-map-toggle-item')
-        .classed('active', !_isHidden)
-        .select('input')
-        .property('checked', !_isHidden);
-
-      if (_isHidden) {
-        wrap
-          .style('display', 'block')
-          .style('opacity', '1')
-          .transition()
-          .duration(200)
-          .style('opacity', '0')
-          .on('end', () =>
-            selection.selectAll('.three-d-map').style('display', 'none')
-          );
-      } else {
-        wrap
-          .style('display', 'block')
-          .style('opacity', '0')
-          .transition()
-          .duration(200)
-          .style('opacity', '1')
-          .on('end', () => redraw());
-      }
-    }
-
-    /* setup */
-    ui3DMap.toggle = toggle;
-
-    wrap = selection.selectAll('.three-d-map').data([0]);
-
-    let wrapEnter = wrap
-      .enter()
-      .append('div')
-      .attr('class', 'three-d-map')
-      .attr('id', '3d-buildings')
-      .style('display', _isHidden ? 'none' : 'block');
-
-    wrap = wrapEnter.merge(wrap);
-
-    _map = new Map('3d-buildings', context); // container id
-    context.map().on('draw', () => redraw());
-    context.map().on('move', () => redraw());
-
-    context.on('enter.3dmap', () => {
-      featuresToGeoJSON();
-    });
-    context.history().on('change.3dmap', () => {
-      featuresToGeoJSON();
-    });
-
-    redraw();
-
-    context.keybinding().on([uiCmd('⌘' + t('background.3dmap.key'))], toggle);
-  }
-
-  return threeDMap;
-}
-
-function generateBuildingLayer(context, buildingEnts, _map) {
-  let buildingFeatures = [];
-  let selectedIDs = context.selectedIDs();
-  for (const buildingEnt of buildingEnts) {
-    let gj = buildingEnt.asGeoJSON(context.graph());
-    if (gj.type !== 'Polygon' && gj.type !== 'MultiPolygon') continue;
-
-    let newFeature = {
-      type: 'Feature',
-      properties: {
-        extrude: true,
-        selected: selectedIDs.includes(buildingEnt.id).toString(),
-        min_height: buildingEnt.tags.min_height
-          ? parseFloat(buildingEnt.tags.min_height)
-          : 0,
-        height: parseFloat(
-          buildingEnt.tags.height ||
-            buildingEnt.tags['building:levels'] * 3 ||
-            0
-        ),
-      },
-      geometry: gj,
-    };
-
-    buildingFeatures.push(newFeature);
-  }
-
-  const buildingSource = _map.map.getSource('osmbuildings');
-
-  if (buildingSource) {
-    buildingSource.setData({
-      type: 'FeatureCollection',
-      features: buildingFeatures,
-    });
-  }
-}
-
-function generateAreaLayer(context, areaEnts, _map) {
-  let areaFeatures = [];
-  let selectedIDs = context.selectedIDs();
-  for (const areaEnt of areaEnts) {
-    let gj = areaEnt.asGeoJSON(context.graph());
-    if (gj.type !== 'Polygon' && gj.type !== 'MultiPolygon') continue;
-
-    const style = styleMatch(areaEnt.tags);
-    const fillColor = PIXI.utils.hex2string(style.fill.color);
-    const strokeColor = PIXI.utils.hex2string(style.stroke.color);
-
-    let newFeature = {
-      type: 'Feature',
-      properties: {
-        selected: selectedIDs.includes(areaEnt.id).toString(),
-        fillcolor: fillColor,
-        strokecolor: strokeColor,
-      },
-      geometry: gj,
-    };
-
-    areaFeatures.push(newFeature);
-  }
-
-  const areaSource = _map.map.getSource('osmareas');
-
-  if (areaSource) {
-    areaSource.setData({
-      type: 'FeatureCollection',
-      features: areaFeatures,
-    });
-  }
-}
-
-function generateRoadLayer(context, roadEnts, _map) {
-  let roadFeatures = [];
-  let selectedIDs = context.selectedIDs();
-  for (const roadEnt of roadEnts) {
-    let gj = roadEnt.asGeoJSON(context.graph());
-    if (gj.type !== 'LineString') continue;
-
-    const style = styleMatch(roadEnt.tags);
-    const casingColor = PIXI.utils.hex2string(style.casing.color);
-    const strokeColor = PIXI.utils.hex2string(style.stroke.color);
-
-    let newFeature = {
-      type: 'Feature',
-      properties: {
-        selected: selectedIDs.includes(roadEnt.id).toString(),
-        highway: roadEnt.tags.highway,
-        casingColor: casingColor,
-        strokeColor: strokeColor,
-      },
-      geometry: gj,
-    };
-
-    roadFeatures.push(newFeature);
-  }
-
-  const roadSource = _map.map.getSource('osmroads');
-
-  if (roadSource) {
-    roadSource.setData({
-      type: 'FeatureCollection',
-      features: roadFeatures,
-    });
-  }
-}
diff --git a/modules/ui/tools/download_osc.js b/modules/ui/tools/download_osc.js
index cda64f2683..c3f7f6f6f5 100644
--- a/modules/ui/tools/download_osc.js
+++ b/modules/ui/tools/download_osc.js
@@ -1,6 +1,3 @@
-import { select as d3_select } from 'd3-selection';
-
-import { t } from '../../core/localizer';
 import { JXON } from '../../util/jxon';
 import { osmChangeset } from '../../osm';
 import { actionDiscardTags } from '../../actions';
@@ -11,11 +8,11 @@ import { uiTooltip } from '../tooltip';
 export function uiToolDownloadOsc(context) {
   let tool = {
     id: 'download_osc',
-    label: t('download_osc.title')
+    label: context.t('download_osc.title')
   };
 
-  let button = d3_select(null);
-  let tooltip = null;
+  let _button = null;
+  let _tooltip = null;
   let _numChanges = 0;
 
   function isDisabled() {
@@ -24,28 +21,36 @@ export function uiToolDownloadOsc(context) {
 
   function downloadOsc(d3_event) {
     d3_event.preventDefault();
-    let history = context.history();
-    if (!context.inIntro() && history.hasChanges()) {
-      const changes = history.changes(actionDiscardTags(history.difference()));
-      let changeset = new osmChangeset();
-      let osc = JXON.stringify(changeset.osmChangeJXON(changes));
-      downloadFile(osc,'change.osc');
+    const editSystem = context.editSystem();
+    if (!context.inIntro && editSystem.hasChanges()) {
+      const changes = editSystem.changes(actionDiscardTags(editSystem.difference()));
+      const changeset = new osmChangeset();
+      const osc = JXON.stringify(changeset.osmChangeJXON(changes));
+      downloadFile(osc, 'change.osc');
     }
   }
 
   function updateCount() {
-    const val = context.history().difference().summary().size;
+    if (!_tooltip) return;
+
+    const val = context.editSystem().difference().summary().size;
     if (val === _numChanges) return;   // no change
     _numChanges = val;
 
-    button.classed('disabled', isDisabled());
-    if (tooltip) {
-      tooltip
-        .title(t(_numChanges > 0 ? 'download_osc.help' : 'download_osc.no_changes'));
+    if (_tooltip) {
+      _tooltip
+        .title(context.t(_numChanges > 0 ? 'download_osc.help' : 'download_osc.no_changes'));
     }
+    updateStyle();
+  }
+
 
+  function updateStyle() {
+    if (!_button) return;
+    _button.classed('disabled', isDisabled());
   }
 
+
   function downloadFile(data, fileName) {
     let a = document.createElement('a');   // Create an invisible A element
     a.style.display = 'none';
@@ -67,41 +72,36 @@ export function uiToolDownloadOsc(context) {
 
 
   tool.install = function(selection) {
-    tooltip = uiTooltip()
+    if (_button && _tooltip) return;  // already installed
+
+    _tooltip = uiTooltip(context)
       .placement('bottom')
-      .title(t('download_osc.no_changes'));
+      .title(context.t('download_osc.no_changes'));
 
-    button = selection
+    _button = selection
       .append('button')
       .attr('class', 'downloadOsc disabled bar-button')
       .on('click', downloadOsc)
-      .call(tooltip);
+      .call(_tooltip);
 
-    button
+    _button
       .call(uiIcon('#rapid-icon-download-osc'));
 
     updateCount();
 
-
-    context.history()
-      .on('change.download_osc', updateCount);
-
-    context
-      .on('enter.download_osc', () => {
-        button.classed('disabled', isDisabled());
-      });
+    context.editSystem().on('change', updateCount);
+    context.on('modechange', updateStyle);
   };
 
 
   tool.uninstall = function() {
-    context.history()
-      .on('change.download_osc', null);
+    if (!_button && !_tooltip) return;  // already uninstalled
 
-    context
-      .on('enter.download_osc', null);
+    context.editSystem().off('change', updateCount);
+    context.off('modechange', updateStyle);
 
-    button = d3_select(null);
-    tooltip = null;
+    _button = null;
+    _tooltip = null;
   };
 
   return tool;
diff --git a/modules/ui/tools/modes.js b/modules/ui/tools/modes.js
index 806af91305..8cd4528600 100644
--- a/modules/ui/tools/modes.js
+++ b/modules/ui/tools/modes.js
@@ -1,56 +1,113 @@
-import _debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
+import debounce from 'lodash-es/debounce';
 
-import { presetManager } from '../../presets';
-import { t } from '../../core/localizer';
 import { uiIcon } from '../icon';
 import { uiTooltip } from '../tooltip';
 
 
 export function uiToolDrawModes(context) {
+  const presetSystem = context.presetSystem();
+  let debouncedUpdate;
+  let _wrap;
 
   let tool = {
     id: 'draw_modes',
-    label: t.html('toolbar.add_feature')
+    label: context.tHtml('toolbar.add_feature')
   };
 
   const modes = [
     {
       id: 'add-point',
-      title: t.html('modes.add_point.title'),
+      title: context.tHtml('modes.add_point.title'),
       button: 'point',
-      description: t.html('modes.add_point.description'),
-      preset: presetManager.item('point'),
+      description: context.tHtml('modes.add_point.description'),
+      preset: presetSystem.item('point'),
       key: '1'
     },
     {
       id: 'draw-line',
-      title: t.html('modes.add_line.title'),
+      title: context.tHtml('modes.add_line.title'),
       button: 'line',
-      description: t.html('modes.add_line.description'),
-      preset: presetManager.item('line'),
+      description: context.tHtml('modes.add_line.description'),
+      preset: presetSystem.item('line'),
       key: '2'
     },
     {
       id: 'draw-area',
-      title: t.html('modes.add_area.title'),
+      title: context.tHtml('modes.add_area.title'),
       button: 'area',
-      description: t.html('modes.add_area.description'),
-      preset: presetManager.item('area'),
+      description: context.tHtml('modes.add_area.description'),
+      preset: presetSystem.item('area'),
       key: '3'
     }
   ];
 
-  let debouncedUpdate;
+
+  function update() {
+    if (!_wrap) return;
+    let buttons = _wrap.selectAll('button.add-button')
+      .data(modes, d => d.id);
+
+    // exit
+    buttons.exit()
+      .remove();
+
+    // enter
+    let buttonsEnter = buttons.enter()
+      .append('button')
+      .attr('class', d => `${d.id} add-button bar-button`)
+      .on('click.mode-buttons', (d3_event, d) => {
+        if (!context.editable()) return;
+
+        if (d.id === 'add-area') return; //Short-circuit area drawing temporarily.
+        // When drawing, ignore accidental clicks on mode buttons - #4042
+        const currMode = context.mode().id;
+        if (/^draw/.test(currMode)) return;
+
+        if (d.id === currMode) {
+          context.enter('browse');
+        } else {
+          context.enter(d.id);
+        }
+      })
+      .call(uiTooltip(context)
+        .placement('bottom')
+        .title(d => d.description)
+        .keys(d => [d.key])
+        .scrollContainer(context.container().select('.top-toolbar'))
+      );
+
+    buttonsEnter
+      .each((d, i, nodes) => {
+        d3_select(nodes[i])
+          .call(uiIcon(`#rapid-icon-${d.button}`));
+      });
+
+    buttonsEnter
+      .append('span')
+      .attr('class', 'label')
+      .html(d => d.title);
+
+    // if we are adding/removing the buttons, check if toolbar has overflowed
+    if (buttons.enter().size() || buttons.exit().size()) {
+      context.ui().checkOverflow('.top-toolbar', true);
+    }
+
+    // update
+    buttons = buttons
+      .merge(buttonsEnter)
+      .classed('disabled', () => !context.editable())
+      .classed('active', d => (context.mode() && context.mode().id === d.id));
+  }
 
 
   tool.install = function(selection) {
-    let wrap = selection
+    _wrap = selection
       .append('div')
       .attr('class', 'joined')
       .style('display', 'flex');
 
-    debouncedUpdate = _debounce(update, 500, { leading: true, trailing: true });
+    debouncedUpdate = debounce(update, 500, { leading: true, trailing: true });
 
     modes.forEach(d => {
       context.keybinding().on(d.key, () => {
@@ -64,70 +121,9 @@ export function uiToolDrawModes(context) {
       });
     });
 
-    context.map()
-      .on('draw', debouncedUpdate);
-
-    context
-      .on('enter.modes', update);
-
+    context.mapSystem().on('draw', debouncedUpdate);
+    context.on('modechange', update);
     update();
-
-
-    function update() {
-      let buttons = wrap.selectAll('button.add-button')
-        .data(modes, d => d.id);
-
-      // exit
-      buttons.exit()
-        .remove();
-
-      // enter
-      let buttonsEnter = buttons.enter()
-        .append('button')
-        .attr('class', d => `${d.id} add-button bar-button`)
-        .on('click.mode-buttons', (d3_event, d) => {
-          if (!context.editable()) return;
-
-          if (d.id === 'add-area') return; //Short-circuit area drawing temporarily.
-          // When drawing, ignore accidental clicks on mode buttons - #4042
-          const currMode = context.mode().id;
-          if (/^draw/.test(currMode)) return;
-
-          if (d.id === currMode) {
-            context.enter('browse');
-          } else {
-            context.enter(d.id);
-          }
-        })
-        .call(uiTooltip()
-          .placement('bottom')
-          .title(d => d.description)
-          .keys(d => [d.key])
-          .scrollContainer(context.container().select('.top-toolbar'))
-        );
-
-      buttonsEnter
-        .each((d, i, nodes) => {
-          d3_select(nodes[i])
-            .call(uiIcon(`#rapid-icon-${d.button}`));
-        });
-
-      buttonsEnter
-        .append('span')
-        .attr('class', 'label')
-        .html(d => d.title);
-
-      // if we are adding/removing the buttons, check if toolbar has overflowed
-      if (buttons.enter().size() || buttons.exit().size()) {
-        context.ui().checkOverflow('.top-toolbar', true);
-      }
-
-      // update
-      buttons = buttons
-        .merge(buttonsEnter)
-        .classed('disabled', () => !context.editable())
-        .classed('active', d => (context.mode() && context.mode().id === d.id));
-    }
   };
 
 
@@ -136,11 +132,10 @@ export function uiToolDrawModes(context) {
       context.keybinding().off(d.key);
     });
 
-    context.map()
-      .off('draw', debouncedUpdate);
-
-    context
-      .on('enter.modes', null);
+    debouncedUpdate.cancel();
+    context.mapSystem().off('draw', debouncedUpdate);
+    context.off('modechange', update);
+    _wrap = null;
   };
 
   return tool;
diff --git a/modules/ui/tools/notes.js b/modules/ui/tools/notes.js
index 832ab1c04e..89683a0bed 100644
--- a/modules/ui/tools/notes.js
+++ b/modules/ui/tools/notes.js
@@ -1,7 +1,6 @@
-import _debounce from 'lodash-es/debounce';
+import debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
 
-import { t } from '../../core/localizer';
 import { uiIcon } from '../icon';
 import { uiTooltip } from '../tooltip';
 
@@ -9,15 +8,15 @@ import { uiTooltip } from '../tooltip';
 export function uiToolNotes(context) {
   let tool = {
     id: 'notes',
-    label: t.html('modes.add_note.label')
+    label: context.tHtml('modes.add_note.label')
   };
 
   const mode = {
     id: 'add-note',
-    title: t.html('modes.add_note.title'),
+    title: context.tHtml('modes.add_note.title'),
     button: 'note',
-    description: t.html('modes.add_note.description'),
-    key: t('modes.add_note.key')
+    description: context.tHtml('modes.add_note.description'),
+    key: context.t('modes.add_note.key')
   };
 
 
@@ -30,10 +29,66 @@ export function uiToolNotes(context) {
   }
 
   let debouncedUpdate;
+  let _selection;
+
+
+  function update() {
+    if (!_selection) return;
+
+    const data = notesEnabled() ? [mode] : [];
+    let buttons = _selection.selectAll('button.add-button')
+      .data(data, d => d.id);
+
+    // exit
+    buttons.exit()
+      .remove();
+
+    // enter
+    let buttonsEnter = buttons.enter()
+      .append('button')
+      .attr('class', d => `${d.id} add-button bar-button`)
+      .on('click.notes', (d3_event, d) => {
+        if (!notesEditable()) return;
+
+        // When drawing, ignore accidental clicks on mode buttons - #4042
+        var currMode = context.mode().id;
+        if (/^draw/.test(currMode)) return;
+
+        if (d.id === currMode) {
+          context.enter('browse');
+        } else {
+          context.enter(d.id);
+        }
+      })
+      .call(uiTooltip(context)
+        .placement('bottom')
+        .title(d => d.description)
+        .keys(d => [d.key])
+        .scrollContainer(context.container().select('.top-toolbar'))
+      );
+
+    buttonsEnter
+      .each((d, i, nodes) => {
+        d3_select(nodes[i])
+          .call(uiIcon(d.icon || `#rapid-icon-${d.button}`));
+      });
+
+    // if we are adding/removing the buttons, check if toolbar has overflowed
+    if (buttons.enter().size() || buttons.exit().size()) {
+      context.ui().checkOverflow('.top-toolbar', true);
+    }
+
+    // update
+    buttons = buttons
+      .merge(buttonsEnter)
+      .classed('disabled', () => !notesEnabled())
+      .classed('active', d => context.mode() && context.mode().id === d.id);
+  }
 
 
   tool.install = function(selection) {
-    debouncedUpdate = _debounce(update, 500, { leading: true, trailing: true });
+    _selection = selection;
+    debouncedUpdate = debounce(update, 500, { leading: true, trailing: true });
 
     context.keybinding().on(mode.key, () => {
       if (!notesEditable()) return;
@@ -45,76 +100,19 @@ export function uiToolNotes(context) {
       }
     });
 
-    context.map()
-      .on('draw', debouncedUpdate);
-
-    context
-      .on('enter.notes', update);
+    context.mapSystem().on('draw', debouncedUpdate);
+    context.on('modechange', update);
 
     update();
-
-
-    function update() {
-      const data = notesEnabled() ? [mode] : [];
-      let buttons = selection.selectAll('button.add-button')
-        .data(data, d => d.id);
-
-      // exit
-      buttons.exit()
-        .remove();
-
-      // enter
-      let buttonsEnter = buttons.enter()
-        .append('button')
-        .attr('class', d => `${d.id} add-button bar-button`)
-        .on('click.notes', (d3_event, d) => {
-          if (!notesEditable()) return;
-
-          // When drawing, ignore accidental clicks on mode buttons - #4042
-          var currMode = context.mode().id;
-          if (/^draw/.test(currMode)) return;
-
-          if (d.id === currMode) {
-            context.enter('browse');
-          } else {
-            context.enter(d.id);
-          }
-        })
-        .call(uiTooltip()
-          .placement('bottom')
-          .title(d => d.description)
-          .keys(d => [d.key])
-          .scrollContainer(context.container().select('.top-toolbar'))
-        );
-
-      buttonsEnter
-        .each((d, i, nodes) => {
-          d3_select(nodes[i])
-            .call(uiIcon(d.icon || `#rapid-icon-${d.button}`));
-        });
-
-      // if we are adding/removing the buttons, check if toolbar has overflowed
-      if (buttons.enter().size() || buttons.exit().size()) {
-        context.ui().checkOverflow('.top-toolbar', true);
-      }
-
-      // update
-      buttons = buttons
-        .merge(buttonsEnter)
-        .classed('disabled', () => !notesEnabled())
-        .classed('active', d => context.mode() && context.mode().id === d.id);
-    }
   };
 
 
   tool.uninstall = function() {
+    debouncedUpdate.cancel();
     context.keybinding().off(mode.key);
-
-    context
-      .on('enter.notes', null);
-
-    context.map()
-      .off('draw', debouncedUpdate);
+    context.off('modechange', update);
+    context.mapSystem().off('draw', debouncedUpdate);
+    _selection = null;
   };
 
   return tool;
diff --git a/modules/ui/tools/rapid_features.js b/modules/ui/tools/rapid_features.js
index e5ddc33be5..ed3fed9345 100644
--- a/modules/ui/tools/rapid_features.js
+++ b/modules/ui/tools/rapid_features.js
@@ -1,7 +1,6 @@
-import _debounce from 'lodash-es/debounce';
+import debounce from 'lodash-es/debounce';
 
 import { dispatch as d3_dispatch } from 'd3-dispatch';
-import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
 import { uiCmd } from '../cmd';
 import { uiRapidFeatureToggleDialog } from '../rapid_feature_toggle_dialog';
@@ -10,14 +9,16 @@ import { uiRapidPowerUserFeaturesDialog } from '../rapid_poweruser_features_dial
 
 export function uiToolRapidFeatures(context) {
   const toggleKeyDispatcher = d3_dispatch('ai_feature_toggle');
-  const rapidFeaturesToggleKey = '⇧' + t('map_data.layers.ai-features.key');
+  const rapidFeaturesToggleKey = '⇧' + context.t('map_data.layers.ai-features.key');
   const datasetDialog = uiRapidFeatureToggleDialog(context, uiCmd(rapidFeaturesToggleKey), toggleKeyDispatcher);
   const powerUserDialog = uiRapidPowerUserFeaturesDialog(context);
-  const showPowerUser = context.rapidContext().showPowerUser;
+  const showPowerUser = context.rapidSystem().showPowerUser;
+  let debouncedUpdate;
+  let _wrap;
 
   let tool = {
     id: 'rapid_features',
-    label: t('toolbar.rapid_features')
+    label: context.t('toolbar.rapid_features')
   };
 
   function layerEnabled() {
@@ -41,10 +42,54 @@ export function uiToolRapidFeatures(context) {
     context.container().call(powerUserDialog);
   }
 
-  let debouncedUpdate;
+  function update() {
+    if (!_wrap) return;
+    let rapidButton = _wrap.selectAll('.rapid-features')
+      .data([0]);
+
+    // enter
+    let rapidButtonEnter = rapidButton.enter()
+      .append('button')
+      .attr('class', 'bar-button rapid-features')
+      .attr('tabindex', -1)
+      .on('click', showFeatureToggleDialog)
+      .call(uiTooltip(context)
+        .placement('bottom')
+        .title(context.t('shortcuts.browsing.display_options.rapid_features_data'))
+        .keys(rapidFeaturesToggleKey)
+      );
+
+    rapidButtonEnter
+      .append('svg')
+      .attr('class', 'logo-rapid')
+      .append('use')
+      .attr('xlink:href', '#rapid-logo-rapid-wordmark');
+
+    // update
+    rapidButton.merge(rapidButtonEnter)
+      .classed('layer-off', !layerEnabled());
+
+
+    let powerUserButton = _wrap.selectAll('.rapid-poweruser-features')
+      .data(showPowerUser ? [0] : []);
+
+    powerUserButton.enter()
+      .append('button')
+      .attr('class', 'bar-button rapid-poweruser-features')
+      .attr('tabindex', -1)
+      .on('click', showPowerUserFeaturesDialog)
+      .call(uiTooltip(context)
+        .placement('bottom')
+        .title(context.t('rapid_poweruser_features.heading.label'))
+      )
+      .append('div')
+      .attr('class', 'beta');
+  }
+
+
 
   tool.install = (selection) => {
-    debouncedUpdate = _debounce(update, 100, { leading: true, trailing: true });
+    debouncedUpdate = debounce(update, 100, { leading: true, trailing: true });
 
     context.keybinding()
       .on(uiCmd(rapidFeaturesToggleKey), d3_event => {
@@ -53,68 +98,24 @@ export function uiToolRapidFeatures(context) {
         toggleFeatures();
       });
 
-    context.map()
-      .on('draw', debouncedUpdate);
-
-    context
-      .on('enter.rapid_features', update);
+    context.mapSystem().on('draw', debouncedUpdate);
+    context.on('modechange', update);
 
-    let wrap = selection
+    _wrap = selection
       .append('div')
       .attr('class', showPowerUser ? 'joined' : null)
       .style('display', 'flex');
 
     update();
-
-
-    function update() {
-      let rapidButton = wrap.selectAll('.rapid-features')
-        .data([0]);
-
-      // enter
-      let rapidButtonEnter = rapidButton.enter()
-        .append('button')
-        .attr('class', 'bar-button rapid-features')
-        .attr('tabindex', -1)
-        .on('click', showFeatureToggleDialog)
-        .call(uiTooltip()
-          .placement('bottom')
-          .title(t('shortcuts.browsing.display_options.rapid_features_data'))
-          .keys(rapidFeaturesToggleKey)
-        );
-
-      rapidButtonEnter
-        .append('svg')
-        .attr('class', 'logo-rapid')
-        .append('use')
-        .attr('xlink:href', '#rapid-logo-rapid-wordmark');
-
-      // update
-      rapidButton.merge(rapidButtonEnter)
-        .classed('layer-off', !layerEnabled());
-
-
-      let powerUserButton = wrap.selectAll('.rapid-poweruser-features')
-        .data(showPowerUser ? [0] : []);
-
-      powerUserButton.enter()
-        .append('button')
-        .attr('class', 'bar-button rapid-poweruser-features')
-        .attr('tabindex', -1)
-        .on('click', showPowerUserFeaturesDialog)
-        .call(uiTooltip()
-          .placement('bottom')
-          .title(t('rapid_poweruser_features.heading.label'))
-        )
-        .append('div')
-        .attr('class', 'beta');
-    }
   };
 
 
   tool.uninstall = function () {
-    context.map().off('draw', debouncedUpdate);
+    debouncedUpdate.cancel();
     context.keybinding().off(uiCmd(rapidFeaturesToggleKey));
+    context.mapSystem().off('draw', debouncedUpdate);
+    context.off('modechange', update);
+    _wrap = null;
   };
 
   return tool;
diff --git a/modules/ui/tools/save.js b/modules/ui/tools/save.js
index 9126839e29..4e6258b227 100644
--- a/modules/ui/tools/save.js
+++ b/modules/ui/tools/save.js
@@ -1,7 +1,5 @@
 import { interpolateRgb as d3_interpolateRgb } from 'd3-interpolate';
-import { select as d3_select } from 'd3-selection';
 
-import { t } from '../../core/localizer';
 import { uiIcon } from '../icon';
 import { uiCmd } from '../cmd';
 import { uiTooltip } from '../tooltip';
@@ -10,13 +8,13 @@ import { uiTooltip } from '../tooltip';
 export function uiToolSave(context) {
   let tool = {
     id: 'save',
-    label: t.html('save.title')
+    label: context.tHtml('save.title')
   };
 
-  let button = d3_select(null);
-  let tooltip = null;
   let key = uiCmd('⌘S');
   let _numChanges = 0;
+  let _button = null;
+  let _tooltip = null;
 
   function isSaving() {
     const mode = context.mode();
@@ -24,12 +22,12 @@ export function uiToolSave(context) {
   }
 
   function isDisabled() {
-    return _numChanges === 0 || isSaving();
+    return _numChanges === 0 || context.inIntro || isSaving();
   }
 
   function save(d3_event) {
     d3_event.preventDefault();
-    if (!context.inIntro() && !isSaving() && context.history().hasChanges()) {
+    if (!context.inIntro && !isSaving() && context.editSystem().hasChanges()) {
       context.enter('save');
     }
   }
@@ -48,35 +46,49 @@ export function uiToolSave(context) {
   }
 
   function updateCount() {
-    const val = context.history().difference().summary().size;
+    if (!_button || !_tooltip) return;
+
+    const val = context.editSystem().difference().summary().size;
     if (val === _numChanges) return;  // no change
 
     _numChanges = val;
 
-    if (tooltip) {
-      tooltip
-        .title(t.html(_numChanges > 0 ? 'save.help' : 'save.no_changes'))
+    if (_tooltip) {
+      _tooltip
+        .title(context.tHtml(_numChanges > 0 ? 'save.help' : 'save.no_changes'))
         .keys([key]);
     }
 
-    button
+    _button
       .classed('disabled', isDisabled())
       .style('background', bgColor(_numChanges));
 
-    button.select('span.count')
+    _button.select('span.count')
       .html(_numChanges);
   }
 
 
+  function updateDisabled() {
+    if (!_button || !_tooltip) return;
+
+    _button.classed('disabled', isDisabled());
+    if (isSaving()) {
+      _button.call(_tooltip.hide);
+    }
+  }
+
+
   tool.install = function(selection) {
-    tooltip = uiTooltip()
+    if (_button && _tooltip) return;  // already installed
+
+    _tooltip = uiTooltip(context)
       .placement('bottom')
-      .title(t.html('save.no_changes'))
+      .title(context.tHtml('save.no_changes'))
       .keys([key])
       .scrollContainer(context.container().select('.top-toolbar'));
 
     // var lastPointerUpType;
-    button = selection
+    _button = selection
       .append('button')
       .attr('class', 'save disabled bar-button')
       // .on('pointerup', function(d3_event) {
@@ -93,16 +105,16 @@ export function uiToolSave(context) {
         //         .duration(2000)
         //         .iconName('#rapid-icon-save')
         //         .iconClass('disabled')
-        //         .label(t.html('save.no_changes'))();
+        //         .label(context.tHtml('save.no_changes'))();
         // }
         // lastPointerUpType = null;
       })
-      .call(tooltip);
+      .call(_tooltip);
 
-    button
+    _button
       .call(uiIcon('#rapid-icon-save'));
 
-    button
+    _button
       .append('span')
       .attr('class', 'count')
       .attr('aria-hidden', 'true')
@@ -110,35 +122,20 @@ export function uiToolSave(context) {
 
     updateCount();
 
-
-    context.keybinding()
-      .on(key, save, true /* capture */);
-
-    context.history()
-      .on('change.save', updateCount);
-
-    context
-      .on('enter.save', () => {
-        button.classed('disabled', isDisabled());
-        if (isSaving()) {
-          button.call(tooltip.hide);
-        }
-      });
+    context.keybinding().on(key, save, true /* capture */);
+    context.editSystem().on('change', updateCount);
+    context.on('modechange', updateDisabled);
   };
 
 
   tool.uninstall = function() {
-    context.keybinding()
-      .off(key, true /* capture */);
-
-    context.history()
-      .on('change.save', null);
-
-    context
-      .on('enter.save', null);
+    if (!_button && !_tooltip) return;  // already uninstalled
 
-    button = d3_select(null);
-    tooltip = null;
+    context.keybinding().off(key, true /* capture */);
+    context.editSystem().off('change', updateCount);
+    context.off('modechange', updateDisabled);
+    _button = null;
+    _tooltip = null;
   };
 
   return tool;
diff --git a/modules/ui/tools/sidebar_toggle.js b/modules/ui/tools/sidebar_toggle.js
index fc43e6e4f4..71adeca9d1 100644
--- a/modules/ui/tools/sidebar_toggle.js
+++ b/modules/ui/tools/sidebar_toggle.js
@@ -1,13 +1,13 @@
-import { t, localizer } from '../../core/localizer';
 import { uiIcon } from '../icon';
 import { uiTooltip } from '../tooltip';
 
+
 export function uiToolSidebarToggle(context) {
-  const isRTL = (localizer.textDirection() === 'rtl');
+  const l10n = context.localizationSystem();
 
   let tool = {
     id: 'sidebar_toggle',
-    label: t.html('toolbar.inspect')
+    label: l10n.tHtml('toolbar.inspect')
   };
 
   tool.install = function(selection) {
@@ -15,13 +15,13 @@ export function uiToolSidebarToggle(context) {
       .append('button')
       .attr('class', 'bar-button')
       .on('click', () => context.ui().sidebar.toggle())
-      .call(uiTooltip()
+      .call(uiTooltip(context)
         .placement('bottom')
-        .title(t.html('sidebar.tooltip'))
-        .keys([t('sidebar.key')])
+        .title(l10n.tHtml('sidebar.tooltip'))
+        .keys([ l10n.t('sidebar.key') ])
         .scrollContainer(context.container().select('.top-toolbar'))
       )
-      .call(uiIcon('#rapid-icon-sidebar-' + (isRTL ? 'right' : 'left')));
+      .call(uiIcon('#rapid-icon-sidebar-' + (l10n.isRTL() ? 'right' : 'left')));
   };
 
   return tool;
diff --git a/modules/ui/tools/undo_redo.js b/modules/ui/tools/undo_redo.js
index 62aecc74b0..82aec86648 100644
--- a/modules/ui/tools/undo_redo.js
+++ b/modules/ui/tools/undo_redo.js
@@ -1,38 +1,60 @@
-import _debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
+import debounce from 'lodash-es/debounce';
 
-import { t, localizer } from '../../core/localizer';
 import { uiIcon } from '../icon';
 import { uiCmd } from '../cmd';
 import { uiTooltip } from '../tooltip';
 
 
 export function uiToolUndoRedo(context) {
+  const l10n = context.localizationSystem();
+  const isRTL = l10n.isRTL();
+
+  let _buttons = null;
+  let _tooltip = null;
+  let debouncedUpdate;
+
   let tool = {
     id: 'undo_redo',
-    label: t.html('toolbar.undo_redo')
+    label: l10n.tHtml('toolbar.undo_redo')
   };
 
-  const isRTL = localizer.textDirection() === 'rtl';
   const commands = [{
     id: 'undo',
     key: uiCmd('⌘Z'),
     action: () => context.undo(),
-    annotation: () => context.history().undoAnnotation(),
+    annotation: () => context.editSystem().undoAnnotation(),
     icon: (isRTL ? 'redo' : 'undo')
   }, {
     id: 'redo',
     key: uiCmd('⌘⇧Z'),
     action: () => context.redo(),
-    annotation: () => context.history().redoAnnotation(),
+    annotation: () => context.editSystem().redoAnnotation(),
     icon: (isRTL ? 'undo' : 'redo')
   }];
 
 
-  let debouncedUpdate;
+  function changed(difference) {
+    if (difference) update();
+  }
+
+  function update() {
+    if (!_buttons || !_tooltip) return;
+    _buttons
+      .classed('disabled', d => !context.editable() || !d.annotation())
+      .each((d, i, nodes) => {
+        const selection = d3_select(nodes[i]);
+        if (!selection.select('.tooltip.in').empty()) {
+          selection.call(_tooltip.updateContent);
+        }
+      });
+  }
+
 
   tool.install = function(selection) {
-    let tooltipBehavior = uiTooltip()
+    if (_buttons && _tooltip) return;  // already installed
+
+    _tooltip = uiTooltip(context)
       .placement('bottom')
       .title(d => {
         // Handle string- or object-style annotations. Object-style
@@ -43,14 +65,14 @@ export function uiToolUndoRedo(context) {
         if (str && str.description) {
           str = str.description;
         }
-        return str ? t(`${d.id}.tooltip`, { action: str }) : t(`${d.id}.nothing`);
+        return str ? l10n.t(`${d.id}.tooltip`, { action: str }) : l10n.t(`${d.id}.nothing`);
       })
       .keys(d => [d.key])
       .scrollContainer(context.container().select('.top-toolbar'));
 
     // var lastPointerUpType;
 
-    let buttons = selection.selectAll('button')
+    _buttons = selection.selectAll('button')
       .data(commands)
       .enter()
       .append('button')
@@ -84,60 +106,42 @@ export function uiToolUndoRedo(context) {
         // }
         // lastPointerUpType = null;
       })
-      .call(tooltipBehavior);
+      .call(_tooltip);
 
-    buttons.each((d, i, nodes) => {
+    _buttons.each((d, i, nodes) => {
       d3_select(nodes[i])
         .call(uiIcon(`#rapid-icon-${d.icon}`));
     });
 
-    debouncedUpdate = _debounce(update, 500, { leading: true, trailing: true });
 
-    commands.forEach(command => {
+    debouncedUpdate = debounce(update, 500, { leading: true, trailing: true });
+
+    for (const command of commands) {
       context.keybinding().on(command.key, d3_event => {
         d3_event.preventDefault();
         if (context.editable()) command.action();
       });
-    });
-
-    context.map()
-      .on('draw', debouncedUpdate);
-
-    context.history()
-      .on('change.undo_redo', difference => {
-        if (difference) update();
-      });
-
-    context
-      .on('enter.undo_redo', update);
-
-
-    function update() {
-      buttons
-        .classed('disabled', d => !context.editable() || !d.annotation())
-        .each((d, i, nodes) => {
-          const selection = d3_select(nodes[i]);
-          if (!selection.select('.tooltip.in').empty()) {
-            selection.call(tooltipBehavior.updateContent);
-          }
-        });
     }
+
+    context.mapSystem().on('draw', debouncedUpdate);
+    context.editSystem().on('change', changed);
+    context.on('modechange', update);
   };
 
 
   tool.uninstall = function() {
-    commands.forEach(command => {
-      context.keybinding().off(command.key);
-    });
-
-    context.map()
-      .off('draw', debouncedUpdate);
+    if (!_buttons && !_tooltip) return;  // already uninstalled
 
-    context.history()
-      .on('change.undo_redo', null);
+    for (const command of commands) {
+      context.keybinding().off(command.key);
+    }
 
-    context
-      .on('enter.undo_redo', null);
+    debouncedUpdate.cancel();
+    context.mapSystem().off('draw', debouncedUpdate);
+    context.editSystem().off('change', changed);
+    context.off('modechange', update);
+    _tooltip = null;
+    _buttons = null;
   };
 
   return tool;
diff --git a/modules/ui/tooltip.js b/modules/ui/tooltip.js
index bc00704c90..4ffd5f1c82 100644
--- a/modules/ui/tooltip.js
+++ b/modules/ui/tooltip.js
@@ -1,11 +1,9 @@
 import { utilFunctor } from '../util/util';
-import { t } from '../core/localizer';
 import { uiPopover } from './popover';
 
-export function uiTooltip(klass) {
 
-    var tooltip = uiPopover((klass || '') + ' tooltip')
-        .displayType('hover');
+export function uiTooltip(context) {
+    var tooltip = uiPopover(context, 'tooltip').displayType('hover');
 
     var _title = function() {
         var title = this.getAttribute('data-original-title');
@@ -46,7 +44,6 @@ export function uiTooltip(klass) {
         var keys = _keys.apply(this, arguments);
 
         return function(selection) {
-
             var headingSelect = selection
                 .selectAll('.tooltip-heading')
                 .data(heading ? [heading] :[]);
@@ -86,7 +83,7 @@ export function uiTooltip(klass) {
 
             keyhintWrapEnter
                 .append('span')
-                .html(t.html('tooltip_keyhint'));
+                .html(context.tHtml('tooltip_keyhint'));
 
             keyhintWrap = keyhintWrapEnter.merge(keyhintWrap);
 
@@ -95,9 +92,7 @@ export function uiTooltip(klass) {
                 .enter()
                 .append('kbd')
                 .attr('class', 'shortcut')
-                .html(function(d) {
-                    return d;
-                });
+                .html(d => d);
         };
     });
 
diff --git a/modules/ui/top_toolbar.js b/modules/ui/top_toolbar.js
index e15bf7394b..521d5c4c49 100644
--- a/modules/ui/top_toolbar.js
+++ b/modules/ui/top_toolbar.js
@@ -31,7 +31,7 @@ export function uiTopToolbar(context) {
     tools.push('spacer', undoRedo, save);
 
     // Undocumented feature 'support_download_osc'
-    const hash = context.urlhash().initialHashParams;
+    const hash = context.urlHashSystem().initialHashParams;
     if (hash.get('support_download_osc') === 'true') {
       tools.push(downloadOsc);
     }
diff --git a/modules/ui/version.js b/modules/ui/version.js
index 39bf670b4e..3e0480a73a 100644
--- a/modules/ui/version.js
+++ b/modules/ui/version.js
@@ -1,10 +1,8 @@
-import { prefs } from '../core/preferences';
-import { t } from '../core/localizer';
 import { uiIcon } from './icon';
 import { uiTooltip } from './tooltip';
 
 
-// these are module variables so they are preserved through a ui.restart()
+// These are module variables so they are preserved through a ui.restart()
 let sawVersion = null;
 let isNewVersion = false;
 let isNewUser = false;
@@ -13,16 +11,17 @@ let isNewUser = false;
 export function uiVersion(context) {
   const currVersion = context.version;
   const matchedVersion = currVersion.match(/\d+\.\d+\.\d+.*/);
+  const prefs = context.storageSystem();
 
   if (sawVersion === null && matchedVersion !== null) {
-    if (prefs('sawVersion')) {
+    if (prefs.getItem('sawVersion')) {
       isNewUser = false;
-      isNewVersion = prefs('sawVersion') !== currVersion && currVersion.indexOf('-') === -1;
+      isNewVersion = prefs.getItem('sawVersion') !== currVersion && currVersion.indexOf('-') === -1;
     } else {
       isNewUser = true;
       isNewVersion = true;
     }
-    prefs('sawVersion', currVersion);
+    prefs.setItem('sawVersion', currVersion);
     sawVersion = currVersion;
   }
 
@@ -43,8 +42,8 @@ export function uiVersion(context) {
         .attr('tabindex', -1)
         .attr('href', 'https://github.com/facebook/Rapid/blob/main/CHANGELOG.md')
         .call(uiIcon('#maki-gift'))
-        .call(uiTooltip()
-          .title(t.html('version.whats_new', { version: currVersion }))
+        .call(uiTooltip(context)
+          .title(context.tHtml('version.whats_new', { version: currVersion }))
           .placement('top')
           .scrollContainer(context.container().select('.main-footer-wrap'))
         );
diff --git a/modules/ui/view_on_keepRight.js b/modules/ui/view_on_keepRight.js
index 5ce4971fe6..51b98f6f66 100644
--- a/modules/ui/view_on_keepRight.js
+++ b/modules/ui/view_on_keepRight.js
@@ -1,19 +1,20 @@
-import { t } from '../core/localizer';
-import { services } from '../services';
 import { uiIcon } from './icon';
 import { QAItem } from '../osm';
 
-export function uiViewOnKeepRight() {
+
+export function uiViewOnKeepRight(context) {
+  const keepright = context.services.get('keepRight');
   let _qaItem;
 
+
   function viewOnKeepRight(selection) {
     let url;
-    if (services.keepRight && (_qaItem instanceof QAItem)) {
-      url = services.keepRight.issueURL(_qaItem);
+    if (keepright && (_qaItem instanceof QAItem)) {
+      url = keepright.issueURL(_qaItem);
     }
 
     const link = selection.selectAll('.view-on-keepRight')
-      .data(url ? [url] : []);
+      .data(url ? [url] : [], d => d);
 
     // exit
     link.exit()
@@ -22,17 +23,18 @@ export function uiViewOnKeepRight() {
     // enter
     const linkEnter = link.enter()
       .append('a')
-        .attr('class', 'view-on-keepRight')
-        .attr('target', '_blank')
-        .attr('rel', 'noopener') // security measure
-        .attr('href', d => d)
-        .call(uiIcon('#rapid-icon-out-link', 'inline'));
+      .attr('class', 'view-on-keepRight')
+      .attr('target', '_blank')
+      .attr('rel', 'noopener') // security measure
+      .attr('href', d => d)
+      .call(uiIcon('#rapid-icon-out-link', 'inline'));
 
     linkEnter
       .append('span')
-        .html(t.html('inspector.view_on_keepRight'));
+      .text(context.t('inspector.view_on_keepRight'));
   }
 
+
   viewOnKeepRight.what = function(val) {
     if (!arguments.length) return _qaItem;
     _qaItem = val;
diff --git a/modules/ui/view_on_osm.js b/modules/ui/view_on_osm.js
index 9e4ae9fb64..1e84398c1b 100644
--- a/modules/ui/view_on_osm.js
+++ b/modules/ui/view_on_osm.js
@@ -1,47 +1,46 @@
-import { t } from '../core/localizer';
 import { osmEntity, osmNote } from '../osm';
 import { uiIcon } from './icon';
 
 
 export function uiViewOnOSM(context) {
-    var _what;   // an osmEntity or osmNote
-
-
-    function viewOnOSM(selection) {
-        var url;
-        if (_what instanceof osmEntity) {
-            url = context.connection().entityURL(_what);
-        } else if (_what instanceof osmNote) {
-            url = context.connection().noteURL(_what);
-        }
-
-        var data = ((!_what || _what.isNew()) ? [] : [_what]);
-        var link = selection.selectAll('.view-on-osm')
-            .data(data, function(d) { return d.id; });
-
-        // exit
-        link.exit()
-            .remove();
-
-        // enter
-        var linkEnter = link.enter()
-            .append('a')
-            .attr('class', 'view-on-osm')
-            .attr('target', '_blank')
-            .attr('href', url)
-            .call(uiIcon('#rapid-icon-out-link', 'inline'));
-
-        linkEnter
-            .append('span')
-            .html(t.html('inspector.view_on_osm'));
+  const osm = context.services.get('osm');
+  let _what;   // an osmEntity or osmNote
+
+
+  function viewOnOSM(selection) {
+    let url;
+    if (osm && _what instanceof osmEntity && !_what.isNew()) {
+      url = osm.entityURL(_what);
+    } else if (osm && _what instanceof osmNote && !_what.isNew()) {
+      url = osm.noteURL(_what);
     }
 
+    const link = selection.selectAll('.view-on-osm')
+      .data(url ? [url] : [], d => d);
+
+    // exit
+    link.exit()
+      .remove();
 
-    viewOnOSM.what = function(_) {
-        if (!arguments.length) return _what;
-        _what = _;
-        return viewOnOSM;
-    };
+    // enter
+    const linkEnter = link.enter()
+      .append('a')
+      .attr('class', 'view-on-osm')
+      .attr('target', '_blank')
+      .attr('href', d => d)
+      .call(uiIcon('#rapid-icon-out-link', 'inline'));
 
+    linkEnter
+      .append('span')
+      .text(context.t('inspector.view_on_osm'));
+  }
+
+
+  viewOnOSM.what = function(val) {
+    if (!arguments.length) return _what;
+    _what = val;
     return viewOnOSM;
+  };
+
+  return viewOnOSM;
 }
diff --git a/modules/ui/view_on_osmose.js b/modules/ui/view_on_osmose.js
index b0dc6ecfc6..868bb3ea9f 100644
--- a/modules/ui/view_on_osmose.js
+++ b/modules/ui/view_on_osmose.js
@@ -1,19 +1,20 @@
-import { t } from '../core/localizer';
-import { services } from '../services';
 import { uiIcon } from './icon';
 import { QAItem } from '../osm';
 
-export function uiViewOnOsmose() {
+
+export function uiViewOnOsmose(context) {
+  const osmose = context.services.get('osmose');
   let _qaItem;
 
+
   function viewOnOsmose(selection) {
     let url;
-    if (services.osmose && (_qaItem instanceof QAItem)) {
-      url = services.osmose.itemURL(_qaItem);
+    if (osmose && (_qaItem instanceof QAItem)) {
+      url = osmose.itemURL(_qaItem);
     }
 
     const link = selection.selectAll('.view-on-osmose')
-      .data(url ? [url] : []);
+      .data(url ? [url] : [], d => d);
 
     // exit
     link.exit()
@@ -22,17 +23,18 @@ export function uiViewOnOsmose() {
     // enter
     const linkEnter = link.enter()
       .append('a')
-        .attr('class', 'view-on-osmose')
-        .attr('target', '_blank')
-        .attr('rel', 'noopener') // security measure
-        .attr('href', d => d)
-        .call(uiIcon('#rapid-icon-out-link', 'inline'));
+      .attr('class', 'view-on-osmose')
+      .attr('target', '_blank')
+      .attr('rel', 'noopener') // security measure
+      .attr('href', d => d)
+      .call(uiIcon('#rapid-icon-out-link', 'inline'));
 
     linkEnter
       .append('span')
-        .html(t.html('inspector.view_on_osmose'));
+      .text(context.t('inspector.view_on_osmose'));
   }
 
+
   viewOnOsmose.what = function(val) {
     if (!arguments.length) return _qaItem;
     _qaItem = val;
diff --git a/modules/ui/zoom.js b/modules/ui/zoom.js
index 633efb7991..87351cf8fa 100644
--- a/modules/ui/zoom.js
+++ b/modules/ui/zoom.js
@@ -1,6 +1,5 @@
 import { select as d3_select } from 'd3-selection';
 
-import { t, localizer } from '../core/localizer';
 import { uiIcon } from './icon';
 import { uiCmd } from './cmd';
 import { uiTooltip } from './tooltip';
@@ -8,51 +7,53 @@ import { utilKeybinding } from '../util/keybinding';
 
 
 export function uiZoom(context) {
-  let zooms = [{
+  const l10n = context.localizationSystem();
+
+  const zooms = [{
     id: 'zoom-in',
     icon: 'rapid-icon-plus',
-    title: t('zoom.in'),
+    title: l10n.t('zoom.in'),
     action: zoomIn,
-    isDisabled: () => !context.map().canZoomIn(),
-    disabledTitle: t('zoom.disabled.in'),
+    isDisabled: () => !context.mapSystem().canZoomIn(),
+    disabledTitle: l10n.t('zoom.disabled.in'),
     key: '+'
   }, {
     id: 'zoom-out',
     icon: 'rapid-icon-minus',
-    title: t('zoom.out'),
+    title: l10n.t('zoom.out'),
     action: zoomOut,
-    isDisabled: () => !context.map().canZoomOut(),
-    disabledTitle: t('zoom.disabled.out'),
+    isDisabled: () => !context.mapSystem().canZoomOut(),
+    disabledTitle: l10n.t('zoom.disabled.out'),
     key: '-'
   }];
 
   function zoomIn(d3_event) {
     if (d3_event.shiftKey) return;
     d3_event.preventDefault();
-    context.map().zoomIn();
+    context.mapSystem().zoomIn();
   }
 
   function zoomOut(d3_event) {
     if (d3_event.shiftKey) return;
     d3_event.preventDefault();
-    context.map().zoomOut();
+    context.mapSystem().zoomOut();
   }
 
   function zoomInFurther(d3_event) {
     if (d3_event.shiftKey) return;
     d3_event.preventDefault();
-    context.map().zoomInFurther();
+    context.mapSystem().zoomInFurther();
   }
 
   function zoomOutFurther(d3_event) {
     if (d3_event.shiftKey) return;
     d3_event.preventDefault();
-    context.map().zoomOutFurther();
+    context.mapSystem().zoomOutFurther();
   }
 
-  return function(selection) {
-    let tooltipBehavior = uiTooltip()
-      .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
+  return function render(selection) {
+    let tooltipBehavior = uiTooltip(context)
+      .placement(l10n.isRTL() ? 'right' : 'left')
       .title(d => d.isDisabled() ? d.disabledTitle : d.title)
       .keys(d => [d.key]);
 
@@ -106,6 +107,6 @@ export function uiZoom(context) {
 
     updateButtonStates();
 
-    context.map().on('draw', updateButtonStates);
+    context.mapSystem().on('draw', updateButtonStates);
   };
 }
diff --git a/modules/ui/zoom_to_selection.js b/modules/ui/zoom_to_selection.js
index 2f1ea1c37e..48afa85078 100644
--- a/modules/ui/zoom_to_selection.js
+++ b/modules/ui/zoom_to_selection.js
@@ -1,18 +1,19 @@
-import { t, localizer } from '../core/localizer';
 import { uiTooltip } from './tooltip';
 import { uiIcon } from './icon';
 
 
 export function uiZoomToSelection(context) {
-  const KEY = t('inspector.zoom_to.key');
+  const l10n = context.localizationSystem();
+  const shortcutKey = l10n.t('inspector.zoom_to.key');
   let _lastPointerUpType;
   let _lastTransform;
 
-  return function(selection) {
-    let tooltip = uiTooltip()
-      .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
-      .title(() => isDisabled() ? t('inspector.zoom_to.no_selection') : t('inspector.zoom_to.title'))
-      .keys([KEY]);
+
+  return function render(selection) {
+    let tooltip = uiTooltip(context)
+      .placement(l10n.isRTL() ? 'right' : 'left')
+      .title(() => isDisabled() ? l10n.t('inspector.zoom_to.no_selection') : l10n.t('inspector.zoom_to.title'))
+      .keys([shortcutKey]);
 
     let button = selection
       .append('button')
@@ -21,8 +22,8 @@ export function uiZoomToSelection(context) {
       .call(uiIcon('#rapid-icon-framed-dot', 'light'))
       .call(tooltip);
 
-    context.keybinding().on(KEY, onClick);
-    context.on('enter.uiZoomToSelection', onModeChange);
+    context.keybinding().on(shortcutKey, onClick);
+    context.on('modechange', onModeChange);
 
     onModeChange();
 
@@ -38,7 +39,7 @@ export function uiZoomToSelection(context) {
 
       const mode = context.mode();
       const extent = mode?.extent;
-      const map = context.map();
+      const map = context.mapSystem();
 
       if (_lastTransform) {   // pop back out
         map.transformEase(_lastTransform);
@@ -56,7 +57,7 @@ export function uiZoomToSelection(context) {
             .duration(2000)
             .iconName('#rapid-icon-framed-dot')
             .iconClass('disabled')
-            .label(t('inspector.zoom_to.no_selection'))();
+            .label(l10n.t('inspector.zoom_to.no_selection'))();
         }
       }
 
diff --git a/modules/util/index.js b/modules/util/index.js
index 00abd537d2..a614a71302 100644
--- a/modules/util/index.js
+++ b/modules/util/index.js
@@ -1,8 +1,4 @@
 export { utilDetect } from './detect';
-export { utilDisplayName } from './util';
-export { utilDisplayPOIName } from './util';
-export { utilDisplayType } from './util';
-export { utilDisplayLabel } from './util';
 export { utilFastMouse } from './util';
 export { utilFunctor } from './util';
 export { utilGetSetValue } from './get_set_value';
diff --git a/modules/util/units.js b/modules/util/units.js
deleted file mode 100644
index d49724d03b..0000000000
--- a/modules/util/units.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import { t, localizer } from '../core/localizer';
-
-var OSM_PRECISION = 7;
-
-/**
- * Returns a localized representation of the given length measurement.
- *
- * @param {Number} m area in meters
- * @param {Boolean} isImperial true for U.S. customary units; false for metric
- */
-export function displayLength(m, isImperial) {
-    var d = m * (isImperial ? 3.28084 : 1);
-    var unit;
-
-    if (isImperial) {
-        if (d >= 5280) {
-            d /= 5280;
-            unit = 'miles';
-        } else {
-            unit = 'feet';
-        }
-    } else {
-        if (d >= 1000) {
-            d /= 1000;
-            unit = 'kilometers';
-        } else {
-            unit = 'meters';
-        }
-    }
-
-    return t('units.' + unit, {
-        quantity: d.toLocaleString(localizer.localeCode(), {
-            maximumSignificantDigits: 4
-        })
-    });
-}
-
-/**
- * Returns a localized representation of the given area measurement.
- *
- * @param {Number} m2 area in square meters
- * @param {Boolean} isImperial true for U.S. customary units; false for metric
- */
-export function displayArea(m2, isImperial) {
-    var locale = localizer.localeCode();
-    var d = m2 * (isImperial ? 10.7639111056 : 1);
-    var d1, d2, area;
-    var unit1 = '';
-    var unit2 = '';
-
-    if (isImperial) {
-        if (d >= 6969600) { // > 0.25mi² show mi²
-            d1 = d / 27878400;
-            unit1 = 'square_miles';
-        } else {
-            d1 = d;
-            unit1 = 'square_feet';
-        }
-
-        if (d > 4356 && d < 43560000) { // 0.1 - 1000 acres
-            d2 = d / 43560;
-            unit2 = 'acres';
-        }
-
-    } else {
-        if (d >= 250000) { // > 0.25km² show km²
-            d1 = d / 1000000;
-            unit1 = 'square_kilometers';
-        } else {
-            d1 = d;
-            unit1 = 'square_meters';
-        }
-
-        if (d > 1000 && d < 10000000) { // 0.1 - 1000 hectares
-            d2 = d / 10000;
-            unit2 = 'hectares';
-        }
-    }
-
-    area = t('units.' + unit1, {
-        quantity: d1.toLocaleString(locale, {
-            maximumSignificantDigits: 4
-        })
-    });
-
-    if (d2) {
-        return t('units.area_pair', {
-            area1: area,
-            area2: t('units.' + unit2, {
-                quantity: d2.toLocaleString(locale, {
-                    maximumSignificantDigits: 2
-                })
-            })
-        });
-    } else {
-        return area;
-    }
-}
-
-function wrap(x, min, max) {
-    var d = max - min;
-    return ((x - min) % d + d) % d + min;
-}
-
-function clamp(x, min, max) {
-    return Math.max(min, Math.min(x, max));
-}
-
-function displayCoordinate(deg, pos, neg) {
-    var locale = localizer.localeCode();
-    var min = (Math.abs(deg) - Math.floor(Math.abs(deg))) * 60;
-    var sec = (min - Math.floor(min)) * 60;
-    var displayDegrees = t('units.arcdegrees', {
-        quantity: Math.floor(Math.abs(deg)).toLocaleString(locale)
-    });
-    var displayCoordinate;
-
-    if (Math.floor(sec) > 0) {
-        displayCoordinate = displayDegrees +
-            t('units.arcminutes', {
-                quantity: Math.floor(min).toLocaleString(locale)
-            }) +
-            t('units.arcseconds', {
-                quantity: Math.round(sec).toLocaleString(locale)
-            });
-    } else if (Math.floor(min) > 0) {
-        displayCoordinate = displayDegrees +
-            t('units.arcminutes', {
-                quantity: Math.round(min).toLocaleString(locale)
-            });
-    } else {
-        displayCoordinate = t('units.arcdegrees', {
-            quantity: Math.round(Math.abs(deg)).toLocaleString(locale)
-        });
-    }
-
-    if (deg === 0) {
-        return displayCoordinate;
-    } else {
-        return t('units.coordinate', {
-            coordinate: displayCoordinate,
-            direction: t('units.' + (deg > 0 ? pos : neg))
-        });
-    }
-}
-
-/**
- * Returns given coordinate pair in degree-minute-second format.
- *
- * @param {Array<Number>} coord longitude and latitude
- */
-export function dmsCoordinatePair(coord) {
-    return t('units.coordinate_pair', {
-        latitude: displayCoordinate(clamp(coord[1], -90, 90), 'north', 'south'),
-        longitude: displayCoordinate(wrap(coord[0], -180, 180), 'east', 'west')
-    });
-}
-
-/**
- * Returns the given coordinate pair in decimal format.
- * note: unlocalized to avoid comma ambiguity - see #4765
- *
- * @param {Array<Number>} coord longitude and latitude
- */
-export function decimalCoordinatePair(coord) {
-    return t('units.coordinate_pair', {
-        latitude: clamp(coord[1], -90, 90).toFixed(OSM_PRECISION),
-        longitude: wrap(coord[0], -180, 180).toFixed(OSM_PRECISION)
-    });
-}
diff --git a/modules/util/util.js b/modules/util/util.js
index cc7abfe900..40c55321a4 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -1,144 +1,27 @@
 import { Extent } from '@rapid-sdk/math';
 import { utilEntityOrDeepMemberSelector } from '@rapid-sdk/util';
 
-import { presetManager } from '../presets';
-import { t, localizer } from '../core/localizer';
-
 
 // Accepts an array of entities -or- entityIDs
 export function utilTotalExtent(array, graph) {
-    return array.reduce(function(extent, val) {
-        var entity = (typeof val === 'string' ? graph.hasEntity(val) : val);
-        if (entity) {
-            var other = entity.extent(graph);
-            // update extent in place
-            extent.min = [ Math.min(extent.min[0], other.min[0]), Math.min(extent.min[1], other.min[1]) ];
-            extent.max = [ Math.max(extent.max[0], other.max[0]), Math.max(extent.max[1], other.max[1]) ];
-        }
-        return extent;
-    }, new Extent());
+  return array.reduce(function(extent, val) {
+    let entity = (typeof val === 'string' ? graph.hasEntity(val) : val);
+    if (entity) {
+      let other = entity.extent(graph);
+      // update extent in place
+      extent.min = [ Math.min(extent.min[0], other.min[0]), Math.min(extent.min[1], other.min[1]) ];
+      extent.max = [ Math.max(extent.max[0], other.max[0]), Math.max(extent.max[1], other.max[1]) ];
+    }
+    return extent;
+  }, new Extent());
 }
 
 
 // Adds or removes highlight styling for the specified entities
 export function utilHighlightEntities(ids, highlighted, context) {
-    context.surface()
-        .selectAll(utilEntityOrDeepMemberSelector(ids, context.graph()))
-        .classed('highlighted', highlighted);
-}
-
-
-/**
- * @param {boolean} hideNetwork If true, the `network` tag will not be used in the name to prevent
- *                              it being shown twice (see PR #8707#discussion_r712658175)
- */
-export function utilDisplayName(entity, hideNetwork) {
-    var localizedNameKey = 'name:' + localizer.languageCode().toLowerCase();
-    var name = entity.tags[localizedNameKey] || entity.tags.name || '';
-
-    var tags = {
-        name,
-        direction: entity.tags.direction,
-        from: entity.tags.from,
-        network: hideNetwork ? undefined : (entity.tags.cycle_network || entity.tags.network),
-        ref: entity.tags.ref,
-        to: entity.tags.to,
-        via: entity.tags.via
-    };
-
-    // for routes, prefer `network+ref+name` or `ref+name` over `name`
-    if (name && tags.ref && entity.tags.route) {
-        return tags.network
-            ? t('inspector.display_name.network_ref_name', tags)
-            : t('inspector.display_name.ref_name', tags);
-    }
-    if (name) return name;
-
-    var keyComponents = [];
-
-    if (tags.network) {
-        keyComponents.push('network');
-    }
-    if (tags.ref) {
-        keyComponents.push('ref');
-    }
-
-    // Routes may need more disambiguation based on direction or destination
-    if (entity.tags.route) {
-        if (tags.direction) {
-            keyComponents.push('direction');
-        } else if (tags.from && tags.to) {
-            keyComponents.push('from');
-            keyComponents.push('to');
-            if (tags.via) {
-                keyComponents.push('via');
-            }
-        }
-    }
-
-    if (keyComponents.length) {
-        name = t('inspector.display_name.' + keyComponents.join('_'), tags);
-    }
-
-// bhousel 3/28 - no labels for addresses for now
-//    // if there's still no name found, try addr:housename
-//    if (!name && entity.tags['addr:housename']) {
-//        name = entity.tags['addr:housename'];
-//    }
-//
-//    // as a last resort, use the street address as a name
-//    if (!name && entity.tags['addr:housenumber'] && entity.tags['addr:street']) {
-//        name = entity.tags['addr:housenumber'] + ' ' + entity.tags['addr:street'];
-//    }
-
-    return name;
-}
-
-
-// This is like utilDisplayName, but more useful for POI display names
-export function utilDisplayPOIName(entity) {
-  const code = localizer.languageCode().toLowerCase();
-  const tags = entity.tags;
-
-  return (
-    tags[`name:${code}`] ?? tags.name ??
-    tags[`brand:${code}`] ?? tags.brand
-  );
-}
-
-
-export function utilDisplayType(id) {
-    return {
-        n: t('inspector.node'),
-        w: t('inspector.way'),
-        r: t('inspector.relation')
-    }[id.charAt(0)];
-}
-
-
-// `utilDisplayLabel`
-// Returns a string suitable for display
-// By default returns something like name/ref, fallback to preset type, fallback to OSM type
-//   "Main Street" or "Tertiary Road"
-// If `verbose=true`, include both preset name and feature name.
-//   "Tertiary Road Main Street"
-//
-export function utilDisplayLabel(entity, graphOrGeometry, verbose) {
-    var result;
-    var displayName = utilDisplayName(entity);
-    var preset = typeof graphOrGeometry === 'string' ?
-        presetManager.matchTags(entity.tags, graphOrGeometry) :
-        presetManager.match(entity, graphOrGeometry);
-    var presetName = preset && (preset.suggestion ? preset.subtitle() : preset.name());
-
-    if (verbose) {
-        result = [presetName, displayName].filter(Boolean).join(' ');
-    } else {
-        result = displayName || presetName;
-    }
-
-    // Fallback to the OSM type (node/way/relation)
-    return result || utilDisplayType(entity.id);
+  context.surface()
+    .selectAll(utilEntityOrDeepMemberSelector(ids, context.graph()))
+    .classed('highlighted', highlighted);
 }
 
 
@@ -156,26 +39,26 @@ export function utilSetTransform(selection, x, y, scale, rotate) {
 // 1. Only works on HTML elements, not SVG
 // 2. Does not cause style recalculation
 export function utilFastMouse(container) {
-    var rect = container.getBoundingClientRect();
-    var rectLeft = rect.left;
-    var rectTop = rect.top;
-    var clientLeft = +container.clientLeft;
-    var clientTop = +container.clientTop;
-    return function(e) {
-        return [
-            e.clientX - rectLeft - clientLeft,
-            e.clientY - rectTop - clientTop
-        ];
-    };
+  const rect = container.getBoundingClientRect();
+  const rectLeft = rect.left;
+  const rectTop = rect.top;
+  const clientLeft = +container.clientLeft;
+  const clientTop = +container.clientTop;
+  return function(e) {
+    return [
+      e.clientX - rectLeft - clientLeft,
+      e.clientY - rectTop - clientTop
+    ];
+  };
 }
 
 
 // wraps an index to an interval [0..length-1]
 export function utilWrap(index, length) {
-    if (index < 0) {
-        index += Math.ceil(-index/length)*length;
-    }
-    return index % length;
+  if (index < 0) {
+    index += Math.ceil(-index/length)*length;
+  }
+  return index % length;
 }
 
 
@@ -186,20 +69,17 @@ export function utilWrap(index, length) {
  * @returns {Function} a function that returns that value or the value if it's a function
  */
 export function utilFunctor(value) {
-    if (typeof value === 'function') return value;
-    return function() {
-        return value;
-    };
+  return (typeof value === 'function') ? value : (() => value);
 }
 
 
 export function utilNoAuto(selection) {
-    var isText = (selection.size() && selection.node().tagName.toLowerCase() === 'textarea');
-
-    return selection
-        // assign 'new-password' even for non-password fields to prevent browsers (Chrome) ignoring 'off'
-        .attr('autocomplete', 'new-password')
-        .attr('autocorrect', 'off')
-        .attr('autocapitalize', 'off')
-        .attr('spellcheck', isText ? 'true' : 'false');
+  const isText = (selection.size() && selection.node().tagName.toLowerCase() === 'textarea');
+
+  return selection
+    // assign 'new-password' even for non-password fields to prevent browsers (Chrome) ignoring 'off'
+    .attr('autocomplete', 'new-password')
+    .attr('autocorrect', 'off')
+    .attr('autocapitalize', 'off')
+    .attr('spellcheck', isText ? 'true' : 'false');
 }
diff --git a/modules/validations/almost_junction.js b/modules/validations/almost_junction.js
index e7f400e0ab..4ae0c3f77d 100644
--- a/modules/validations/almost_junction.js
+++ b/modules/validations/almost_junction.js
@@ -7,11 +7,8 @@ import { actionAddMidpoint } from '../actions/add_midpoint';
 import { actionChangeTags } from '../actions/change_tags';
 import { actionMergeNodes } from '../actions/merge_nodes';
 import { geoHasSelfIntersections } from '../geo';
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
 import { osmRoutableHighwayTagValues } from '../osm/tags';
-import { validationIssue, validationIssueFix } from '../core/validation';
-import { services } from '../services';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
 /**
@@ -19,6 +16,8 @@ import { services } from '../services';
  */
 export function validationAlmostJunction(context) {
   const type = 'almost_junction';
+  const l10n = context.localizationSystem();
+
   const EXTEND_TH_METERS = 5;
   const WELD_TH_METERS = 0.75;
   // Comes from considering bounding case of parallel ways
@@ -42,27 +41,27 @@ export function validationAlmostJunction(context) {
     if (!isHighway(entity)) return [];
     if (entity.isDegenerate()) return [];
 
-    const tree = context.history().tree();
+    const tree = context.editSystem().tree();
     const extendableNodeInfos = findConnectableEndNodesByExtension(entity);
 
     let issues = [];
 
     extendableNodeInfos.forEach(extendableNodeInfo => {
-      issues.push(new validationIssue({
+      issues.push(new ValidationIssue(context, {
         type,
         subtype: 'highway-highway',
         severity: 'warning',
-        message: function(context) {
+        message: function() {
           const entity1 = context.hasEntity(this.entityIds[0]);
           if (this.entityIds[0] === this.entityIds[2]) {
-            return entity1 ? t.html('issues.almost_junction.self.message', {
-              feature: utilDisplayLabel(entity1, context.graph())
+            return entity1 ? l10n.tHtml('issues.almost_junction.self.message', {
+              feature: l10n.displayLabel(entity1, context.graph())
             }) : '';
           } else {
             const entity2 = context.hasEntity(this.entityIds[2]);
-            return (entity1 && entity2) ? t.html('issues.almost_junction.message', {
-              feature: utilDisplayLabel(entity1, context.graph()),
-              feature2: utilDisplayLabel(entity2, context.graph())
+            return (entity1 && entity2) ? l10n.tHtml('issues.almost_junction.message', {
+              feature: l10n.displayLabel(entity1, context.graph()),
+              feature2: l10n.displayLabel(entity2, context.graph())
             }) : '';
           }
         },
@@ -85,12 +84,12 @@ export function validationAlmostJunction(context) {
 
     return issues;
 
-    function makeFixes(context) {
-      let fixes = [new validationIssueFix({
+    function makeFixes() {
+      let fixes = [new ValidationFix({
         icon: 'rapid-icon-abutment',
-        title: t.html('issues.fix.connect_features.title'),
-        onClick: function(context) {
-          const annotation = t('issues.fix.connect_almost_junction.annotation');
+        title: l10n.tHtml('issues.fix.connect_features.title'),
+        onClick: function() {
+          const annotation = l10n.t('issues.fix.connect_almost_junction.annotation');
           const [, endNodeId, crossWayId] = this.issue.entityIds;
           const midNode = context.entity(this.issue.data.midId);
           const endNode = context.entity(endNodeId);
@@ -135,16 +134,16 @@ export function validationAlmostJunction(context) {
       const node = context.hasEntity(this.entityIds[1]);
       if (node && !node.hasInterestingTags()) {
         // node has no descriptive tags, suggest noexit fix
-        fixes.push(new validationIssueFix({
+        fixes.push(new ValidationFix({
           icon: 'maki-barrier',
-          title: t.html('issues.fix.tag_as_disconnected.title'),
-          onClick: function(context) {
+          title: l10n.tHtml('issues.fix.tag_as_disconnected.title'),
+          onClick: function() {
             const nodeID = this.issue.entityIds[1];
             const tags = Object.assign({}, context.entity(nodeID).tags);
             tags.noexit = 'yes';
             context.perform(
               actionChangeTags(nodeID, tags),
-              t('issues.fix.tag_as_disconnected.annotation')
+              l10n.t('issues.fix.tag_as_disconnected.annotation')
             );
           }
         }));
@@ -159,12 +158,12 @@ export function validationAlmostJunction(context) {
         .enter()
         .append('div')
         .attr('class', 'issue-reference')
-        .html(t.html('issues.almost_junction.highway-highway.reference'));
+        .html(l10n.tHtml('issues.almost_junction.highway-highway.reference'));
     }
 
     function isExtendableCandidate(node, way) {
-      // can not accurately test vertices on tiles not downloaded from osm - #5938
-      const osm = services.osm;
+      // can not accurately test vertices on tiles not downloaded from osm - iD#5938
+      const osm = context.services.get('osm');
       if (osm && !osm.isDataLoaded(node.loc)) {
         return false;
       }
diff --git a/modules/validations/close_nodes.js b/modules/validations/close_nodes.js
index 8023d29e6d..8b9cb43e42 100644
--- a/modules/validations/close_nodes.js
+++ b/modules/validations/close_nodes.js
@@ -1,14 +1,13 @@
 import { Extent, geoMetersToLat, geoMetersToLon, geoSphericalDistance } from '@rapid-sdk/math';
 
 import { actionMergeNodes } from '../actions/merge_nodes';
-import { utilDisplayLabel } from '../util';
-import { t } from '../core/localizer';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 import { osmPathHighwayTagValues } from '../osm/tags';
 
 
 export function validationCloseNodes(context) {
-    var type = 'close_nodes';
+    const type = 'close_nodes';
+    const l10n = context.localizationSystem();
 
     var pointThresholdMeters = 0.2;
 
@@ -30,7 +29,6 @@ export function validationCloseNodes(context) {
         }
 
         function wayTypeFor(way) {
-
             if (way.tags.boundary && way.tags.boundary !== 'no') return 'boundary';
             if (way.tags.indoor && way.tags.indoor !== 'no') return 'indoor';
             if ((way.tags.building && way.tags.building !== 'no') ||
@@ -54,7 +52,6 @@ export function validationCloseNodes(context) {
         }
 
         function shouldCheckWay(way) {
-
             // don't flag issues where merging would create degenerate ways
             if (way.nodes.length <= 2 ||
                 (way.isClosed() && way.nodes.length <= 4)) return false;
@@ -127,9 +124,7 @@ export function validationCloseNodes(context) {
         }
 
         function getIssuesForDetachedPoint(node) {
-
             var issues = [];
-
             var lon = node.loc[0];
             var lat = node.loc[1];
             var lon_range = geoMetersToLon(pointThresholdMeters, lat) / 2;
@@ -139,7 +134,7 @@ export function validationCloseNodes(context) {
                 [lon + lon_range, lat + lat_range]
             );
 
-            var intersected = context.history().tree().intersects(queryExtent, graph);
+            var intersected = context.editSystem().tree().intersects(queryExtent, graph);
             for (var j = 0; j < intersected.length; j++) {
                 var nearby = intersected[j];
 
@@ -166,29 +161,29 @@ export function validationCloseNodes(context) {
                     }
                     if (zAxisDifferentiates) continue;
 
-                    issues.push(new validationIssue({
+                    issues.push(new ValidationIssue(context, {
                         type: type,
                         subtype: 'detached',
                         severity: 'warning',
-                        message: function(context) {
+                        message: function() {
                             var entity = context.hasEntity(this.entityIds[0]),
                                 entity2 = context.hasEntity(this.entityIds[1]);
-                            return (entity && entity2) ? t.html('issues.close_nodes.detached.message', {
-                                feature: utilDisplayLabel(entity, context.graph()),
-                                feature2: utilDisplayLabel(entity2, context.graph())
+                            return (entity && entity2) ? l10n.tHtml('issues.close_nodes.detached.message', {
+                                feature: l10n.displayLabel(entity, context.graph()),
+                                feature2: l10n.displayLabel(entity2, context.graph())
                             }) : '';
                         },
                         reference: showReference,
                         entityIds: [node.id, nearby.id],
                         dynamicFixes: function() {
                             return [
-                                new validationIssueFix({
+                                new ValidationFix({
                                     icon: 'rapid-operation-disconnect',
-                                    title: t.html('issues.fix.move_points_apart.title')
+                                    title: l10n.tHtml('issues.fix.move_points_apart.title')
                                 }),
-                                new validationIssueFix({
+                                new ValidationFix({
                                     icon: 'rapid-icon-layers',
-                                    title: t.html('issues.fix.use_different_layers_or_levels.title')
+                                    title: l10n.tHtml('issues.fix.use_different_layers_or_levels.title')
                                 })
                             ];
                         }
@@ -199,7 +194,7 @@ export function validationCloseNodes(context) {
             return issues;
 
             function showReference(selection) {
-                var referenceText = t('issues.close_nodes.detached.reference');
+                var referenceText = l10n.t('issues.close_nodes.detached.reference');
                 selection.selectAll('.issue-reference')
                     .data([0])
                     .enter()
@@ -232,38 +227,38 @@ export function validationCloseNodes(context) {
                 if (distance > threshold) return null;
             }
 
-            return new validationIssue({
+            return new ValidationIssue(context, {
                 type: type,
                 subtype: 'vertices',
                 severity: 'warning',
-                message: function(context) {
+                message: function() {
                     var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t.html('issues.close_nodes.message', { way: utilDisplayLabel(entity, context.graph()) }) : '';
+                    return entity ? l10n.tHtml('issues.close_nodes.message', { way: l10n.displayLabel(entity, context.graph()) }) : '';
                 },
                 reference: showReference,
                 entityIds: [way.id, node1.id, node2.id],
                 loc: node1.loc,
                 dynamicFixes: function() {
                     return [
-                        new validationIssueFix({
+                        new ValidationFix({
                             icon: 'rapid-icon-plus',
-                            title: t.html('issues.fix.merge_points.title'),
-                            onClick: function(context) {
+                            title: l10n.tHtml('issues.fix.merge_points.title'),
+                            onClick: function() {
                                 var entityIds = this.issue.entityIds;
                                 var action = actionMergeNodes([entityIds[1], entityIds[2]]);
-                                context.perform(action, t('issues.fix.merge_close_vertices.annotation'));
+                                context.perform(action, l10n.t('issues.fix.merge_close_vertices.annotation'));
                             }
                         }),
-                        new validationIssueFix({
+                        new ValidationFix({
                             icon: 'rapid-operation-disconnect',
-                            title: t.html('issues.fix.move_points_apart.title')
+                            title: l10n.tHtml('issues.fix.move_points_apart.title')
                         })
                     ];
                 }
             });
 
             function showReference(selection) {
-                var referenceText = t('issues.close_nodes.reference');
+                var referenceText = l10n.t('issues.close_nodes.reference');
                 selection.selectAll('.issue-reference')
                     .data([0])
                     .enter()
diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js
index 4c2c9cd5ec..c50447c6f8 100644
--- a/modules/validations/crossing_ways.js
+++ b/modules/validations/crossing_ways.js
@@ -8,19 +8,17 @@ import { actionAddMidpoint } from '../actions/add_midpoint';
 import { actionChangeTags } from '../actions/change_tags';
 import { actionMergeNodes } from '../actions/merge_nodes';
 import { actionSplit } from '../actions/split';
-import { modeSelect } from '../modes/select';
 import { osmNode } from '../osm/node';
 import {
   osmFlowingWaterwayTagValues, osmPathHighwayTagValues, osmRailwayTrackTagValues,
   osmRoutableAerowayTags, osmRoutableHighwayTagValues
 } from '../osm/tags';
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
 export function validationCrossingWays(context) {
-    var type = 'crossing_ways';
+    const type = 'crossing_ways';
+    const l10n = context.localizationSystem();
 
     // returns the way or its parent relation, whichever has a useful feature type
     function getFeatureWithFeatureTypeTagsForWay(way, graph) {
@@ -62,7 +60,6 @@ export function validationCrossingWays(context) {
 
 
     function getFeatureType(entity, graph) {
-
         var geometry = entity.geometry(graph);
         if (geometry !== 'line' && geometry !== 'area') return null;
 
@@ -83,7 +80,6 @@ export function validationCrossingWays(context) {
 
 
     function isLegitCrossing(tags1, featureType1, tags2, featureType2) {
-
         // assume 0 by default
         var level1 = tags1.level || '0';
         var level2 = tags2.level || '0';
@@ -357,7 +353,7 @@ export function validationCrossingWays(context) {
 
     var validation = function checkCrossingWays(entity, graph) {
 
-        var tree = context.history().tree();
+        var tree = context.editSystem().tree();
 
         var ways = waysToCheck(entity, graph);
 
@@ -381,7 +377,7 @@ export function validationCrossingWays(context) {
             var type1 = way1Info.featureType;
             var type2 = way2Info.featureType;
             if (type1 === type2) {
-                return utilDisplayLabel(way1Info.way, graph) > utilDisplayLabel(way2Info.way, graph);
+                return l10n.displayLabel(way1Info.way, graph) > l10n.displayLabel(way2Info.way, graph);
             } else if (type1 === 'waterway') {
                 return true;
             } else if (type2 === 'waterway') {
@@ -424,17 +420,17 @@ export function validationCrossingWays(context) {
         // Differentiate based on the loc rounded to 4 digits, since two ways can cross multiple times.
         var uniqueID = '' + crossing.crossPoint[0].toFixed(4) + ',' + crossing.crossPoint[1].toFixed(4);
 
-        return new validationIssue({
+        return new ValidationIssue(context, {
             type: type,
             subtype: subtype,
             severity: 'warning',
-            message: function(context) {
+            message: function() {
                 var graph = context.graph();
-                var entity1 = graph.hasEntity(this.entityIds[0]),
-                    entity2 = graph.hasEntity(this.entityIds[1]);
-                return (entity1 && entity2) ? t.html('issues.crossing_ways.message', {
-                    feature: utilDisplayLabel(entity1, graph),
-                    feature2: utilDisplayLabel(entity2, graph)
+                var entity1 = graph.hasEntity(this.entityIds[0]);
+                var entity2 = graph.hasEntity(this.entityIds[1]);
+                return (entity1 && entity2) ? l10n.tHtml('issues.crossing_ways.message', {
+                    feature: l10n.displayLabel(entity1, graph),
+                    feature2: l10n.displayLabel(entity2, graph)
                 }) : '';
             },
             reference: showReference,
@@ -449,10 +445,10 @@ export function validationCrossingWays(context) {
             hash: uniqueID,
             loc: crossing.crossPoint,
             autoArgs: connectionTags && !connectionTags.ford && getConnectWaysAction(crossing.crossPoint, edges, connectionTags),
-            dynamicFixes: function(context) {
+            dynamicFixes: function() {
                 var mode = context.mode();
                 var selectedIDs = context.selectedIDs();
-                if (!mode || mode.id !== 'select' || selectedIDs.length !== 1) return [];
+                if (mode?.id !== 'select-osm' || selectedIDs.length !== 1) return [];
 
                 var selectedIndex = this.entityIds[0] === selectedIDs[0] ? 0 : 1;
                 var selectedFeatureType = this.data.featureTypes[selectedIndex];
@@ -465,9 +461,9 @@ export function validationCrossingWays(context) {
                 }
 
                 if (isCrossingIndoors) {
-                    fixes.push(new validationIssueFix({
+                    fixes.push(new ValidationFix({
                         icon: 'rapid-icon-layers',
-                        title: t.html('issues.fix.use_different_levels.title')
+                        title: l10n.tHtml('issues.fix.use_different_levels.title')
                     }));
                 } else if (isCrossingTunnels || isCrossingBridges || featureType1 === 'building' || featureType2 === 'building')  {
                     fixes.push(makeChangeLayerFix('higher'));
@@ -490,9 +486,9 @@ export function validationCrossingWays(context) {
                 }
 
                 // repositioning the features is always an option
-                fixes.push(new validationIssueFix({
+                fixes.push(new ValidationFix({
                     icon: 'rapid-operation-move',
-                    title: t.html('issues.fix.reposition_features.title')
+                    title: l10n.tHtml('issues.fix.reposition_features.title')
                 }));
 
                 return fixes;
@@ -505,17 +501,17 @@ export function validationCrossingWays(context) {
                 .enter()
                 .append('div')
                 .attr('class', 'issue-reference')
-                .html(t.html('issues.crossing_ways.' + crossingTypeID + '.reference'));
+                .html(l10n.tHtml('issues.crossing_ways.' + crossingTypeID + '.reference'));
         }
     }
 
     function makeAddBridgeOrTunnelFix(fixTitleID, iconName, bridgeOrTunnel){
-        return new validationIssueFix({
+        return new ValidationFix({
             icon: iconName,
-            title: t.html('issues.fix.' + fixTitleID + '.title'),
-            onClick: function(context) {
+            title: l10n.tHtml('issues.fix.' + fixTitleID + '.title'),
+            onClick: function() {
                 var mode = context.mode();
-                if (!mode || mode.id !== 'select') return;
+                if (mode?.id !== 'select-osm') return;
 
                 var selectedIDs = mode.selectedIDs();
                 if (selectedIDs.length !== 1) return;
@@ -706,8 +702,8 @@ export function validationCrossingWays(context) {
                     return graph;
                 };
 
-                context.perform(action, t('issues.fix.' + fixTitleID + '.annotation'));
-                context.enter(modeSelect(context, resultWayIDs));
+                context.perform(action, l10n.t(`issues.fix.${fixTitleID}.annotation`));
+                context.enter('select-osm', { selectedIDs: resultWayIDs });
             }
         });
     }
@@ -755,7 +751,7 @@ export function validationCrossingWays(context) {
             return didSomething ? newGraph : graph;
         };
 
-        return [fn, t('issues.fix.connect_crossing_features.annotation')];
+        return [fn, l10n.t('issues.fix.connect_crossing_features.annotation')];
     }
 
 
@@ -764,10 +760,10 @@ export function validationCrossingWays(context) {
         if (connectionTags.ford) {
             fixTitleID = 'connect_using_ford';
         }
-        return new validationIssueFix({
+        return new ValidationFix({
             icon: 'rapid-icon-crossing',
-            title: t.html('issues.fix.' + fixTitleID + '.title'),
-            onClick: function(context) {
+            title: l10n.tHtml(`issues.fix.${fixTitleID}.title`),
+            onClick: function() {
                 var loc = this.issue.loc;
                 var edges = this.issue.data.edges;
                 var connectionTags = this.issue.data.connectionTags;
@@ -779,13 +775,12 @@ export function validationCrossingWays(context) {
     }
 
     function makeChangeLayerFix(higherOrLower) {
-        return new validationIssueFix({
+        return new ValidationFix({
             icon: 'rapid-icon-' + (higherOrLower === 'higher' ? 'up' : 'down'),
-            title: t.html('issues.fix.tag_this_as_' + higherOrLower + '.title'),
-            onClick: function(context) {
-
+            title: l10n.tHtml(`issues.fix.tag_this_as_${higherOrLower}.title`),
+            onClick: function() {
                 var mode = context.mode();
-                if (!mode || mode.id !== 'select') return;
+                if (mode?.id !== 'select-osm') return;
 
                 var selectedIDs = mode.selectedIDs();
                 if (selectedIDs.length !== 1) return;
@@ -816,7 +811,7 @@ export function validationCrossingWays(context) {
                 tags.layer = layer.toString();
                 context.perform(
                     actionChangeTags(entity.id, tags),
-                    t('operations.change_tags.annotation')
+                    l10n.t('operations.change_tags.annotation')
                 );
             }
         });
diff --git a/modules/validations/disconnected_way.js b/modules/validations/disconnected_way.js
index 8859bd75cd..70ac0093f2 100644
--- a/modules/validations/disconnected_way.js
+++ b/modules/validations/disconnected_way.js
@@ -1,216 +1,203 @@
 import { Extent } from '@rapid-sdk/math';
 
-import { t, localizer } from '../core/localizer';
 import { operationDelete } from '../operations/delete';
-import { utilDisplayLabel } from '../util';
 import { osmRoutableHighwayTagValues } from '../osm/tags';
-import { validationIssue, validationIssueFix } from '../core/validation';
-import { services } from '../services';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
-export function validationDisconnectedWay() {
-    var type = 'disconnected_way';
+export function validationDisconnectedWay(context) {
+  const type = 'disconnected_way';
+  const l10n = context.localizationSystem();
 
-    function isTaggedAsHighway(entity) {
-        return osmRoutableHighwayTagValues[entity.tags.highway];
-    }
+  function isTaggedAsHighway(entity) {
+    return osmRoutableHighwayTagValues[entity.tags.highway];
+  }
 
 
-    var validation = function checkDisconnectedWay(entity, graph) {
-
-        var routingIslandWays = routingIslandForEntity(entity);
-        if (!routingIslandWays) return [];
-
-        return [new validationIssue({
-            type: type,
-            subtype: 'highway',
-            severity: 'warning',
-            message: function(context) {
-                var entity = this.entityIds.length && context.hasEntity(this.entityIds[0]);
-                var label = entity && utilDisplayLabel(entity, context.graph());
-                return t.html('issues.disconnected_way.routable.message', { count: this.entityIds.length, highway: label });
-            },
-            reference: showReference,
-            entityIds: Array.from(routingIslandWays).map(function(way) { return way.id; }),
-            dynamicFixes: makeFixes
-        })];
-
-
-        function makeFixes(context) {
-
-            var fixes = [];
-
-            var singleEntity = this.entityIds.length === 1 && context.hasEntity(this.entityIds[0]);
-
-            if (singleEntity) {
-
-                if (singleEntity.type === 'way' && !singleEntity.isClosed()) {
-
-                    var textDirection = localizer.textDirection();
-
-                    var startFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.first(), 'start');
-                    if (startFix) fixes.push(startFix);
-
-                    var endFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.last(), 'end');
-                    if (endFix) fixes.push(endFix);
-                }
-                if (!fixes.length) {
-                    fixes.push(new validationIssueFix({
-                        title: t.html('issues.fix.connect_feature.title')
-                    }));
-                }
-
-                fixes.push(new validationIssueFix({
-                    icon: 'rapid-operation-delete',
-                    title: t.html('issues.fix.delete_feature.title'),
-                    entityIds: [singleEntity.id],
-                    onClick: function(context) {
-                        var id = this.issue.entityIds[0];
-                        var operation = operationDelete(context, [id]);
-                        if (!operation.disabled()) {
-                            operation();
-                        }
-                    }
-                }));
-            } else {
-                fixes.push(new validationIssueFix({
-                    title: t.html('issues.fix.connect_features.title')
-                }));
-            }
+  let validation = function checkDisconnectedWay(entity, graph) {
+    const routingIslandEntities = routingIslandForEntity(entity);
+    if (!routingIslandEntities) return [];
 
-            return fixes;
-        }
+    return [new ValidationIssue(context, {
+      type: type,
+      subtype: 'highway',
+      severity: 'warning',
+      message: function() {
+        const entity = this.entityIds.length && context.hasEntity(this.entityIds[0]);
+        const label = entity && l10n.displayLabel(entity, context.graph());
+        return l10n.tHtml('issues.disconnected_way.routable.message', { count: this.entityIds.length, highway: label });
+      },
+      reference: showReference,
+      entityIds: Array.from(routingIslandEntities).map(entity => entity.id),
+      dynamicFixes: makeFixes
+    })];
 
 
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.disconnected_way.routable.reference'));
-        }
+    function makeFixes() {
+      const singleEntity = this.entityIds.length === 1 && context.hasEntity(this.entityIds[0]);
+      let fixes = [];
 
-        function routingIslandForEntity(entity) {
+      if (singleEntity) {
+        if (singleEntity.type === 'way' && !singleEntity.isClosed()) {
+          const startFix = makeContinueDrawingFixIfAllowed(singleEntity.first(), 'start');
+          if (startFix) fixes.push(startFix);
 
-            var routingIsland = new Set();  // the interconnected routable features
-            var waysToCheck = [];           // the queue of remaining routable ways to traverse
+          const endFix = makeContinueDrawingFixIfAllowed(singleEntity.last(), 'end');
+          if (endFix) fixes.push(endFix);
+        }
+        if (!fixes.length) {
+          fixes.push(new ValidationFix({
+            title: l10n.tHtml('issues.fix.connect_feature.title')
+          }));
+        }
 
-            function queueParentWays(node) {
-                graph.parentWays(node).forEach(function(parentWay) {
-                    if (!routingIsland.has(parentWay) &&    // only check each feature once
-                        isRoutableWay(parentWay, false)) {  // only check routable features
-                        routingIsland.add(parentWay);
-                        waysToCheck.push(parentWay);
-                    }
-                });
+        fixes.push(new ValidationFix({
+          icon: 'rapid-operation-delete',
+          title: l10n.tHtml('issues.fix.delete_feature.title'),
+          entityIds: [singleEntity.id],
+          onClick: function() {
+            const id = this.issue.entityIds[0];
+            const operation = operationDelete(context, [id]);
+            if (!operation.disabled()) {
+              operation();
             }
+          }
+        }));
+      } else {
+        fixes.push(new ValidationFix({
+          title: l10n.tHtml('issues.fix.connect_features.title')
+        }));
+      }
+
+      return fixes;
+    }
+
 
-            if (entity.type === 'way' && isRoutableWay(entity, true)) {
+    function showReference(selection) {
+      selection.selectAll('.issue-reference')
+        .data([0])
+        .enter()
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml('issues.disconnected_way.routable.reference'));
+    }
 
-                routingIsland.add(entity);
-                waysToCheck.push(entity);
 
-            } else if (entity.type === 'node' && isRoutableNode(entity)) {
+    function routingIslandForEntity(entity) {
+      let routingIsland = new Set();  // the interconnected routable features
+      let waysToCheck = [];           // the queue of remaining routable ways to traverse
 
-                routingIsland.add(entity);
-                queueParentWays(entity);
+      function queueParentWays(node) {
+        for (const parentWay of graph.parentWays(node)) {
+          if (!routingIsland.has(parentWay) && isRoutableWay(parentWay, false)) {
+            routingIsland.add(parentWay);
+            waysToCheck.push(parentWay);
+          }
+        }
+      }
 
-            } else {
-                // this feature isn't routable, cannot be a routing island
-                return null;
-            }
+      if (entity.type === 'way' && isRoutableWay(entity, true)) {
+        routingIsland.add(entity);
+        waysToCheck.push(entity);
 
-            while (waysToCheck.length) {
-                var wayToCheck = waysToCheck.pop();
-                var childNodes = graph.childNodes(wayToCheck);
-                for (var i in childNodes) {
-                    var vertex = childNodes[i];
+      } else if (entity.type === 'node' && isRoutableNode(entity)) {
+        routingIsland.add(entity);
+        queueParentWays(entity);
 
-                    if (isConnectedVertex(vertex)) {
-                        // found a link to the wider network, not a routing island
-                        return null;
-                    }
+      } else {    // this feature isn't routable, cannot be a routing island
+        return null;
+      }
 
-                    if (isRoutableNode(vertex)) {
-                        routingIsland.add(vertex);
-                    }
 
-                    queueParentWays(vertex);
-                }
-            }
+      while (waysToCheck.length) {
+        const way = waysToCheck.pop();
+        for (const vertex of graph.childNodes(way)) {
+          if (isConnectedVertex(vertex)) {
+            return null;  // found a link to the wider network, not a routing island
+          }
 
-            // no network link found, this is a routing island, return its members
-            return routingIsland;
+          if (isRoutableNode(vertex)) {
+            routingIsland.add(vertex);
+          }
+
+          queueParentWays(vertex);
         }
+      }
 
-        function isConnectedVertex(vertex) {
-            // assume ways overlapping unloaded tiles are connected to the wider road network  - #5938
-            var osm = services.osm;
-            if (osm && !osm.isDataLoaded(vertex.loc)) return true;
+      // no network link found, this is a routing island, return its members
+      return routingIsland;
+    }
 
-            // entrances are considered connected
-            if (vertex.tags.entrance &&
-                vertex.tags.entrance !== 'no') return true;
-            if (vertex.tags.amenity === 'parking_entrance') return true;
 
-            return false;
-        }
+    function isConnectedVertex(vertex) {
+      // assume ways overlapping unloaded tiles are connected to the wider road network  - iD#5938
+      const osm = context.services.get('osm');
+      if (osm && !osm.isDataLoaded(vertex.loc)) return true;
 
-        function isRoutableNode(node) {
-            // treat elevators as distinct features in the highway network
-            if (node.tags.highway === 'elevator') return true;
-            return false;
-        }
+      // entrances are considered connected
+      if (vertex.tags.entrance && vertex.tags.entrance !== 'no') return true;
+      if (vertex.tags.amenity === 'parking_entrance') return true;
+
+      return false;
+    }
 
-        function isRoutableWay(way, ignoreInnerWays) {
-            if (isTaggedAsHighway(way) || way.tags.route === 'ferry') return true;
 
-            return graph.parentRelations(way).some(function(parentRelation) {
-                if (parentRelation.tags.type === 'route' &&
-                    parentRelation.tags.route === 'ferry') return true;
+    function isRoutableNode(node) {
+      // treat elevators as distinct features in the highway network
+      if (node.tags.highway === 'elevator') return true;
+      return false;
+    }
 
-                if (parentRelation.isMultipolygon() &&
-                    isTaggedAsHighway(parentRelation) &&
-                    (!ignoreInnerWays || parentRelation.memberById(way.id).role !== 'inner')) return true;
 
-                return false;
-            });
-        }
+    function isRoutableWay(way, ignoreInnerWays) {
+      if (isTaggedAsHighway(way) || way.tags.route === 'ferry') return true;
+
+      return graph.parentRelations(way).some(parentRelation => {
+        if (parentRelation.tags.type === 'route' &&
+          parentRelation.tags.route === 'ferry') return true;
+
+        if (parentRelation.isMultipolygon() &&
+          isTaggedAsHighway(parentRelation) &&
+          (!ignoreInnerWays || parentRelation.memberById(way.id).role !== 'inner')) return true;
+
+        return false;
+      });
+    }
 
-        function makeContinueDrawingFixIfAllowed(textDirection, vertexID, whichEnd) {
-            var vertex = graph.hasEntity(vertexID);
-            if (!vertex || vertex.tags.noexit === 'yes') return null;
-
-            var useLeftContinue = (whichEnd === 'start' && textDirection === 'ltr') ||
-                (whichEnd === 'end' && textDirection === 'rtl');
-
-            return new validationIssueFix({
-                icon: 'rapid-operation-continue' + (useLeftContinue ? '-left' : ''),
-                title: t.html('issues.fix.continue_from_' + whichEnd + '.title'),
-                entityIds: [vertexID],
-                onClick: function(context) {
-                    var wayId = this.issue.entityIds[0];
-                    var way = context.hasEntity(wayId);
-                    var vertexId = this.entityIds[0];
-                    var vertex = context.hasEntity(vertexId);
-
-                    if (!way || !vertex) return;
-
-                    // make sure the vertex is actually visible and editable
-                    var map = context.map();
-                    if (!context.editable() || !map.trimmedExtent().contains(new Extent(vertex.loc))) {
-                        map.zoomToEase(vertex);
-                    }
-
-                    context.enter('draw-line', { continueWay: way, continueNode: vertex });
-                }
-            });
+
+    function makeContinueDrawingFixIfAllowed(vertexID, whichEnd) {
+      const vertex = graph.hasEntity(vertexID);
+      if (!vertex || vertex.tags.noexit === 'yes') return null;
+
+      const isRTL = l10n.isRTL();
+      const useLeftContinue = (whichEnd === 'start' && !isRTL) || (whichEnd === 'end' && isRTL);
+
+      return new ValidationFix({
+        icon: 'rapid-operation-continue' + (useLeftContinue ? '-left' : ''),
+        title: l10n.tHtml(`issues.fix.continue_from_${whichEnd}.title`),
+        entityIds: [vertexID],
+        onClick: function() {
+          const wayID = this.issue.entityIds[0];
+          const way = context.hasEntity(wayID);
+          const vertexID = this.entityIds[0];
+          const vertex = context.hasEntity(vertexID);
+
+          if (!way || !vertex) return;
+
+          // make sure the vertex is actually visible and editable
+          const map = context.mapSystem();
+          if (!context.editable() || !map.trimmedExtent().contains(new Extent(vertex.loc))) {
+            map.zoomToEase(vertex);
+          }
+
+          context.enter('draw-line', { continueWay: way, continueNode: vertex });
         }
+      });
+    }
+  };
 
-    };
 
-    validation.type = type;
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/modules/validations/duplicate_way_segments.js b/modules/validations/duplicate_way_segments.js
index a7729a8054..102bc973d0 100644
--- a/modules/validations/duplicate_way_segments.js
+++ b/modules/validations/duplicate_way_segments.js
@@ -1,129 +1,123 @@
-import { utilDisplayLabel } from '../util';
-import { t } from '../core/localizer';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
+
 
 // This validation determines whether way segments are duplicated atop one another,
 // which is impossible to detect via the tool(the geometries are stacked on top of
 // one another, so they are not visible ever).
-export function validationDuplicateWaySegments() {
-    var type = 'duplicate_way_segments';
+export function validationDuplicateWaySegments(context) {
+  const type = 'duplicate_way_segments';
+  const l10n = context.localizationSystem();
 
 
-    var validation = function(entity, graph) {
-        if (entity.type === 'way') {
-            return getIssuesForWay(entity);
-        }
-        return [];
+  let validation = function(entity, graph) {
+    if (entity.type === 'way') {
+      return getIssuesForWay(entity);
+    }
+    return [];
 
 
-        function isRoutableTag(key) {
-            return key === 'highway' ||
-                key === 'railway' ||
-                key === 'waterway';
-        }
+    function isRoutableTag(key) {
+      return key === 'highway' || key === 'railway' || key === 'waterway';
+    }
 
 
     // Consider a way to be routable if it is a highway, railway, or wateray.
     // if it is an area of any kind, it is not routable.
     function hasRoutableTags(way) {
-        if (way.isArea()) return false;
-        return Object.keys(way.tags).some(isRoutableTag);
+      if (way.isArea()) return false;
+      return Object.keys(way.tags).some(isRoutableTag);
     }
 
 
     function adjacentNodes(node1, node2, way) {
-        const nodes = graph.childNodes(way);
-        return Math.abs(nodes.findIndex(node => node.id === node1.id) - nodes.findIndex(node =>  node.id === node2.id)) === 1;
+      const nodes = graph.childNodes(way);
+      const index1 = nodes.findIndex(node => node.id === node1.id);
+      const index2 = nodes.findIndex(node => node.id === node2.id);
+      return Math.abs(index1 - index2) === 1;
     }
 
 
     function getIssuesForWay(way) {
-        var issues = [];
-            if (!hasRoutableTags(way)) return issues;
+      let issues = [];
+      if (!hasRoutableTags(way)) return issues;
+
+      const nodes = graph.childNodes(way);
+      for (let i = 0; i < nodes.length - 1; i++) {
+        const node1 = nodes[i];
+        const node2 = nodes[i+1];
+        const issue = getWayIssueIfAny(node1, node2, way);
+        if (issue) issues.push(issue);
+      }
+      return issues;
+    }
 
-        var nodes = graph.childNodes(way);
-        for (var i = 0; i < nodes.length - 1; i++) {
-            var node1 = nodes[i];
-            var node2 = nodes[i+1];
 
-            var issue = getWayIssueIfAny(node1, node2, way);
-            if (issue) issues.push(issue);
+    function getWayIssueIfAny(node1, node2, way) {
+      if (node1.id === node2.id ) return null;
+
+      if (node1.loc !== node2.loc) {
+        const parentWays1 = graph.parentWays(node1);
+        const parentWays2 = new Set(graph.parentWays(node2));
+        const sharedWays = parentWays1.filter(parentWay => parentWays2.has(parentWay));
+
+        // Now, we want to filter out any shared ways that aren't routable.
+        const remainingSharedWays = sharedWays.filter(way => hasRoutableTags(way));
+
+        //Finally, get rid of ways where the two nodes in question are not continguous
+        //(this indicates a dogleg or u-shaped road splitting off from node1 and then re-joining at node 2)
+        const waysWithContiguousNodes = remainingSharedWays.filter(way => adjacentNodes(node1, node2, way));
+
+        // If the nodes don't share a way, or share 1 way, that's fine!
+        // We just want to know if they share 2 or more ways, which means we have duplicate way geometries.
+        if (waysWithContiguousNodes.length <= 1) return null;
+      }
+
+      return new ValidationIssue(context, {
+        type: type,
+        subtype: 'vertices',
+        severity: 'warning',
+        message: function() {
+          const entity = context.hasEntity(this.entityIds[0]);
+          return entity ? l10n.tHtml('issues.duplicate_way_segments.message', {
+            way: l10n.displayLabel(entity, context.graph())
+          }) : '';
+        },
+        reference: showReference,
+        entityIds: [way.id, node1.id, node2.id],
+        loc: node1.loc,
+        dynamicFixes: function() {
+          return [
+            new ValidationFix({
+              icon: 'rapid-icon-plus',
+              title: l10n.tHtml('issues.fix.merge_points.title'),
+            }),
+            new ValidationFix({
+              icon: 'rapid-operation-delete',
+              title: l10n.tHtml('issues.fix.remove_way_segments.title')
+            }),
+            new ValidationFix({
+              icon: 'rapid-operation-disconnect',
+              title: l10n.tHtml('issues.fix.move_way_segments_apart.title')
+            })
+          ];
         }
-        return issues;
-    }
+      });
 
 
-        function getWayIssueIfAny(node1, node2, way) {
-            if (node1.id === node2.id ) {
-                return null;
-            }
-
-            if (node1.loc !== node2.loc) {
-                var parentWays1 = graph.parentWays(node1);
-                var parentWays2 = new Set(graph.parentWays(node2));
-
-                var sharedWays = parentWays1.filter(function(parentWay) {
-                    return parentWays2.has(parentWay);
-                });
-
-                // Now, we want to filter out any shared ways that aren't routable.
-
-                var remainingSharedWays = sharedWays.filter(way => hasRoutableTags(way));
-
-                //Finally, get rid of ways where the two nodes in question are not continguous (this indicates a dogleg or u-shaped road splitting off from node1 and then re-joining at node 2)
-                var waysWithContiguousNodes = remainingSharedWays.filter(way => adjacentNodes(node1, node2, way));
-
-                // If the nodes don't share a way, or share 1 way, that's fine!
-                // We just want to know if they share 2 or more ways, which means we have duplicate way geometries.
-                if (waysWithContiguousNodes.length <= 1) return null;
-            }
-
-
-            return new validationIssue({
-                type: type,
-                subtype: 'vertices',
-                severity: 'warning',
-                message: function(context) {
-                    var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t.html('issues.duplicate_way_segments.message', { way: utilDisplayLabel(entity, context.graph()) }) : '';
-                },
-                reference: showReference,
-                entityIds: [way.id, node1.id, node2.id],
-                loc: node1.loc,
-                dynamicFixes: function() {
-                    return [
-                        new validationIssueFix({
-                            icon: 'rapid-icon-plus',
-                            title: t.html('issues.fix.merge_points.title'),
-                        }),
-                        new validationIssueFix({
-                            icon: 'rapid-operation-delete',
-                            title: t.html('issues.fix.remove_way_segments.title')
-                        }),
-                        new validationIssueFix({
-                            icon: 'rapid-operation-disconnect',
-                            title: t.html('issues.fix.move_way_segments_apart.title')
-                        })
-                    ];
-                }
-            });
-
-
-            function showReference(selection) {
-                var referenceText = t('issues.duplicate_way_segments.reference');
-                selection.selectAll('.issue-reference')
-                    .data([0])
-                    .enter()
-                    .append('div')
-                    .attr('class', 'issue-reference')
-                    .html(referenceText);
-            }
-        }
+      function showReference(selection) {
+        selection.selectAll('.issue-reference')
+          .data([0])
+          .enter()
+          .append('div')
+          .attr('class', 'issue-reference')
+          .html(l10n.t('issues.duplicate_way_segments.reference'));
+      }
+    }
 
-    };
+  };
 
 
-    validation.type = type;
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/modules/validations/generic_name.js b/modules/validations/generic_name.js
deleted file mode 100644
index 90892cc2cc..0000000000
--- a/modules/validations/generic_name.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import { filters } from 'name-suggestion-index';
-
-import { t } from '../core/localizer';
-import { utilPreset } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
-import { actionChangeTags } from '../actions/change_tags';
-
-
-export function validationGenericName() {
-    var type = 'generic_name';
-
-    // known list of generic names (e.g. "bar")
-    var discardNamesRegexes = filters.discardNames.map(function(discardName) {
-        return new RegExp(discardName, 'i');
-    });
-
-    var keysToTestForGenericValues = ['amenity', 'building', 'leisure', 'man_made', 'shop', 'tourism'];
-
-    function isGenericName(entity) {
-        var name = entity.tags.name;
-        if (!name) return false;
-        // a generic name is okay if it's a known brand or entity
-        if (entity.hasWikidata()) return false;
-        name = name.toLowerCase();
-
-        var i, key, val;
-
-        // test if the name is just the key or tag value (e.g. "park")
-        for (i = 0; i < keysToTestForGenericValues.length; i++) {
-            key = keysToTestForGenericValues[i];
-            val = entity.tags[key];
-            if (val) {
-                val = val.toLowerCase();
-                if (key === name ||
-                    val === name ||
-                    key.replace(/\_/g, ' ') === name ||
-                    val.replace(/\_/g, ' ') === name) {
-                    return entity.tags.name;
-                }
-            }
-        }
-
-        // test if the name is otherwise generic
-        for (i = 0; i < discardNamesRegexes.length; i++) {
-            if (discardNamesRegexes[i].test(name)) {
-                return entity.tags.name;
-            }
-        }
-
-        return false;
-    }
-
-
-    var validation = function checkGenericName(entity) {
-        var generic = isGenericName(entity);
-        if (!generic) return [];
-
-        return [new validationIssue({
-            type: type,
-            severity: 'warning',
-            message: function(context) {
-                var entity = context.hasEntity(this.entityIds[0]);
-                if (!entity) return '';
-                var preset = utilPreset(entity, context);
-                return t('issues.generic_name.message', { feature: preset.name(), name: generic });
-            },
-            reference: showReference,
-            entityIds: [entity.id],
-            hash: generic,
-            fixes: [
-                new validationIssueFix({
-                    icon: 'rapid-operation-delete',
-                    title: t('issues.fix.remove_generic_name.title'),
-                    onClick: function(context) {
-                        var entityId = this.issue.entityIds[0];
-                        var entity = context.entity(entityId);
-                        var tags = Object.assign({}, entity.tags);   // shallow copy
-                        delete tags.name;
-                        context.perform(
-                            actionChangeTags(entityId, tags),
-                            t('issues.fix.remove_generic_name.annotation')
-                        );
-                    }
-                })
-            ]
-        })];
-
-
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .text(t('issues.generic_name.reference'));
-        }
-    };
-
-    validation.type = type;
-
-    return validation;
-}
diff --git a/modules/validations/help_request.js b/modules/validations/help_request.js
index 5750b353d0..02e998c341 100644
--- a/modules/validations/help_request.js
+++ b/modules/validations/help_request.js
@@ -1,56 +1,53 @@
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
 export function validationHelpRequest(context) {
-    var type = 'help_request';
-
-    var validation = function checkFixmeTag(entity) {
-
-        if (!entity.tags.fixme) return [];
-
-        // don't flag fixmes on features added by the user
-        if (entity.version === undefined) return [];
-
-        if (entity.v !== undefined) {
-            var baseEntity = context.history().base().hasEntity(entity.id);
-            // don't flag fixmes added by the user on existing features
-            if (!baseEntity || !baseEntity.tags.fixme) return [];
-        }
-
-        return [new validationIssue({
-            type: type,
-            subtype: 'fixme_tag',
-            severity: 'warning',
-            message: function(context) {
-                var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t.html('issues.fixme_tag.message', {
-                    feature: utilDisplayLabel(entity, context.graph(), true /* verbose */)
-                }) : '';
-            },
-            dynamicFixes: function() {
-                return [
-                    new validationIssueFix({
-                        title: t.html('issues.fix.address_the_concern.title')
-                    })
-                ];
-            },
-            reference: showReference,
-            entityIds: [entity.id]
-        })];
-
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.fixme_tag.reference'));
-        }
-    };
-
-    validation.type = type;
-
-    return validation;
+  const type = 'help_request';
+  const l10n = context.localizationSystem();
+
+
+  let validation = function checkFixmeTag(entity) {
+    if (!entity.tags.fixme) return [];
+
+    // don't flag fixmes on features added by the user
+    if (entity.version === undefined) return [];
+
+    if (entity.v !== undefined) {
+      const baseEntity = context.editSystem().base().hasEntity(entity.id);
+      // don't flag fixmes added by the user on existing features
+      if (!baseEntity || !baseEntity.tags.fixme) return [];
+    }
+
+    return [new ValidationIssue(context, {
+      type: type,
+      subtype: 'fixme_tag',
+      severity: 'warning',
+      message: function() {
+        const entity = context.hasEntity(this.entityIds[0]);
+        return entity ? l10n.tHtml('issues.fixme_tag.message', {
+          feature: l10n.displayLabel(entity, context.graph(), true /* verbose */)
+        }) : '';
+      },
+      dynamicFixes: () => {
+        return [
+          new ValidationFix({ title: l10n.tHtml('issues.fix.address_the_concern.title') })
+        ];
+      },
+      reference: showReference,
+      entityIds: [entity.id]
+    })];
+
+    function showReference(selection) {
+      selection.selectAll('.issue-reference')
+        .data([0])
+        .enter()
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml('issues.fixme_tag.reference'));
+    }
+  };
+
+  validation.type = type;
+
+  return validation;
 }
diff --git a/modules/validations/impossible_oneway.js b/modules/validations/impossible_oneway.js
index 2895e6bc6f..186569a7ad 100644
--- a/modules/validations/impossible_oneway.js
+++ b/modules/validations/impossible_oneway.js
@@ -1,236 +1,198 @@
 import { Extent } from '@rapid-sdk/math';
 
-import { t, localizer } from '../core/localizer';
 import { actionReverse } from '../actions/reverse';
-import { utilDisplayLabel } from '../util';
-import { osmFlowingWaterwayTagValues, osmOneWayTags, osmRoutableHighwayTagValues } from '../osm/tags';
-import { validationIssue, validationIssueFix } from '../core/validation';
-import { services } from '../services';
+import { osmFlowingWaterwayTagValues, osmRoutableHighwayTagValues } from '../osm/tags';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
-export function validationImpossibleOneway() {
-    var type = 'impossible_oneway';
+export function validationImpossibleOneway(context) {
+  const type = 'impossible_oneway';
+  const l10n = context.localizationSystem();
 
-    var validation = function checkImpossibleOneway(entity, graph) {
+  let validation = function checkImpossibleOneway(entity, graph) {
+    if (entity.type !== 'way' || entity.geometry(graph) !== 'line') return [];
+    if (entity.isClosed()) return [];
+    if (!typeForWay(entity)) return [];
+    if (!entity.isOneWay()) return [];
 
-        if (entity.type !== 'way' || entity.geometry(graph) !== 'line') return [];
+    const firstIssues = issuesForNode(entity, entity.first());
+    const lastIssues = issuesForNode(entity, entity.last());
+    return firstIssues.concat(lastIssues);
 
-        if (entity.isClosed()) return [];
 
-        if (!typeForWay(entity)) return [];
-
-        if (!isOneway(entity)) return [];
+    function typeForWay(way) {
+      if (way.geometry(graph) !== 'line') return null;
+      if (osmRoutableHighwayTagValues[way.tags.highway]) return 'highway';
+      if (osmFlowingWaterwayTagValues[way.tags.waterway]) return 'waterway';
+      return null;
+    }
 
-        var firstIssues = issuesForNode(entity, entity.first());
-        var lastIssues = issuesForNode(entity, entity.last());
 
-        return firstIssues.concat(lastIssues);
+    function nodeOccursMoreThanOnce(way, nodeID) {
+      return (way.nodes.indexOf(nodeID) !== way.nodes.lastIndexOf(nodeID));
+    }
 
-        function typeForWay(way) {
-            if (way.geometry(graph) !== 'line') return null;
 
-            if (osmRoutableHighwayTagValues[way.tags.highway]) return 'highway';
-            if (osmFlowingWaterwayTagValues[way.tags.waterway]) return 'waterway';
-            return null;
-        }
+    function isConnectedViaOtherTypes(way, node) {
+      let wayType = typeForWay(way);
 
-        function isOneway(way) {
-            if (way.tags.oneway === 'yes') return true;
-            if (way.tags.oneway) return false;
+      if (wayType === 'highway') {
+        // entrances are considered connected
+        if (node.tags.entrance && node.tags.entrance !== 'no') return true;
+        if (node.tags.amenity === 'parking_entrance') return true;
 
-            for (var key in way.tags) {
-                if (osmOneWayTags[key] && osmOneWayTags[key][way.tags[key]]) {
-                    return true;
-                }
-            }
-            return false;
+      } else if (wayType === 'waterway') {
+        if (node.id === way.first()) {
+          // multiple waterways may start at the same spring
+          if (node.tags.natural === 'spring') return true;
+        } else {
+          // multiple waterways may end at the same drain
+          if (node.tags.manhole === 'drain') return true;
         }
-
-        function nodeOccursMoreThanOnce(way, nodeID) {
-            var occurrences = 0;
-            for (var index in way.nodes) {
-                if (way.nodes[index] === nodeID) {
-                    occurrences += 1;
-                    if (occurrences > 1) return true;
-                }
-            }
-            return false;
+      }
+
+      return graph.parentWays(node).some(parentWay => {
+        if (parentWay.id === way.id) return false;
+
+        if (wayType === 'highway') {
+          // allow connections to highway areas
+          if (parentWay.geometry(graph) === 'area' && osmRoutableHighwayTagValues[parentWay.tags.highway]) return true;
+          // count connections to ferry routes as connected
+          if (parentWay.tags.route === 'ferry') return true;
+
+          return graph.parentRelations(parentWay).some(parentRelation => {
+            if (parentRelation.tags.type === 'route' && parentRelation.tags.route === 'ferry') return true;
+            // allow connections to highway multipolygons
+            return parentRelation.isMultipolygon() && osmRoutableHighwayTagValues[parentRelation.tags.highway];
+          });
+        } else if (wayType === 'waterway') {
+          // multiple waterways may start or end at a water body at the same node
+          if (parentWay.tags.natural === 'water' || parentWay.tags.natural === 'coastline') return true;
         }
+        return false;
+      });
+    }
 
-        function isConnectedViaOtherTypes(way, node) {
-
-            var wayType = typeForWay(way);
-
-            if (wayType === 'highway') {
-                // entrances are considered connected
-                if (node.tags.entrance && node.tags.entrance !== 'no') return true;
-                if (node.tags.amenity === 'parking_entrance') return true;
-            } else if (wayType === 'waterway') {
-                if (node.id === way.first()) {
-                    // multiple waterways may start at the same spring
-                    if (node.tags.natural === 'spring') return true;
-                } else {
-                    // multiple waterways may end at the same drain
-                    if (node.tags.manhole === 'drain') return true;
-                }
-            }
-
-            return graph.parentWays(node).some(function(parentWay) {
-                if (parentWay.id === way.id) return false;
-
-                if (wayType === 'highway') {
-
-                    // allow connections to highway areas
-                    if (parentWay.geometry(graph) === 'area' &&
-                        osmRoutableHighwayTagValues[parentWay.tags.highway]) return true;
-
-                    // count connections to ferry routes as connected
-                    if (parentWay.tags.route === 'ferry') return true;
-
-                    return graph.parentRelations(parentWay).some(function(parentRelation) {
-                        if (parentRelation.tags.type === 'route' &&
-                            parentRelation.tags.route === 'ferry') return true;
-
-                        // allow connections to highway multipolygons
-                        return parentRelation.isMultipolygon() && osmRoutableHighwayTagValues[parentRelation.tags.highway];
-                    });
-                } else if (wayType === 'waterway') {
-                    // multiple waterways may start or end at a water body at the same node
-                    if (parentWay.tags.natural === 'water' ||
-                        parentWay.tags.natural === 'coastline') return true;
-                }
-                return false;
-            });
-        }
 
-        function issuesForNode(way, nodeID) {
-
-            var isFirst = nodeID === way.first();
-
-            var wayType = typeForWay(way);
-
-            // ignore if this way is self-connected at this node
-            if (nodeOccursMoreThanOnce(way, nodeID)) return [];
-
-            var osm = services.osm;
-            if (!osm) return [];
-
-            var node = graph.hasEntity(nodeID);
-
-            // ignore if this node or its tile are unloaded
-            if (!node || !osm.isDataLoaded(node.loc)) return [];
-
-            if (isConnectedViaOtherTypes(way, node)) return [];
-
-            var attachedWaysOfSameType = graph.parentWays(node).filter(function(parentWay) {
-                if (parentWay.id === way.id) return false;
-                return typeForWay(parentWay) === wayType;
-            });
-
-            // assume it's okay for waterways to start or end disconnected for now
-            if (wayType === 'waterway' && attachedWaysOfSameType.length === 0) return [];
-
-            var attachedOneways = attachedWaysOfSameType.filter(function(attachedWay) {
-                return isOneway(attachedWay);
-            });
-
-            // ignore if the way is connected to some non-oneway features
-            if (attachedOneways.length < attachedWaysOfSameType.length) return [];
-
-            if (attachedOneways.length) {
-                var connectedEndpointsOkay = attachedOneways.some(function(attachedOneway) {
-                    if ((isFirst ? attachedOneway.first() : attachedOneway.last()) !== nodeID) return true;
-                    if (nodeOccursMoreThanOnce(attachedOneway, nodeID)) return true;
-                    return false;
-                });
-                if (connectedEndpointsOkay) return [];
-            }
-
-            var placement = isFirst ? 'start' : 'end',
-                messageID = wayType + '.',
-                referenceID = wayType + '.';
-
-            if (wayType === 'waterway') {
-                messageID += 'connected.' + placement;
-                referenceID += 'connected';
-            } else {
-                messageID += placement;
-                referenceID += placement;
-            }
-
-            return [new validationIssue({
-                type: type,
-                subtype: wayType,
-                severity: 'warning',
-                message: function(context) {
-                    var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t.html('issues.impossible_oneway.' + messageID + '.message', {
-                        feature: utilDisplayLabel(entity, context.graph())
-                    }) : '';
-                },
-                reference: getReference(referenceID),
-                entityIds: [way.id, node.id],
-                dynamicFixes: function() {
-
-                    var fixes = [];
-
-                    if (attachedOneways.length) {
-                        fixes.push(new validationIssueFix({
-                            icon: 'rapid-operation-reverse',
-                            title: t.html('issues.fix.reverse_feature.title'),
-                            entityIds: [way.id],
-                            onClick: function(context) {
-                                var id = this.issue.entityIds[0];
-                                context.perform(actionReverse(id), t('operations.reverse.annotation.line', { n: 1 }));
-                            }
-                        }));
-                    }
-                    if (node.tags.noexit !== 'yes') {
-                        var textDirection = localizer.textDirection();
-                        var useLeftContinue = (isFirst && textDirection === 'ltr') ||
-                            (!isFirst && textDirection === 'rtl');
-                        fixes.push(new validationIssueFix({
-                            icon: 'rapid-operation-continue' + (useLeftContinue ? '-left' : ''),
-                            title: t.html('issues.fix.continue_from_' + (isFirst ? 'start' : 'end') + '.title'),
-                            onClick: function(context) {
-                                var entityID = this.issue.entityIds[0];
-                                var vertexID = this.issue.entityIds[1];
-                                var way = context.entity(entityID);
-                                var vertex = context.entity(vertexID);
-                                continueDrawing(way, vertex, context);
-                            }
-                        }));
-                    }
-
-                    return fixes;
-                },
-                loc: node.loc
-            })];
-
-            function getReference(referenceID) {
-                return function showReference(selection) {
-                    selection.selectAll('.issue-reference')
-                        .data([0])
-                        .enter()
-                        .append('div')
-                        .attr('class', 'issue-reference')
-                        .html(t.html('issues.impossible_oneway.' + referenceID + '.reference'));
-                };
-            }
-        }
-    };
+    function issuesForNode(way, nodeID) {
+      const isFirst = nodeID === way.first();
+      const wayType = typeForWay(way);
+
+      // ignore if this way is self-connected at this node
+      if (nodeOccursMoreThanOnce(way, nodeID)) return [];
+
+      const osm = context.services.get('osm');
+      if (!osm) return [];
+
+      const node = graph.hasEntity(nodeID);
+
+      // ignore if this node or its tile are unloaded
+      if (!node || !osm.isDataLoaded(node.loc)) return [];
+
+      if (isConnectedViaOtherTypes(way, node)) return [];
+
+      const attachedWaysOfSameType = graph.parentWays(node).filter(parentWay => {
+        if (parentWay.id === way.id) return false;
+        return typeForWay(parentWay) === wayType;
+      });
+
+      // assume it's okay for waterways to start or end disconnected for now
+      if (wayType === 'waterway' && attachedWaysOfSameType.length === 0) return [];
+
+      // ignore if the way is connected to some non-oneway features
+      const attachedOneways = attachedWaysOfSameType.filter(attachedWay => attachedWay.isOneWay());
+      if (attachedOneways.length < attachedWaysOfSameType.length) return [];
+
+      if (attachedOneways.length) {
+        const connectedEndpointsOkay = attachedOneways.some(attachedOneway => {
+          if ((isFirst ? attachedOneway.first() : attachedOneway.last()) !== nodeID) return true;
+          if (nodeOccursMoreThanOnce(attachedOneway, nodeID)) return true;
+          return false;
+        });
+        if (connectedEndpointsOkay) return [];
+      }
+
+      const placement = isFirst ? 'start' : 'end';
+      let messageID, referenceID;
+      if (wayType === 'waterway') {
+        messageID = `${wayType}.connected.${placement}`;
+        referenceID = `${wayType}.connected`;
+      } else {
+        messageID = `${wayType}.${placement}`;
+        referenceID = `${wayType}.${placement}`;
+      }
+
+      return [new ValidationIssue(context, {
+        type: type,
+        subtype: wayType,
+        severity: 'warning',
+        message: function() {
+          const entity = context.hasEntity(this.entityIds[0]);
+          return entity ? l10n.tHtml(`issues.impossible_oneway.${messageID}.message`, {
+            feature: l10n.displayLabel(entity, context.graph())
+          }) : '';
+        },
+        reference: getReference(referenceID),
+        entityIds: [way.id, node.id],
+        dynamicFixes: function() {
+          let fixes = [];
+          if (attachedOneways.length) {
+            fixes.push(new ValidationFix({
+              icon: 'rapid-operation-reverse',
+              title: l10n.tHtml('issues.fix.reverse_feature.title'),
+              entityIds: [way.id],
+              onClick: function() {
+                const id = this.issue.entityIds[0];
+                context.perform(actionReverse(id), l10n.t('operations.reverse.annotation.line', { n: 1 }));
+              }
+            }));
+          }
+          if (node.tags.noexit !== 'yes') {
+            const isRTL = l10n.isRTL();
+            const useLeftContinue = (isFirst && !isRTL) || (!isFirst && isRTL);
+            fixes.push(new ValidationFix({
+              icon: 'rapid-operation-continue' + (useLeftContinue ? '-left' : ''),
+              title: l10n.tHtml('issues.fix.continue_from_' + (isFirst ? 'start' : 'end') + '.title'),
+              onClick: function() {
+                const entityID = this.issue.entityIds[0];
+                const vertexID = this.issue.entityIds[1];
+                const way = context.entity(entityID);
+                const vertex = context.entity(vertexID);
+                continueDrawing(way, vertex, context);
+              }
+            }));
+          }
+
+          return fixes;
+        },
+        loc: node.loc
+      })];
+
+      function getReference(referenceID) {
+        return function showReference(selection) {
+          selection.selectAll('.issue-reference')
+            .data([0])
+            .enter()
+            .append('div')
+            .attr('class', 'issue-reference')
+            .html(l10n.tHtml(`issues.impossible_oneway.${referenceID}.reference`));
+        };
+      }
+    }
+  };
 
-    function continueDrawing(way, vertex, context) {
-        // make sure the vertex is actually visible and editable
-        var map = context.map();
-        if (!context.editable() || !map.trimmedExtent().contains(new Extent(vertex.loc))) {
-            map.zoomToEase(vertex);
-        }
 
-        context.enter('draw-line', { continueWay: way, continueNode: vertex });
+  function continueDrawing(way, vertex, context) {
+    // make sure the vertex is actually visible and editable
+    let map = context.mapSystem();
+    if (!context.editable() || !map.trimmedExtent().contains(new Extent(vertex.loc))) {
+      map.zoomToEase(vertex);
     }
 
-    validation.type = type;
+    context.enter('draw-line', { continueWay: way, continueNode: vertex });
+  }
+
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/modules/validations/incompatible_source.js b/modules/validations/incompatible_source.js
index 0a3528e965..df1a531808 100644
--- a/modules/validations/incompatible_source.js
+++ b/modules/validations/incompatible_source.js
@@ -1,20 +1,18 @@
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
-export function validationIncompatibleSource() {
+export function validationIncompatibleSource(context) {
   const type = 'incompatible_source';
+  const l10n = context.localizationSystem();
+
   const incompatibleRules = [
     {
       id: 'amap',
       regex: /(amap|autonavi|mapabc|高德)/i
-    },
-    {
+    }, {
       id: 'baidu',
       regex: /(baidu|mapbar|百度)/i
-    },
-    {
+    }, {
       id: 'google',
       regex: /google/i,
       exceptRegex: /((books|drive)\.google|google\s?(books|drive|plus))|(esri\/Google_Africa_Buildings)/i
@@ -38,13 +36,13 @@ export function validationIncompatibleSource() {
 
         if (!matchRule) return null;
 
-        return new validationIssue({
+        return new ValidationIssue(context, {
           type: type,
           severity: 'warning',
-          message: (context) => {
+          message: () => {
             const entity = context.hasEntity(entityID);
-            return entity ? t.html('issues.incompatible_source.feature.message', {
-              feature: utilDisplayLabel(entity, context.graph(), true /* verbose */),
+            return entity ? l10n.tHtml('issues.incompatible_source.feature.message', {
+              feature: l10n.displayLabel(entity, context.graph(), true /* verbose */),
               value: source
             }) : '';
           },
@@ -53,7 +51,7 @@ export function validationIncompatibleSource() {
           hash: source,
           dynamicFixes: () => {
             return [
-              new validationIssueFix({ title: t.html('issues.fix.remove_proprietary_data.title') })
+              new ValidationFix({ title: l10n.tHtml('issues.fix.remove_proprietary_data.title') })
             ];
           }
         });
@@ -68,7 +66,7 @@ export function validationIncompatibleSource() {
             .enter()
             .append('div')
             .attr('class', 'issue-reference')
-            .html(t.html(`issues.incompatible_source.reference.${id}`));
+            .html(l10n.tHtml(`issues.incompatible_source.reference.${id}`));
         };
       }
     };
diff --git a/modules/validations/index.js b/modules/validations/index.js
index 6bc2612c0a..ae85b035e4 100644
--- a/modules/validations/index.js
+++ b/modules/validations/index.js
@@ -7,7 +7,6 @@ export { validationFormatting } from './invalid_format';
 export { validationHelpRequest } from './help_request';
 export { validationImpossibleOneway } from './impossible_oneway';
 export { validationIncompatibleSource } from './incompatible_source';
-export { validationMaprules } from './maprules';
 export { validationMismatchedGeometry } from './mismatched_geometry';
 export { validationMissingRole } from './missing_role';
 export { validationMissingTag } from './missing_tag';
diff --git a/modules/validations/invalid_format.js b/modules/validations/invalid_format.js
index a2da5abc95..2478af100b 100644
--- a/modules/validations/invalid_format.js
+++ b/modules/validations/invalid_format.js
@@ -1,100 +1,103 @@
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue } from '../core/validation';
+import { ValidationIssue } from '../core/lib';
 
-export function validationFormatting() {
-    var type = 'invalid_format';
 
-    var validation = function(entity) {
-        var issues = [];
+export function validationFormatting(context) {
+  const type = 'invalid_format';
+  const l10n = context.localizationSystem();
 
-        function isValidEmail(email) {
-            // Emails in OSM are going to be official so they should be pretty simple
-            // Using negated lists to better support all possible unicode characters (#6494)
-            var valid_email = /^[^\(\)\\,":;<>@\[\]]+@[^\(\)\\,":;<>@\[\]\.]+(?:\.[a-z0-9-]+)*$/i;
 
-            // An empty value is also acceptable
-            return (!email || valid_email.test(email));
-        }
-        /*
-        function isSchemePresent(url) {
-            var valid_scheme = /^https?:\/\//i;
-            return (!url || valid_scheme.test(url));
-        }
-        */
-        function showReferenceEmail(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.invalid_format.email.reference'));
-        }
-        /*
-        function showReferenceWebsite(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.invalid_format.website.reference'));
-        }
+  let validation = function(entity) {
+    let issues = [];
 
-        if (entity.tags.website) {
-            // Multiple websites are possible
-            // If ever we support ES6, arrow functions make this nicer
-            var websites = entity.tags.website
-                .split(';')
-                .map(function(s) { return s.trim(); })
-                .filter(function(x) { return !isSchemePresent(x); });
+    function isValidEmail(email) {
+      // Emails in OSM are going to be official so they should be pretty simple
+      // Using negated lists to better support all possible unicode characters - iD#6494
+      const validEmail = /^[^\(\)\\,":;<>@\[\]]+@[^\(\)\\,":;<>@\[\]\.]+(?:\.[a-z0-9-]+)*$/i;
+      // An empty value is also acceptable
+      return (!email || validEmail.test(email));
+    }
 
-            if (websites.length) {
-                issues.push(new validationIssue({
-                    type: type,
-                    subtype: 'website',
-                    severity: 'warning',
-                    message: function(context) {
-                        var entity = context.hasEntity(this.entityIds[0]);
-                        return entity ? t.html('issues.invalid_format.website.message' + this.data,
-                            { feature: utilDisplayLabel(entity, context.graph()), site: websites.join(', ') }) : '';
-                    },
-                    reference: showReferenceWebsite,
-                    entityIds: [entity.id],
-                    hash: websites.join(),
-                    data: (websites.length > 1) ? '_multi' : ''
-                }));
-            }
-        }
-        */
-        if (entity.tags.email) {
-            // Multiple emails are possible
-            var emails = entity.tags.email
-                .split(';')
-                .map(function(s) { return s.trim(); })
-                .filter(function(x) { return !isValidEmail(x); });
+    /*
+    function isSchemePresent(url) {
+      let valid_scheme = /^https?:\/\//i;
+      return (!url || valid_scheme.test(url));
+    }
+    */
 
-            if (emails.length) {
-                issues.push(new validationIssue({
-                    type: type,
-                    subtype: 'email',
-                    severity: 'warning',
-                    message: function(context) {
-                        var entity = context.hasEntity(this.entityIds[0]);
-                        return entity ? t.html('issues.invalid_format.email.message' + this.data,
-                            { feature: utilDisplayLabel(entity, context.graph()), email: emails.join(', ') }) : '';
-                    },
-                    reference: showReferenceEmail,
-                    entityIds: [entity.id],
-                    hash: emails.join(),
-                    data: (emails.length > 1) ? '_multi' : ''
-                }));
-            }
-        }
+    function showReferenceEmail(selection) {
+      selection.selectAll('.issue-reference')
+        .data([0])
+        .enter()
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml('issues.invalid_format.email.reference'));
+    }
 
-        return issues;
-    };
+    /*
+    function showReferenceWebsite(selection) {
+      selection.selectAll('.issue-reference')
+        .data([0])
+        .enter()
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml('issues.invalid_format.website.reference'));
+    }
 
-    validation.type = type;
+    if (entity.tags.website) {
+      // Multiple websites are possible
+      const websites = entity.tags.website
+        .split(';')
+        .map(s => s.trim())
+        .filter(s => !isSchemePresent(s));
 
-    return validation;
+      if (websites.length) {
+        issues.push(new ValidationIssue(context, {
+          type: type,
+          subtype: 'website',
+          severity: 'warning',
+          message: function() {
+            const entity = context.hasEntity(this.entityIds[0]);
+            return entity ? l10n.tHtml('issues.invalid_format.website.message' + this.data,
+              { feature: l10n.displayLabel(entity, context.graph()), site: websites.join(', ') }) : '';
+          },
+          reference: showReferenceWebsite,
+          entityIds: [entity.id],
+          hash: websites.join(),
+          data: (websites.length > 1) ? '_multi' : ''
+        }));
+      }
+    }
+    */
+
+    if (entity.tags.email) {
+      // Multiple emails are possible
+      const emails = entity.tags.email
+        .split(';')
+        .map(s => s.trim())
+        .filter(s => !isValidEmail(s));
+
+      if (emails.length) {
+        issues.push(new ValidationIssue(context, {
+          type: type,
+          subtype: 'email',
+          severity: 'warning',
+          message: function() {
+            const entity = context.hasEntity(this.entityIds[0]);
+            return entity ? l10n.tHtml('issues.invalid_format.email.message' + this.data,
+                { feature: l10n.displayLabel(entity, context.graph()), email: emails.join(', ') }) : '';
+          },
+          reference: showReferenceEmail,
+          entityIds: [entity.id],
+          hash: emails.join(),
+          data: (emails.length > 1) ? '_multi' : ''
+        }));
+      }
+    }
+
+    return issues;
+  };
+
+  validation.type = type;
+
+  return validation;
 }
diff --git a/modules/validations/maprules.js b/modules/validations/maprules.js
deleted file mode 100644
index 08477727fd..0000000000
--- a/modules/validations/maprules.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { services } from '../services';
-
-
-export function validationMaprules() {
-    var type = 'maprules';
-
-    var validation = function checkMaprules(entity, graph) {
-        if (!services.maprules) return [];
-
-        var rules = services.maprules.validationRules();
-        var issues = [];
-
-        for (var i = 0; i < rules.length; i++) {
-            var rule = rules[i];
-            rule.findIssues(entity, graph, issues);
-        }
-
-        return issues;
-    };
-
-
-    validation.type = type;
-
-    return validation;
-}
diff --git a/modules/validations/mismatched_geometry.js b/modules/validations/mismatched_geometry.js
index 84119eed20..a26b7bab0f 100644
--- a/modules/validations/mismatched_geometry.js
+++ b/modules/validations/mismatched_geometry.js
@@ -6,18 +6,16 @@ import { actionAddVertex } from '../actions/add_vertex';
 import { actionChangeTags } from '../actions/change_tags';
 import { actionMergeNodes } from '../actions/merge_nodes';
 import { actionExtract } from '../actions/extract';
-import { modeSelect } from '../modes/select';
 import { osmJoinWays } from '../osm/multipolygon';
 import { osmNodeGeometriesForTags, osmTagSuggestingArea } from '../osm/tags';
-import { presetManager } from '../presets';
 import { geoHasSelfIntersections } from '../geo';
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
-export function validationMismatchedGeometry() {
-    var type = 'mismatched_geometry';
+export function validationMismatchedGeometry(context) {
+    const type = 'mismatched_geometry';
+    const l10n = context.localizationSystem();
+    const presetSystem = context.presetSystem();
 
     function tagSuggestingLineIsArea(entity) {
         if (entity.type !== 'way' || entity.isClosed()) return null;
@@ -27,8 +25,8 @@ export function validationMismatchedGeometry() {
             return null;
         }
 
-        var asLine = presetManager.matchTags(tagSuggestingArea, 'line');
-        var asArea = presetManager.matchTags(tagSuggestingArea, 'area');
+        var asLine = presetSystem.matchTags(tagSuggestingArea, 'line');
+        var asArea = presetSystem.matchTags(tagSuggestingArea, 'area');
         if (asLine && asArea && (asLine === asArea)) {
             // these tags also allow lines and making this an area wouldn't matter
             return null;
@@ -52,11 +50,11 @@ export function validationMismatchedGeometry() {
             testNodes.push(testNodes[0]);
             // make sure this will not create a self-intersection
             if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) {
-                return function(context) {
+                return function() {
                     var way = context.entity(this.issue.entityIds[0]);
                     context.perform(
                         actionMergeNodes([way.nodes[0], way.nodes[way.nodes.length-1]], nodes[0].loc),
-                        t('issues.fix.connect_endpoints.annotation')
+                        l10n.t('issues.fix.connect_endpoints.annotation')
                     );
                 };
             }
@@ -67,54 +65,51 @@ export function validationMismatchedGeometry() {
         testNodes.push(testNodes[0]);
         // make sure this will not create a self-intersection
         if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) {
-            return function(context) {
+            return function() {
                 var wayId = this.issue.entityIds[0];
                 var way = context.entity(wayId);
                 var nodeId = way.nodes[0];
                 var index = way.nodes.length;
                 context.perform(
                     actionAddVertex(wayId, nodeId, index),
-                    t('issues.fix.connect_endpoints.annotation')
+                    l10n.t('issues.fix.connect_endpoints.annotation')
                 );
             };
         }
     }
 
     function lineTaggedAsAreaIssue(entity) {
-
         var tagSuggestingArea = tagSuggestingLineIsArea(entity);
         if (!tagSuggestingArea) return null;
 
-        return new validationIssue({
+        return new ValidationIssue(context, {
             type: type,
             subtype: 'area_as_line',
             severity: 'warning',
-            message: function(context) {
+            message: function() {
                 var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t.html('issues.tag_suggests_area.message', {
-                    feature: utilDisplayLabel(entity, 'area', true /* verbose */),
+                return entity ? l10n.tHtml('issues.tag_suggests_area.message', {
+                    feature: l10n.displayLabel(entity, 'area', true /* verbose */),
                     tag: utilTagText({ tags: tagSuggestingArea })
                 }) : '';
             },
             reference: showReference,
             entityIds: [entity.id],
             hash: JSON.stringify(tagSuggestingArea),
-            dynamicFixes: function(context) {
-
+            dynamicFixes: function() {
                 var fixes = [];
-
                 var entity = context.entity(this.entityIds[0]);
                 var connectEndsOnClick = makeConnectEndpointsFixOnClick(entity, context.graph());
 
-                fixes.push(new validationIssueFix({
-                    title: t.html('issues.fix.connect_endpoints.title'),
+                fixes.push(new ValidationFix({
+                    title: l10n.tHtml('issues.fix.connect_endpoints.title'),
                     onClick: connectEndsOnClick
                 }));
 
-                fixes.push(new validationIssueFix({
+                fixes.push(new ValidationFix({
                     icon: 'rapid-operation-delete',
-                    title: t.html('issues.fix.remove_tag.title'),
-                    onClick: function(context) {
+                    title: l10n.tHtml('issues.fix.remove_tag.title'),
+                    onClick: function() {
                         var entityId = this.issue.entityIds[0];
                         var entity = context.entity(entityId);
                         var tags = Object.assign({}, entity.tags);  // shallow copy
@@ -123,7 +118,7 @@ export function validationMismatchedGeometry() {
                         }
                         context.perform(
                             actionChangeTags(entityId, tags),
-                            t('issues.fix.remove_tag.annotation')
+                            l10n.t('issues.fix.remove_tag.annotation')
                         );
                     }
                 }));
@@ -139,7 +134,7 @@ export function validationMismatchedGeometry() {
                 .enter()
                 .append('div')
                 .attr('class', 'issue-reference')
-                .html(t.html('issues.tag_suggests_area.reference'));
+                .html(l10n.tHtml('issues.tag_suggests_area.reference'));
         }
     }
 
@@ -158,14 +153,14 @@ export function validationMismatchedGeometry() {
 
         if (geometry === 'point' && !allowedGeometries.point && allowedGeometries.vertex) {
 
-            return new validationIssue({
+            return new ValidationIssue(context, {
                 type: type,
                 subtype: 'vertex_as_point',
                 severity: 'warning',
-                message: function(context) {
+                message: function() {
                     var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t.html('issues.vertex_as_point.message', {
-                        feature: utilDisplayLabel(entity, 'vertex', true /* verbose */)
+                    return entity ? l10n.tHtml('issues.vertex_as_point.message', {
+                        feature: l10n.displayLabel(entity, 'vertex', true /* verbose */)
                     }) : '';
                 },
                 reference: function showReference(selection) {
@@ -174,21 +169,21 @@ export function validationMismatchedGeometry() {
                         .enter()
                         .append('div')
                         .attr('class', 'issue-reference')
-                        .html(t.html('issues.vertex_as_point.reference'));
+                        .html(l10n.tHtml('issues.vertex_as_point.reference'));
                 },
                 entityIds: [entity.id]
             });
 
         } else if (geometry === 'vertex' && !allowedGeometries.vertex && allowedGeometries.point) {
 
-            return new validationIssue({
+            return new ValidationIssue(context, {
                 type: type,
                 subtype: 'point_as_vertex',
                 severity: 'warning',
-                message: function(context) {
+                message: function() {
                     var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t.html('issues.point_as_vertex.message', {
-                        feature: utilDisplayLabel(entity, 'point', true /* verbose */)
+                    return entity ? l10n.tHtml('issues.point_as_vertex.message', {
+                        feature: l10n.displayLabel(entity, 'point', true /* verbose */)
                     }) : '';
                 },
                 reference: function showReference(selection) {
@@ -197,7 +192,7 @@ export function validationMismatchedGeometry() {
                         .enter()
                         .append('div')
                         .attr('class', 'issue-reference')
-                        .html(t.html('issues.point_as_vertex.reference'));
+                        .html(l10n.tHtml('issues.point_as_vertex.reference'));
                 },
                 entityIds: [entity.id],
                 dynamicFixes: extractPointDynamicFixes
@@ -223,10 +218,10 @@ export function validationMismatchedGeometry() {
 
         if (sourceGeom === 'area') targetGeoms.unshift('line');
 
-        var asSource = presetManager.match(entity, graph);
+        var asSource = presetSystem.match(entity, graph);
 
         var targetGeom = targetGeoms.find(nodeGeom => {
-            var asTarget = presetManager.matchTags(entity.tags, nodeGeom);
+            var asTarget = presetSystem.matchTags(entity.tags, nodeGeom);
             if (!asSource || !asTarget ||
                 asSource === asTarget ||
                 // sometimes there are two presets with the same tags for different geometries
@@ -261,14 +256,14 @@ export function validationMismatchedGeometry() {
             dynamicFixes = lineToAreaDynamicFixes;
         }
 
-        return new validationIssue({
+        return new ValidationIssue(context, {
             type: type,
             subtype: subtype,
             severity: 'warning',
-            message: function(context) {
+            message: function() {
                 var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t.html('issues.' + referenceId + '.message', {
-                    feature: utilDisplayLabel(entity, targetGeom, true /* verbose */)
+                return entity ? l10n.tHtml('issues.' + referenceId + '.message', {
+                    feature: l10n.displayLabel(entity, targetGeom, true /* verbose */)
                 }) : '';
             },
             reference: function showReference(selection) {
@@ -277,24 +272,22 @@ export function validationMismatchedGeometry() {
                     .enter()
                     .append('div')
                     .attr('class', 'issue-reference')
-                    .html(t.html('issues.mismatched_geometry.reference'));
+                    .html(l10n.tHtml('issues.mismatched_geometry.reference'));
             },
             entityIds: [entity.id],
             dynamicFixes: dynamicFixes
         });
     }
 
-    function lineToAreaDynamicFixes(context) {
-
+    function lineToAreaDynamicFixes() {
         var convertOnClick;
-
         var entityId = this.entityIds[0];
         var entity = context.entity(entityId);
         var tags = Object.assign({}, entity.tags);  // shallow copy
         delete tags.area;
         if (!osmTagSuggestingArea(tags)) {
             // if removing the area tag would make this a line, offer that as a quick fix
-            convertOnClick = function(context) {
+            convertOnClick = function() {
                 var entityId = this.issue.entityIds[0];
                 var entity = context.entity(entityId);
                 var tags = Object.assign({}, entity.tags);  // shallow copy
@@ -303,50 +296,47 @@ export function validationMismatchedGeometry() {
                 }
                 context.perform(
                     actionChangeTags(entityId, tags),
-                    t('issues.fix.convert_to_line.annotation')
+                    l10n.t('issues.fix.convert_to_line.annotation')
                 );
             };
         }
 
         return [
-            new validationIssueFix({
+            new ValidationFix({
                 icon: 'rapid-icon-line',
-                title: t.html('issues.fix.convert_to_line.title'),
+                title: l10n.tHtml('issues.fix.convert_to_line.title'),
                 onClick: convertOnClick
             })
         ];
     }
 
-    function extractPointDynamicFixes(context) {
-
+    function extractPointDynamicFixes() {
         var entityId = this.entityIds[0];
-
         var extractOnClick = null;
-        if (!context.hasHiddenConnections(entityId)) {
 
-            extractOnClick = function(context) {
+        if (!context.hasHiddenConnections(entityId)) {
+            extractOnClick = function() {
                 var entityId = this.issue.entityIds[0];
                 var action = actionExtract(entityId, context.projection);
                 context.perform(
                     action,
-                    t('operations.extract.annotation', { n: 1 })
+                    l10n.t('operations.extract.annotation', { n: 1 })
                 );
                 // re-enter mode to trigger updates
-                context.enter(modeSelect(context, [action.getExtractedNodeID()]));
+                context.enter('select-osm', { selectedIDs: [ action.getExtractedNodeID() ] });
             };
         }
 
         return [
-            new validationIssueFix({
+            new ValidationFix({
                 icon: 'rapid-operation-extract',
-                title: t.html('issues.fix.extract_point.title'),
+                title: l10n.tHtml('issues.fix.extract_point.title'),
                 onClick: extractOnClick
             })
         ];
     }
 
     function unclosedMultipolygonPartIssues(entity, graph) {
-
         if (entity.type !== 'relation' ||
             !entity.isMultipolygon() ||
             entity.isDegenerate() ||
@@ -354,7 +344,6 @@ export function validationMismatchedGeometry() {
             !entity.isComplete(graph)) return [];
 
         var sequences = osmJoinWays(entity.members, graph);
-
         var issues = [];
 
         for (var i in sequences) {
@@ -368,14 +357,14 @@ export function validationMismatchedGeometry() {
             // part is closed if the first and last nodes are the same
             if (firstNode === lastNode) continue;
 
-            var issue = new validationIssue({
+            var issue = new ValidationIssue(context, {
                 type: type,
                 subtype: 'unclosed_multipolygon_part',
                 severity: 'warning',
-                message: function(context) {
+                message: function() {
                     var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t.html('issues.unclosed_multipolygon_part.message', {
-                        feature: utilDisplayLabel(entity, context.graph(), true /* verbose */)
+                    return entity ? l10n.tHtml('issues.unclosed_multipolygon_part.message', {
+                        feature: l10n.displayLabel(entity, context.graph(), true /* verbose */)
                     }) : '';
                 },
                 reference: showReference,
@@ -396,7 +385,7 @@ export function validationMismatchedGeometry() {
                 .enter()
                 .append('div')
                 .attr('class', 'issue-reference')
-                .html(t.html('issues.unclosed_multipolygon_part.reference'));
+                .html(l10n.tHtml('issues.unclosed_multipolygon_part.reference'));
         }
     }
 
diff --git a/modules/validations/missing_role.js b/modules/validations/missing_role.js
index 00340ff3b8..a6fdc037ff 100644
--- a/modules/validations/missing_role.js
+++ b/modules/validations/missing_role.js
@@ -1,109 +1,105 @@
 import { actionChangeMember } from '../actions/change_member';
 import { actionDeleteMember } from '../actions/delete_member';
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
-
-
-export function validationMissingRole() {
-    var type = 'missing_role';
-
-    var validation = function checkMissingRole(entity, graph) {
-        var issues = [];
-        if (entity.type === 'way') {
-            graph.parentRelations(entity).forEach(function(relation) {
-                if (!relation.isMultipolygon()) return;
-
-                var member = relation.memberById(entity.id);
-                if (member && isMissingRole(member)) {
-                    issues.push(makeIssue(entity, relation, member));
-                }
-            });
-        } else if (entity.type === 'relation' && entity.isMultipolygon()) {
-            entity.indexedMembers().forEach(function(member) {
-                var way = graph.hasEntity(member.id);
-                if (way && isMissingRole(member)) {
-                    issues.push(makeIssue(way, entity, member));
-                }
-            });
-        }
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
-        return issues;
-    };
 
+export function validationMissingRole(context) {
+  const type = 'missing_role';
+  const l10n = context.localizationSystem();
 
-    function isMissingRole(member) {
-        return !member.role || !member.role.trim().length;
-    }
 
+  let validation = function checkMissingRole(entity, graph) {
+    let issues = [];
 
-    function makeIssue(way, relation, member) {
-        return new validationIssue({
-            type: type,
-            severity: 'warning',
-            message: function(context) {
-                var member = context.hasEntity(this.entityIds[1]),
-                    relation = context.hasEntity(this.entityIds[0]);
-                return (member && relation) ? t.html('issues.missing_role.message', {
-                    member: utilDisplayLabel(member, context.graph()),
-                    relation: utilDisplayLabel(relation, context.graph())
-                }) : '';
-            },
-            reference: showReference,
-            entityIds: [relation.id, way.id],
-            data: {
-                member: member
-            },
-            hash: member.index.toString(),
-            dynamicFixes: function() {
-                return [
-                    makeAddRoleFix('inner'),
-                    makeAddRoleFix('outer'),
-                    new validationIssueFix({
-                        icon: 'rapid-operation-delete',
-                        title: t.html('issues.fix.remove_from_relation.title'),
-                        onClick: function(context) {
-                            context.perform(
-                                actionDeleteMember(this.issue.entityIds[0], this.issue.data.member.index),
-                                t('operations.delete_member.annotation', {
-                                    n: 1
-                                })
-                            );
-                        }
-                    })
-                ];
-            }
-        });
+    if (entity.type === 'way') {
+      for (const relation of graph.parentRelations(entity)) {
+        if (!relation.isMultipolygon()) continue;
 
+        const member = relation.memberById(entity.id);
+        if (member && isMissingRole(member)) {
+          issues.push(makeIssue(entity, relation, member));
+        }
+      }
 
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.missing_role.multipolygon.reference'));
+    } else if (entity.type === 'relation' && entity.isMultipolygon()) {
+      for (const member of entity.indexedMembers()) {
+        const way = graph.hasEntity(member.id);
+        if (way && isMissingRole(member)) {
+          issues.push(makeIssue(way, entity, member));
         }
+      }
     }
 
+    return issues;
+  };
+
+
+  function isMissingRole(member) {
+    return !member.role || !member.role.trim().length;
+  }
 
-    function makeAddRoleFix(role) {
-        return new validationIssueFix({
-            title: t.html('issues.fix.set_as_' + role + '.title'),
-            onClick: function(context) {
-                var oldMember = this.issue.data.member;
-                var member = { id: this.issue.entityIds[1], type: oldMember.type, role: role };
-                context.perform(
-                    actionChangeMember(this.issue.entityIds[0], member, oldMember.index),
-                    t('operations.change_role.annotation', {
-                        n: 1
-                    })
-                );
+
+  function makeIssue(way, relation, member) {
+    return new ValidationIssue(context, {
+      type: type,
+      severity: 'warning',
+      message: function() {
+        const member = context.hasEntity(this.entityIds[1]);
+        const relation = context.hasEntity(this.entityIds[0]);
+        return (member && relation) ? l10n.tHtml('issues.missing_role.message', {
+          member: l10n.displayLabel(member, context.graph()),
+          relation: l10n.displayLabel(relation, context.graph())
+        }) : '';
+      },
+      reference: showReference,
+      entityIds: [relation.id, way.id],
+      data:  { member: member },
+      hash: member.index.toString(),
+      dynamicFixes: function() {
+        return [
+          makeAddRoleFix('inner'),
+          makeAddRoleFix('outer'),
+          new ValidationFix({
+            icon: 'rapid-operation-delete',
+            title: l10n.tHtml('issues.fix.remove_from_relation.title'),
+            onClick: () => {
+              context.perform(
+                actionDeleteMember(this.issue.entityIds[0], this.issue.data.member.index),
+                l10n.t('operations.delete_member.annotation', { n: 1 })
+              );
             }
-        });
+          })
+        ];
+      }
+    });
+
+
+    function showReference(selection) {
+      selection.selectAll('.issue-reference')
+        .data([0])
+        .enter()
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml('issues.missing_role.multipolygon.reference'));
     }
+  }
+
+
+  function makeAddRoleFix(role) {
+    return new ValidationFix({
+      title: l10n.tHtml(`issues.fix.set_as_${role}.title`),
+      onClick: () => {
+        const oldMember = this.issue.data.member;
+        const member = { id: this.issue.entityIds[1], type: oldMember.type, role: role };
+        context.perform(
+          actionChangeMember(this.issue.entityIds[0], member, oldMember.index),
+          l10n.t('operations.change_role.annotation', { n: 1 })
+        );
+      }
+    });
+  }
 
-    validation.type = type;
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/modules/validations/missing_tag.js b/modules/validations/missing_tag.js
index 033802b746..593617a5c4 100644
--- a/modules/validations/missing_tag.js
+++ b/modules/validations/missing_tag.js
@@ -1,149 +1,139 @@
 import { operationDelete } from '../operations/delete';
 import { osmIsInterestingTag } from '../osm/tags';
 import { osmOldMultipolygonOuterMemberOfRelation } from '../osm/multipolygon';
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
 export function validationMissingTag(context) {
-    var type = 'missing_tag';
-
-    function hasDescriptiveTags(entity, graph) {
-        var onlyAttributeKeys = ['description', 'name', 'note', 'start_date'];
-        var entityDescriptiveKeys = Object.keys(entity.tags)
-            .filter(function(k) {
-                if (k === 'area' || !osmIsInterestingTag(k)) return false;
-
-                return !onlyAttributeKeys.some(function(attributeKey) {
-                    return k === attributeKey || k.indexOf(attributeKey + ':') === 0;
-                });
-            });
-
-        if (entity.type === 'relation' &&
-            entityDescriptiveKeys.length === 1 &&
-            entity.tags.type === 'multipolygon') {
-            // this relation's only interesting tag just says its a multipolygon,
-            // which is not descriptive enough
-
-            // It's okay for a simple multipolygon to have no descriptive tags
-            // if its outer way has them (old model, see `outdated_tags.js`)
-            return osmOldMultipolygonOuterMemberOfRelation(entity, graph);
-        }
-
-        return entityDescriptiveKeys.length > 0;
+  const type = 'missing_tag';
+  const l10n = context.localizationSystem();
+
+
+  function hasDescriptiveTags(entity, graph) {
+    const onlyAttributeKeys = ['description', 'name', 'note', 'start_date'];
+    const entityDescriptiveKeys = Object.keys(entity.tags).filter(k => {
+      if (k === 'area' || !osmIsInterestingTag(k)) return false;
+      return !onlyAttributeKeys.some(attributeKey => {
+        return k === attributeKey || k.indexOf(attributeKey + ':') === 0;
+      });
+    });
+
+    if (entity.type === 'relation' && entityDescriptiveKeys.length === 1 && entity.tags.type === 'multipolygon') {
+      // this relation's only interesting tag just says its a multipolygon, which is not descriptive enough
+      // It's okay for a simple multipolygon to have no descriptive tags
+      // if its outer way has them (old model, see `outdated_tags.js`)
+      return osmOldMultipolygonOuterMemberOfRelation(entity, graph);
     }
 
-    function isUnknownRoad(entity) {
-        return entity.type === 'way' && entity.tags.highway === 'road';
-    }
+    return entityDescriptiveKeys.length > 0;
+  }
 
-    function isUntypedRelation(entity) {
-        return entity.type === 'relation' && !entity.tags.type;
-    }
 
-    var validation = function checkMissingTag(entity, graph) {
+  function isUnknownRoad(entity) {
+    return entity.type === 'way' && entity.tags.highway === 'road';
+  }
 
-        var subtype;
+  function isUntypedRelation(entity) {
+    return entity.type === 'relation' && !entity.tags.type;
+  }
 
-        var osm = context.connection();
-        var isUnloadedNode = entity.type === 'node' && osm && !osm.isDataLoaded(entity.loc);
 
-        // we can't know if the node is a vertex if the tile is undownloaded
-        if (!isUnloadedNode &&
-            // allow untagged nodes that are part of ways
-            entity.geometry(graph) !== 'vertex' &&
-            // allow untagged entities that are part of relations
-            !entity.hasParentRelations(graph)) {
+  let validation = function checkMissingTag(entity, graph) {
+    const osm = context.services.get('osm');
+    const isUnloadedNode = (entity.type === 'node') && osm && !osm.isDataLoaded(entity.loc);
+    let subtype;
 
-            if (Object.keys(entity.tags).length === 0) {
-                subtype = 'any';
-            } else if (!hasDescriptiveTags(entity, graph)) {
-                subtype = 'descriptive';
-            } else if (isUntypedRelation(entity)) {
-                subtype = 'relation_type';
-            }
-        }
+    // we can't know if the node is a vertex if the tile is undownloaded
+    if (!isUnloadedNode &&
+      // allow untagged nodes that are part of ways
+      entity.geometry(graph) !== 'vertex' &&
+      // allow untagged entities that are part of relations
+      !entity.hasParentRelations(graph)) {
 
-        // flag an unknown road even if it's a member of a relation
-        if (!subtype && isUnknownRoad(entity)) {
-            subtype = 'highway_classification';
-        }
+      if (Object.keys(entity.tags).length === 0) {
+        subtype = 'any';
+      } else if (!hasDescriptiveTags(entity, graph)) {
+        subtype = 'descriptive';
+      } else if (isUntypedRelation(entity)) {
+        subtype = 'relation_type';
+      }
+    }
 
-        if (!subtype) return [];
-
-        var messageID = subtype === 'highway_classification' ? 'unknown_road' : 'missing_tag.' + subtype;
-        var referenceID = subtype === 'highway_classification' ? 'unknown_road' : 'missing_tag';
-
-        // can always delete if the user created it in the first place..
-        var canDelete = (entity.version === undefined || entity.v !== undefined);
-        var severity = (canDelete && subtype !== 'highway_classification') ? 'error' : 'warning';
-
-        return [new validationIssue({
-            type: type,
-            subtype: subtype,
-            severity: severity,
-            message: function(context) {
-                var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t.html('issues.' + messageID + '.message', {
-                    feature: utilDisplayLabel(entity, context.graph())
-                }) : '';
-            },
-            reference: showReference,
-            entityIds: [entity.id],
-            dynamicFixes: function(context) {
-
-                var fixes = [];
-
-                var selectFixType = subtype === 'highway_classification' ? 'select_road_type' : 'select_preset';
-
-                fixes.push(new validationIssueFix({
-                    icon: 'rapid-icon-search',
-                    title: t.html('issues.fix.' + selectFixType + '.title'),
-                    onClick: function(context) {
-                        context.ui().sidebar.showPresetList();
-                    }
-                }));
-
-                var deleteOnClick;
-
-                var id = this.entityIds[0];
-                var operation = operationDelete(context, [id]);
-                var disabledReasonID = operation.disabled();
-                if (!disabledReasonID) {
-                    deleteOnClick = function(context) {
-                        var id = this.issue.entityIds[0];
-                        var operation = operationDelete(context, [id]);
-                        if (!operation.disabled()) {
-                            operation();
-                        }
-                    };
-                }
-
-                fixes.push(
-                    new validationIssueFix({
-                        icon: 'rapid-operation-delete',
-                        title: t.html('issues.fix.delete_feature.title'),
-                        disabledReason: disabledReasonID ? t('operations.delete.' + disabledReasonID + '.single') : undefined,
-                        onClick: deleteOnClick
-                    })
-                );
-
-                return fixes;
+    // flag an unknown road even if it's a member of a relation
+    if (!subtype && isUnknownRoad(entity)) {
+      subtype = 'highway_classification';
+    }
+
+    if (!subtype) return [];
+
+    let messageID = subtype === 'highway_classification' ? 'unknown_road' : `missing_tag.${subtype}`;
+    let referenceID = subtype === 'highway_classification' ? 'unknown_road' : 'missing_tag';
+
+    // can always delete if the user created it in the first place..
+    let canDelete = (entity.version === undefined || entity.v !== undefined);
+    let severity = (canDelete && subtype !== 'highway_classification') ? 'error' : 'warning';
+
+    return [new ValidationIssue(context, {
+        type: type,
+        subtype: subtype,
+        severity: severity,
+        message: function() {
+          const entity = context.hasEntity(this.entityIds[0]);
+          return entity ? l10n.tHtml(`issues.${messageID}.message`, {
+            feature: l10n.displayLabel(entity, context.graph())
+          }) : '';
+        },
+        reference: showReference,
+        entityIds: [entity.id],
+        dynamicFixes: function() {
+          let fixes = [];
+          const selectFixType = subtype === 'highway_classification' ? 'select_road_type' : 'select_preset';
+          fixes.push(new ValidationFix({
+            icon: 'rapid-icon-search',
+            title: l10n.tHtml(`issues.fix.${selectFixType}.title`),
+            onClick: function() {
+              context.ui().sidebar.showPresetList();
             }
-        })];
-
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.' + referenceID + '.reference'));
+          }));
+
+          const id = this.entityIds[0];
+          const operation = operationDelete(context, [id]);
+          const disabledReasonID = operation.disabled();
+          let deleteOnClick;
+          if (!disabledReasonID) {
+            deleteOnClick = function() {
+              const id = this.issue.entityIds[0];
+              const operation = operationDelete(context, [id]);
+              if (!operation.disabled()) {
+                operation();
+              }
+            };
+          }
+
+          fixes.push(
+            new ValidationFix({
+              icon: 'rapid-operation-delete',
+              title: l10n.tHtml('issues.fix.delete_feature.title'),
+              disabledReason: disabledReasonID ? l10n.t(`operations.delete.${disabledReasonID}.single`) : undefined,
+              onClick: deleteOnClick
+            })
+          );
+
+          return fixes;
         }
-    };
+    })];
+
+    function showReference(selection) {
+      selection.selectAll('.issue-reference')
+        .data([0])
+        .enter()
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml(`issues.${referenceID}.reference`));
+    }
+  };
 
-    validation.type = type;
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/modules/validations/outdated_tags.js b/modules/validations/outdated_tags.js
index da2e791951..9f13d98363 100644
--- a/modules/validations/outdated_tags.js
+++ b/modules/validations/outdated_tags.js
@@ -1,24 +1,22 @@
 import { utilHashcode, utilTagDiff } from '@rapid-sdk/util';
 
-import { t } from '../core/localizer';
 import { actionChangePreset } from '../actions/change_preset';
 import { actionChangeTags } from '../actions/change_tags';
 import { actionUpgradeTags } from '../actions/upgrade_tags';
-import { fileFetcher } from '../core';
-import { presetManager } from '../presets';
-import { services } from '../services';
 import { osmIsOldMultipolygonOuterMember, osmOldMultipolygonOuterMemberOfRelation } from '../osm/multipolygon';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
-export function validationOutdatedTags() {
+export function validationOutdatedTags(context) {
   const type = 'outdated_tags';
+  const l10n = context.localizationSystem();
+  const presetSystem = context.presetSystem();
   let _waitingForDeprecated = true;
   let _dataDeprecated;
 
   // fetch deprecated tags
-  fileFetcher.get('deprecated')
+  const dataLoaderSystem = context.dataLoaderSystem();
+  dataLoaderSystem.get('deprecated')
     .then(d => _dataDeprecated = d)
     .catch(() => { /* ignore */ })
     .finally(() => _waitingForDeprecated = false);
@@ -27,7 +25,7 @@ export function validationOutdatedTags() {
   function oldTagIssues(entity, graph) {
     if (!entity.hasInterestingTags()) return [];
 
-    let preset = presetManager.match(entity, graph);
+    let preset = presetSystem.match(entity, graph);
     if (!preset) return [];
 
     const oldTags = Object.assign({}, entity.tags);  // shallow copy
@@ -35,7 +33,7 @@ export function validationOutdatedTags() {
 
     // Upgrade preset, if a replacement is available..
     if (preset.replacement) {
-      const newPreset = presetManager.item(preset.replacement);
+      const newPreset = presetSystem.item(preset.replacement);
       graph = actionChangePreset(entity.id, preset, newPreset, true /* skip field defaults */)(graph);
       entity = graph.entity(entity.id);
       preset = newPreset;
@@ -67,11 +65,11 @@ export function validationOutdatedTags() {
     }
 
     // Attempt to match a canonical record in the name-suggestion-index.
-    const nsi = services.nsi;
+    const nsi = context.services.get('nsi');
     let waitingForNsi = false;
     let nsiResult;
     if (nsi) {
-      waitingForNsi = (nsi.status() === 'loading');
+      waitingForNsi = (nsi.status === 'loading');
       if (!waitingForNsi) {
         const loc = entity.extent(graph).center();
         nsiResult = nsi.upgradeTags(newTags, loc);
@@ -99,9 +97,9 @@ export function validationOutdatedTags() {
       prefix = 'incomplete.';
     }
 
-    let autoArgs = [doUpgrade, t('issues.fix.upgrade_tags.annotation')];
+    let autoArgs = [doUpgrade, l10n.t('issues.fix.upgrade_tags.annotation')];
 
-    issues.push(new validationIssue({
+    issues.push(new ValidationIssue(context, {
       type: type,
       subtype: subtype,
       severity: 'warning',
@@ -112,22 +110,22 @@ export function validationOutdatedTags() {
       autoArgs: autoArgs,
       dynamicFixes: () => {
         let fixes = [
-          new validationIssueFix({
+          new ValidationFix({
             autoArgs: autoArgs,
-            title: t.html('issues.fix.upgrade_tags.title'),
-            onClick: (context) => {
-              context.perform(doUpgrade, t('issues.fix.upgrade_tags.annotation'));
+            title: l10n.tHtml('issues.fix.upgrade_tags.title'),
+            onClick: () => {
+              context.perform(doUpgrade, l10n.t('issues.fix.upgrade_tags.annotation'));
             }
           })
         ];
 
-        const item = nsiResult && nsiResult.matched;
+        const item = nsiResult?.matched;
         if (item) {
           fixes.push(
-            new validationIssueFix({
-              title: t.html('issues.fix.tag_as_not.title', { name: item.displayName }),
-              onClick: (context) => {
-                context.perform(addNotTag, t('issues.fix.tag_as_not.annotation'));
+            new ValidationFix({
+              title: l10n.tHtml('issues.fix.tag_as_not.title', { name: item.displayName }),
+              onClick: () => {
+                context.perform(addNotTag, l10n.t('issues.fix.tag_as_not.annotation'));
               }
             })
           );
@@ -160,7 +158,7 @@ export function validationOutdatedTags() {
       const currEntity = graph.hasEntity(entity.id);
       if (!currEntity) return graph;
 
-      const item = nsiResult && nsiResult.matched;
+      const item = nsiResult?.matched;
       if (!item) return graph;
 
       let newTags = Object.assign({}, currEntity.tags);  // shallow copy
@@ -179,7 +177,7 @@ export function validationOutdatedTags() {
     }
 
 
-    function showMessage(context) {
+    function showMessage() {
       const currEntity = context.hasEntity(entity.id);
       if (!currEntity) return '';
 
@@ -187,8 +185,8 @@ export function validationOutdatedTags() {
       if (subtype === 'noncanonical_brand' && isOnlyAddingTags) {
         messageID += '_incomplete';
       }
-      return t.html(messageID, {
-        feature: utilDisplayLabel(currEntity, context.graph(), true /* verbose */)
+      return l10n.tHtml(messageID, {
+        feature: l10n.displayLabel(currEntity, context.graph(), true /* verbose */)
       });
     }
 
@@ -201,11 +199,11 @@ export function validationOutdatedTags() {
       enter
         .append('div')
         .attr('class', 'issue-reference')
-        .html(t.html(`issues.outdated_tags.${prefix}reference`));
+        .html(l10n.tHtml(`issues.outdated_tags.${prefix}reference`));
 
       enter
         .append('strong')
-        .html(t.html('issues.suggested'));
+        .html(l10n.tHtml('issues.suggested'));
 
       enter
         .append('table')
@@ -239,21 +237,21 @@ export function validationOutdatedTags() {
 
     if (!multipolygon || !outerWay) return [];
 
-    return [new validationIssue({
+    return [new ValidationIssue(context, {
       type: type,
       subtype: 'old_multipolygon',
       severity: 'warning',
       message: showMessage,
       reference: showReference,
       entityIds: [outerWay.id, multipolygon.id],
-      autoArgs: [doUpgrade, t('issues.fix.move_tags.annotation')],
+      autoArgs: [doUpgrade, l10n.t('issues.fix.move_tags.annotation')],
       dynamicFixes: () => {
         return [
-          new validationIssueFix({
-            // autoArgs: [doUpgrade, t('issues.fix.move_tags.annotation')],
-            title: t('issues.fix.move_tags.title'),
-            onClick: (context) => {
-              context.perform(doUpgrade, t('issues.fix.move_tags.annotation'));
+          new ValidationFix({
+            // autoArgs: [doUpgrade, l10n.t('issues.fix.move_tags.annotation')],
+            title: l10n.t('issues.fix.move_tags.title'),
+            onClick: () => {
+              context.perform(doUpgrade, l10n.t('issues.fix.move_tags.annotation'));
             }
           })
         ];
@@ -272,12 +270,12 @@ export function validationOutdatedTags() {
     }
 
 
-    function showMessage(context) {
+    function showMessage() {
       let currMultipolygon = context.hasEntity(multipolygon.id);
       if (!currMultipolygon) return '';
 
-      return t.html('issues.old_multipolygon.message',
-          { multipolygon: utilDisplayLabel(currMultipolygon, context.graph(), true /* verbose */) }
+      return l10n.tHtml('issues.old_multipolygon.message',
+          { multipolygon: l10n.displayLabel(currMultipolygon, context.graph(), true /* verbose */) }
       );
     }
 
@@ -288,7 +286,7 @@ export function validationOutdatedTags() {
         .enter()
         .append('div')
         .attr('class', 'issue-reference')
-        .html(t.html('issues.old_multipolygon.reference'));
+        .html(l10n.tHtml('issues.old_multipolygon.reference'));
     }
   }
 
diff --git a/modules/validations/private_data.js b/modules/validations/private_data.js
index 41e7fc02d6..871a74e9a0 100644
--- a/modules/validations/private_data.js
+++ b/modules/validations/private_data.js
@@ -1,144 +1,126 @@
 import { utilTagDiff } from '@rapid-sdk/util';
 
 import { actionChangeTags } from '../actions/change_tags';
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
-
-
-export function validationPrivateData() {
-    var type = 'private_data';
-
-    // assume that some buildings are private
-    var privateBuildingValues = {
-        detached: true,
-        farm: true,
-        house: true,
-        houseboat: true,
-        residential: true,
-        semidetached_house: true,
-        static_caravan: true
-    };
-
-    // but they might be public if they have one of these other tags
-    var publicKeys = {
-        amenity: true,
-        craft: true,
-        historic: true,
-        leisure: true,
-        office: true,
-        shop: true,
-        tourism: true
-    };
-
-    // these tags may contain personally identifying info
-    var personalTags = {
-        'contact:email': true,
-        'contact:fax': true,
-        'contact:phone': true,
-        email: true,
-        fax: true,
-        phone: true
-    };
-
-
-    var validation = function checkPrivateData(entity) {
-        var tags = entity.tags;
-        if (!tags.building || !privateBuildingValues[tags.building]) return [];
-
-        var keepTags = {};
-        for (var k in tags) {
-            if (publicKeys[k]) return [];  // probably a public feature
-            if (!personalTags[k]) {
-                keepTags[k] = tags[k];
+import { ValidationIssue, ValidationFix } from '../core/lib';
+
+
+export function validationPrivateData(context) {
+  const type = 'private_data';
+  const l10n = context.localizationSystem();
+
+  // assume that some buildings are private
+  const privateBuildingValues = new Set([
+    'detached', 'farm', 'house', 'houseboat', 'residential', 'semidetached_house', 'static_caravan'
+  ]);
+
+  // but they might be public if they have one of these other tags
+  const publicKeys = new Set([
+    'amenity', 'craft', 'historic', 'leisure', 'office', 'shop', 'tourism'
+  ]);
+
+  // these tags may contain personally identifying info
+  const personalKeys = new Set([
+    'contact:email', 'contact:fax', 'contact:phone', 'email', 'fax', 'phone'
+  ]);
+
+
+  let validation = function checkPrivateData(entity) {
+    const tags = entity.tags;
+    if (!tags.building || !privateBuildingValues.has(tags.building)) return [];  // not a private building
+
+    let keepTags = {};
+    for (const [k, v] of Object.entries(tags)) {
+      if (publicKeys.has(k)) return [];  // ignore, probably a public feature
+      if (!personalKeys.has(k)) {
+        keepTags[k] = v;
+      }
+    }
+
+    const tagDiff = utilTagDiff(tags, keepTags);
+    if (!tagDiff.length) return [];
+
+    const fixID = tagDiff.length === 1 ? 'remove_tag' : 'remove_tags';
+
+    return [new ValidationIssue(context, {
+      type: type,
+      severity: 'warning',
+      message: showMessage,
+      reference: showReference,
+      entityIds: [entity.id],
+      dynamicFixes: () => {
+        return [
+          new ValidationFix({
+            icon: 'rapid-operation-delete',
+            title: l10n.tHtml(`issues.fix.${fixID}.title`),
+            onClick: function() {
+              context.perform(doUpgrade, l10n.t('issues.fix.upgrade_tags.annotation'));
             }
+          })
+        ];
+      }
+    })];
+
+
+    function doUpgrade(graph) {
+      const currEntity = graph.hasEntity(entity.id);
+      if (!currEntity) return graph;
+
+      let newTags = Object.assign({}, currEntity.tags);  // shallow copy
+      for (const diff of tagDiff) {
+        if (diff.type === '-') {
+          delete newTags[diff.key];
+        } else if (diff.type === '+') {
+          newTags[diff.key] = diff.newVal;
         }
+      }
 
-        var tagDiff = utilTagDiff(tags, keepTags);
-        if (!tagDiff.length) return [];
-
-        var fixID = tagDiff.length === 1 ? 'remove_tag' : 'remove_tags';
-
-        return [new validationIssue({
-            type: type,
-            severity: 'warning',
-            message: showMessage,
-            reference: showReference,
-            entityIds: [entity.id],
-            dynamicFixes: function() {
-                return [
-                    new validationIssueFix({
-                        icon: 'rapid-operation-delete',
-                        title: t.html('issues.fix.' + fixID + '.title'),
-                        onClick: function(context) {
-                            context.perform(doUpgrade, t('issues.fix.upgrade_tags.annotation'));
-                        }
-                    })
-                ];
-            }
-        })];
+      return actionChangeTags(currEntity.id, newTags)(graph);
+    }
 
 
-        function doUpgrade(graph) {
-            var currEntity = graph.hasEntity(entity.id);
-            if (!currEntity) return graph;
+    function showMessage() {
+      const currEntity = context.hasEntity(this.entityIds[0]);
+      if (!currEntity) return '';
 
-            var newTags = Object.assign({}, currEntity.tags);  // shallow copy
-            tagDiff.forEach(function(diff) {
-                if (diff.type === '-') {
-                    delete newTags[diff.key];
-                } else if (diff.type === '+') {
-                    newTags[diff.key] = diff.newVal;
-                }
-            });
+      return l10n.tHtml('issues.private_data.contact.message',
+        { feature: l10n.displayLabel(currEntity, context.graph()) }
+      );
+    }
 
-            return actionChangeTags(currEntity.id, newTags)(graph);
-        }
 
+    function showReference(selection) {
+      let enter = selection.selectAll('.issue-reference')
+        .data([0])
+        .enter();
 
-        function showMessage(context) {
-            var currEntity = context.hasEntity(this.entityIds[0]);
-            if (!currEntity) return '';
+      enter
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml('issues.private_data.reference'));
 
-            return t.html('issues.private_data.contact.message',
-                { feature: utilDisplayLabel(currEntity, context.graph()) }
-            );
-        }
+      enter
+        .append('strong')
+        .html(l10n.tHtml('issues.suggested'));
 
-
-        function showReference(selection) {
-            var enter = selection.selectAll('.issue-reference')
-                .data([0])
-                .enter();
-
-            enter
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.private_data.reference'));
-
-            enter
-                .append('strong')
-                .html(t.html('issues.suggested'));
-
-            enter
-                .append('table')
-                .attr('class', 'tagDiff-table')
-                .selectAll('.tagDiff-row')
-                .data(tagDiff)
-                .enter()
-                .append('tr')
-                .attr('class', 'tagDiff-row')
-                .append('td')
-                .attr('class', function(d) {
-                    var klass = d.type === '+' ? 'add' : 'remove';
-                    return 'tagDiff-cell tagDiff-cell-' + klass;
-                })
-                .html(function(d) { return d.display; });
-        }
-    };
+      enter
+        .append('table')
+        .attr('class', 'tagDiff-table')
+        .selectAll('.tagDiff-row')
+        .data(tagDiff)
+        .enter()
+        .append('tr')
+        .attr('class', 'tagDiff-row')
+        .append('td')
+        .attr('class', d => {
+          const klass = d.type === '+' ? 'add' : 'remove';
+          return `tagDiff-cell tagDiff-cell-${klass}`;
+        })
+        .html(d => d.display);
+    }
+  };
 
 
-    validation.type = type;
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/modules/validations/short_road.js b/modules/validations/short_road.js
index e3a0a800ec..b11583279b 100644
--- a/modules/validations/short_road.js
+++ b/modules/validations/short_road.js
@@ -1,118 +1,121 @@
 import { Extent, geoSphericalDistance } from '@rapid-sdk/math';
 
 import { operationDelete } from '../operations/index';
-import { t } from '../core/localizer';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
 export function validationShortRoad(context) {
-    var type = 'short_road';
+  const type = 'short_road';
+  const l10n = context.localizationSystem();
+
+  // Thresholds for number of nodes and total length for a short road. A road
+  // is considered as "short" only if it has less than 7 nodes and is shorter
+  // than 20 meters.
+  const SHORT_WAY_NODES_THD = 7;
+  const SHORT_WAY_LENGTH_THD_METERS = 20;
+
+
+  function wayLength(way, graph) {
+    let length = 0;
+    for (let i = 0; i < way.nodes.length - 1; i++) {
+      const n1 = graph.entity(way.nodes[i]);
+      const n2 = graph.entity(way.nodes[i + 1]);
+      length += geoSphericalDistance(n1.loc, n2.loc);
+    }
+    return length;
+  }
 
-    // Thresholds for number of nodes and total length for a short road. A road
-    // is considered as "short" only if it has less than 7 nodes and is shorter
-    // than 20 meters.
-    var SHORT_WAY_NODES_THD = 7;
-    var SHORT_WAY_LENGTH_THD_METERS = 20;
+  function continueDrawing(way, vertex, context) {
+    if (!context.editable()) return;
 
+    // make sure the vertex is actually visible and editable
+    const map = context.mapSystem();
+    if (!map.trimmedExtent().contains(new Extent(vertex.loc))) {
+      map.zoomToEase(vertex);
+    }
 
-    function wayLength(way, graph) {
-        var length = 0;
-        for (var i = 0; i < way.nodes.length - 1; i++) {
-            var n1 = graph.entity(way.nodes[i]),
-                n2 = graph.entity(way.nodes[i + 1]);
-            length += geoSphericalDistance(n1.loc, n2.loc);
+    context.enter('draw-line', { continueWay: way, continueNode: vertex });
+  }
+
+
+  let validation = function(entity, graph) {
+    if (entity.type !== 'way') return [];
+    if (!entity.tags.highway || entity.isClosed() || entity.nodes.length >= SHORT_WAY_NODES_THD) return [];
+
+    const firstNode = graph.entity(entity.first());
+    const lastNode = graph.entity(entity.last());
+    const pwaysStart = graph.parentWays(firstNode);
+    const pwaysEnd = graph.parentWays(lastNode);
+    const firstNodeOK = pwaysStart.length > 1 || firstNode.tags.noexit === 'yes';
+    const lastNodeOK = pwaysEnd.length > 1 || lastNode.tags.noexit === 'yes';
+
+    // only do check on roads with open ends
+    if ((firstNodeOK && lastNodeOK) || wayLength(entity, graph) >= SHORT_WAY_LENGTH_THD_METERS) return [];
+
+    let fixes = [];
+    if (!firstNodeOK) {
+      fixes.push(new ValidationFix({
+        icon: 'rapid-operation-continue-left',
+        title: l10n.t('issues.fix.continue_from_start.title'),
+        entityIds: [entity.first()],
+        onClick: () => {
+          const vertex = context.entity(entity.first());
+          continueDrawing(entity, vertex, context);
         }
-        return length;
+      }));
     }
 
-    function continueDrawing(way, vertex, context) {
-        if (!context.editable()) return;
-
-        // make sure the vertex is actually visible and editable
-        var map = context.map();
-        if (!map.trimmedExtent().contains(new Extent(vertex.loc))) {
-            map.zoomToEase(vertex);
+    if (!lastNodeOK) {
+      fixes.push(new ValidationFix({
+        icon: 'rapid-operation-continue',
+        title: l10n.t('issues.fix.continue_from_end.title'),
+        entityIds: [entity.last()],
+        onClick: () => {
+          const vertex = context.entity(entity.last());
+          continueDrawing(entity, vertex, context);
         }
-
-        context.enter('draw-line', { continueWay: way, continueNode: vertex });
+      }));
     }
 
-
-    var validation = function(entity, graph) {
-        if (entity.type !== 'way' || !entity.tags.highway || entity.isClosed() || entity.nodes.length >= SHORT_WAY_NODES_THD) return [];
-
-        var firstNode = graph.entity(entity.first()),
-            lastNode = graph.entity(entity.last()),
-            pwaysStart = graph.parentWays(firstNode),
-            pwaysEnd = graph.parentWays(lastNode),
-            firstNodeOK = pwaysStart.length > 1 || firstNode.tags.noexit === 'yes',
-            lastNodeOK = pwaysEnd.length > 1 || lastNode.tags.noexit === 'yes';
-        // only do check on roads with open ends
-        if ((firstNodeOK && lastNodeOK) || wayLength(entity, graph) >= SHORT_WAY_LENGTH_THD_METERS) return [];
-
-        var fixes = [];
-        if (!firstNodeOK) {
-            fixes.push(new validationIssueFix({
-                icon: 'rapid-operation-continue-left',
-                title: t('issues.fix.continue_from_start.title'),
-                entityIds: [entity.first()],
-                onClick: function() {
-                    var vertex = context.entity(entity.first());
-                    continueDrawing(entity, vertex, context);
-                }
-            }));
-        }
-        if (!lastNodeOK) {
-            fixes.push(new validationIssueFix({
-                icon: 'rapid-operation-continue',
-                title: t('issues.fix.continue_from_end.title'),
-                entityIds: [entity.last()],
-                onClick: function() {
-                    var vertex = context.entity(entity.last());
-                    continueDrawing(entity, vertex, context);
-                }
-            }));
-        }
-        if (!operationDelete(context, [entity.id]).disabled()) {
-            fixes.push(new validationIssueFix({
-                icon: 'rapid-operation-delete',
-                title: t('issues.fix.delete_feature.title'),
-                entityIds: [entity.id],
-                onClick: function() {
-                    var id = this.issue.entityIds[0];
-                    var operation = operationDelete(context, [id]);
-                    if (!operation.disabled()) {
-                        operation();
-                    }
-                }
-            }));
+    if (!operationDelete(context, [entity.id]).disabled()) {
+      fixes.push(new ValidationFix({
+        icon: 'rapid-operation-delete',
+        title: l10n.t('issues.fix.delete_feature.title'),
+        entityIds: [entity.id],
+        onClick: function() {
+          const id = this.issue.entityIds[0];
+          const operation = operationDelete(context, [id]);
+          if (!operation.disabled()) {
+            operation();
+          }
         }
+      }));
+    }
 
-        return [new validationIssue({
-            type: type,
-            severity: 'warning',
-            message: function(context) {
-                var entity = context.hasEntity(this.entityIds[0]);
-                if (!entity) return '';
-                var entityLabel = utilDisplayLabel(entity, context.graph());
-                return t('issues.short_road.message', { highway: entityLabel });
-            },
-            reference: function(selection) {
-                selection.selectAll('.issue-reference')
-                    .data([0])
-                    .enter()
-                    .append('div')
-                    .attr('class', 'issue-reference')
-                    .text(t('issues.short_road.reference'));
-            },
-            entityIds: [entity.id],
-            fixes: fixes
-        })];
-    };
-
-
-    validation.type = type;
-
-    return validation;
+    return [new ValidationIssue(context, {
+      type: type,
+      severity: 'warning',
+      message: function() {
+        const entity = context.hasEntity(this.entityIds[0]);
+        if (!entity) return '';
+        const entityLabel = l10n.displayLabel(entity, context.graph());
+        return l10n.t('issues.short_road.message', { highway: entityLabel });
+      },
+      reference: selection => {
+        selection.selectAll('.issue-reference')
+          .data([0])
+          .enter()
+          .append('div')
+          .attr('class', 'issue-reference')
+          .text(l10n.t('issues.short_road.reference'));
+      },
+      entityIds: [entity.id],
+      fixes: fixes
+    })];
+  };
+
+
+  validation.type = type;
+
+  return validation;
 }
diff --git a/modules/validations/suspicious_name.js b/modules/validations/suspicious_name.js
index 6dc8ba25b2..af01c3ce66 100644
--- a/modules/validations/suspicious_name.js
+++ b/modules/validations/suspicious_name.js
@@ -1,12 +1,10 @@
 import { actionChangeTags } from '../actions/change_tags';
-import { presetManager } from '../presets';
-import { services } from '../services';
-import { t, localizer } from '../core/localizer';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
-export function validationSuspiciousName() {
+export function validationSuspiciousName(context) {
   const type = 'suspicious_name';
+  const l10n = context.localizationSystem();
   const keysToTestForGenericValues = [
     'aerialway', 'aeroway', 'amenity', 'building', 'craft', 'highway',
     'leisure', 'railway', 'man_made', 'office', 'shop', 'tourism', 'waterway'
@@ -16,9 +14,9 @@ export function validationSuspiciousName() {
 
   // Attempt to match a generic record in the name-suggestion-index.
   function isGenericMatchInNsi(tags) {
-    const nsi = services.nsi;
+    const nsi = context.services.get('nsi');
     if (nsi) {
-      _waitingForNsi = (nsi.status() === 'loading');
+      _waitingForNsi = (nsi.status === 'loading');
       if (!_waitingForNsi) {
         return nsi.isGenericName(tags);
       }
@@ -29,8 +27,7 @@ export function validationSuspiciousName() {
 
   // Test if the name is just the key or tag value (e.g. "park")
   function nameMatchesRawTag(lowercaseName, tags) {
-    for (let i = 0; i < keysToTestForGenericValues.length; i++) {
-      let key = keysToTestForGenericValues[i];
+    for (const key of keysToTestForGenericValues) {
       let val = tags[key];
       if (val) {
         val = val.toLowerCase();
@@ -50,35 +47,35 @@ export function validationSuspiciousName() {
     return nameMatchesRawTag(name, tags) || isGenericMatchInNsi(tags);
   }
 
-  function makeGenericNameIssue(entityId, nameKey, genericName, langCode) {
-    return new validationIssue({
+  function makeGenericNameIssue(entityID, nameKey, genericName, langCode) {
+    return new ValidationIssue(context, {
       type: type,
       subtype: 'generic_name',
       severity: 'warning',
-      message: function(context) {
-        let entity = context.hasEntity(this.entityIds[0]);
+      message: function() {
+        const entity = context.hasEntity(this.entityIds[0]);
         if (!entity) return '';
-        let preset = presetManager.match(entity, context.graph());
-        let langName = langCode && localizer.languageName(langCode);
-        return t.html('issues.generic_name.message' + (langName ? '_language' : ''),
+        const preset = context.presetSystem().match(entity, context.graph());
+        const langName = langCode && l10n.languageName(langCode);
+        return l10n.tHtml('issues.generic_name.message' + (langName ? '_language' : ''),
           { feature: preset.name(), name: genericName, language: langName }
         );
       },
       reference: showReference,
-      entityIds: [entityId],
+      entityIds: [entityID],
       hash: `${nameKey}=${genericName}`,
       dynamicFixes: function() {
         return [
-          new validationIssueFix({
+          new ValidationFix({
             icon: 'rapid-operation-delete',
-            title: t.html('issues.fix.remove_the_name.title'),
-            onClick: function(context) {
-              let entityId = this.issue.entityIds[0];
-              let entity = context.entity(entityId);
+            title: l10n.tHtml('issues.fix.remove_the_name.title'),
+            onClick: function() {
+              const entityID = this.issue.entityIds[0];
+              const entity = context.entity(entityID);
               let tags = Object.assign({}, entity.tags);   // shallow copy
               delete tags[nameKey];
               context.perform(
-                actionChangeTags(entityId, tags), t('issues.fix.remove_generic_name.annotation')
+                actionChangeTags(entityID, tags), l10n.t('issues.fix.remove_generic_name.annotation')
               );
             }
           })
@@ -92,39 +89,39 @@ export function validationSuspiciousName() {
         .enter()
         .append('div')
         .attr('class', 'issue-reference')
-        .html(t.html('issues.generic_name.reference'));
+        .html(l10n.tHtml('issues.generic_name.reference'));
     }
   }
 
-  function makeIncorrectNameIssue(entityId, nameKey, incorrectName, langCode) {
-    return new validationIssue({
+  function makeIncorrectNameIssue(entityID, nameKey, incorrectName, langCode) {
+    return new ValidationIssue(context, {
       type: type,
       subtype: 'not_name',
       severity: 'warning',
-      message: function(context) {
+      message: function() {
         const entity = context.hasEntity(this.entityIds[0]);
         if (!entity) return '';
-        const preset = presetManager.match(entity, context.graph());
-        const langName = langCode && localizer.languageName(langCode);
-        return t.html('issues.incorrect_name.message' + (langName ? '_language' : ''),
+        const preset = context.presetSystem().match(entity, context.graph());
+        const langName = langCode && l10n.languageName(langCode);
+        return l10n.tHtml('issues.incorrect_name.message' + (langName ? '_language' : ''),
           { feature: preset.name(), name: incorrectName, language: langName }
         );
       },
       reference: showReference,
-      entityIds: [entityId],
+      entityIds: [entityID],
       hash: `${nameKey}=${incorrectName}`,
       dynamicFixes: function() {
         return [
-          new validationIssueFix({
+          new ValidationFix({
             icon: 'rapid-operation-delete',
-            title: t.html('issues.fix.remove_the_name.title'),
-            onClick: function(context) {
-              const entityId = this.issue.entityIds[0];
-              const entity = context.entity(entityId);
+            title: l10n.tHtml('issues.fix.remove_the_name.title'),
+            onClick: function() {
+              const entityID = this.issue.entityIds[0];
+              const entity = context.entity(entityID);
               let tags = Object.assign({}, entity.tags);   // shallow copy
               delete tags[nameKey];
               context.perform(
-                actionChangeTags(entityId, tags), t('issues.fix.remove_mistaken_name.annotation')
+                actionChangeTags(entityID, tags), l10n.t('issues.fix.remove_mistaken_name.annotation')
               );
             }
           })
@@ -138,7 +135,7 @@ export function validationSuspiciousName() {
         .enter()
         .append('div')
         .attr('class', 'issue-reference')
-        .html(t.html('issues.generic_name.reference'));
+        .html(l10n.tHtml('issues.generic_name.reference'));
     }
   }
 
@@ -151,26 +148,20 @@ export function validationSuspiciousName() {
     if (hasWikidata) return [];
 
     let issues = [];
-    const notNames = (tags['not:name'] || '').split(';');
-
-    for (let key in tags) {
-      const m = key.match(/^name(?:(?::)([a-zA-Z_-]+))?$/);
-      if (!m) continue;
+    const notNames = new Set((tags['not:name'] ?? '').split(';').map(s => s.trim()).filter(Boolean));
 
+    for (const [k, v] of Object.entries(tags)) {
+      if (!v) continue;   // no value
+      const m = k.match(/^name(?:(?::)([a-zA-Z_-]+))?$/);
+      if (!m) continue;   // not a namelike tag
       const langCode = m.length >= 2 ? m[1] : null;
-      const value = tags[key];
-      if (notNames.length) {
-        for (let i in notNames) {
-          const notName = notNames[i];
-          if (notName && value === notName) {
-            issues.push(makeIncorrectNameIssue(entity.id, key, value, langCode));
-            continue;
-          }
-        }
+
+      if (notNames.has(v)) {
+        issues.push(makeIncorrectNameIssue(entity.id, k, v, langCode));
       }
-      if (isGenericName(value, tags)) {
+      if (isGenericName(v, tags)) {
         issues.provisional = _waitingForNsi;  // retry later if we are waiting on NSI to finish loading
-        issues.push(makeGenericNameIssue(entity.id, key, value, langCode));
+        issues.push(makeGenericNameIssue(entity.id, k, v, langCode));
       }
     }
 
diff --git a/modules/validations/unsquare_way.js b/modules/validations/unsquare_way.js
index 49881f185d..8c4928cf49 100644
--- a/modules/validations/unsquare_way.js
+++ b/modules/validations/unsquare_way.js
@@ -1,136 +1,135 @@
-import { prefs } from '../core/preferences';
-import { t } from '../core/localizer';
 //import { actionChangeTags } from '../actions/change_tags';
 import { actionOrthogonalize } from '../actions/orthogonalize';
 import { geoOrthoCanOrthogonalize } from '../geo/ortho';
-import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
-import { services } from '../services';
+import { ValidationIssue, ValidationFix } from '../core/lib';
+
 
 export function validationUnsquareWay(context) {
-    var type = 'unsquare_way';
-    var DEFAULT_DEG_THRESHOLD = 5;   // see also issues.js
+  const type = 'unsquare_way';
+  const l10n = context.localizationSystem();
+  const DEFAULT_DEG_THRESHOLD = 5;   // see also issues.js
 
-    // use looser epsilon for detection to reduce warnings of buildings that are essentially square already
-    var epsilon = 0.05;
-    var nodeThreshold = 10;
+  // use looser epsilon for detection to reduce warnings of buildings that are essentially square already
+  const epsilon = 0.05;
+  const nodeThreshold = 10;
 
-    function isBuilding(entity, graph) {
-        if (entity.type !== 'way' || entity.geometry(graph) !== 'area') return false;
-        return entity.tags.building && entity.tags.building !== 'no';
-    }
+  function isBuilding(entity, graph) {
+    if (entity.type !== 'way' || entity.geometry(graph) !== 'area') return false;
+    return entity.tags.building && entity.tags.building !== 'no';
+  }
 
 
-    var validation = function checkUnsquareWay(entity, graph) {
+  let validation = function checkUnsquareWay(entity, graph) {
+    if (!isBuilding(entity, graph)) return [];
 
-        if (!isBuilding(entity, graph)) return [];
+    // don't flag ways marked as physically unsquare
+    if (entity.tags.nonsquare === 'yes') return [];
 
-        // don't flag ways marked as physically unsquare
-        if (entity.tags.nonsquare === 'yes') return [];
+    const isClosed = entity.isClosed();
+    if (!isClosed) return [];        // this building has bigger problems
 
-        var isClosed = entity.isClosed();
-        if (!isClosed) return [];        // this building has bigger problems
+    // don't flag ways with lots of nodes since they are likely detail-mapped
+    const nodes = graph.childNodes(entity).slice();    // shallow copy
+    if (nodes.length > nodeThreshold + 1) return [];   // +1 because closing node appears twice
 
-        // don't flag ways with lots of nodes since they are likely detail-mapped
-        var nodes = graph.childNodes(entity).slice();    // shallow copy
-        if (nodes.length > nodeThreshold + 1) return [];   // +1 because closing node appears twice
+    // ignore if not all nodes are fully downloaded
+    const osm = context.services.get('osm');
+    if (!osm || nodes.some(node => !osm.isDataLoaded(node.loc))) return [];
 
-        // ignore if not all nodes are fully downloaded
-        var osm = services.osm;
-        if (!osm || nodes.some(function(node) { return !osm.isDataLoaded(node.loc); })) return [];
+    // don't flag connected ways to avoid unresolvable unsquare loops
+    const hasConnectedSquarableWays = nodes.some(node => {
+      return graph.parentWays(node).some(parentWay => {
+        if (parentWay.id === entity.id) return false;
+        if (isBuilding(parentWay, graph)) return true;
 
-        // don't flag connected ways to avoid unresolvable unsquare loops
-        var hasConnectedSquarableWays = nodes.some(function(node) {
-            return graph.parentWays(node).some(function(way) {
-                if (way.id === entity.id) return false;
-                if (isBuilding(way, graph)) return true;
-                return graph.parentRelations(way).some(function(parentRelation) {
-                    return parentRelation.isMultipolygon() &&
-                        parentRelation.tags.building &&
-                        parentRelation.tags.building !== 'no';
-                });
-            });
+        return graph.parentRelations(parentWay).some(parentRelation => {
+          return parentRelation.isMultipolygon() &&
+            parentRelation.tags.building &&
+            parentRelation.tags.building !== 'no';
         });
-        if (hasConnectedSquarableWays) return [];
-
-
-        // user-configurable square threshold
-        var storedDegreeThreshold = prefs('validate-square-degrees');
-        var degreeThreshold = isNaN(storedDegreeThreshold) ? DEFAULT_DEG_THRESHOLD : parseFloat(storedDegreeThreshold);
-
-        var points = nodes.map(function(node) { return context.projection.project(node.loc); });
-        if (!geoOrthoCanOrthogonalize(points, isClosed, epsilon, degreeThreshold, true)) return [];
-
-        var autoArgs;
-        // don't allow autosquaring features linked to wikidata
-        if (!entity.tags.wikidata) {
-            // use same degree threshold as for detection
-            var autoAction = actionOrthogonalize(entity.id, context.projection, undefined, degreeThreshold);
-            autoAction.transitionable = false;  // when autofixing, do it instantly
-            autoArgs = [autoAction, t('operations.orthogonalize.annotation.feature', { n: 1 })];
-        }
-
-        return [new validationIssue({
-            type: type,
-            subtype: 'building',
-            severity: 'warning',
-            message: function(context) {
-                var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t.html('issues.unsquare_way.message', {
-                    feature: utilDisplayLabel(entity, context.graph())
-                }) : '';
-            },
-            reference: showReference,
-            entityIds: [entity.id],
-            hash: degreeThreshold,
-            autoArgs: autoArgs,
-            dynamicFixes: function() {
-                return [
-                    new validationIssueFix({
-                        icon: 'rapid-operation-orthogonalize',
-                        title: t('issues.fix.square_feature.title'),
-//                        autoArgs: autoArgs,
-                        onClick: function(context, completionHandler) {
-                            var entityId = this.issue.entityIds[0];
-                            // use same degree threshold as for detection
-                            context.perform(
-                                actionOrthogonalize(entityId, context.projection, undefined, degreeThreshold),
-                                t('operations.orthogonalize.annotation.feature', { n: 1 })
-                            );
-                            // run after the squaring transition (currently 150ms)
-                            window.setTimeout(function() { completionHandler(); }, 175);
-                        }
-                    }),
-                    /*
-                    new validationIssueFix({
-                        title: t.html('issues.fix.tag_as_unsquare.title'),
-                        onClick: function(context) {
-                            var entityId = this.issue.entityIds[0];
-                            var entity = context.entity(entityId);
-                            var tags = Object.assign({}, entity.tags);  // shallow copy
-                            tags.nonsquare = 'yes';
-                            context.perform(
-                                actionChangeTags(entityId, tags),
-                                t('issues.fix.tag_as_unsquare.annotation')
-                            );
-                        }
-                    })
-                    */
-                ];
-            }
-        })];
+      });
+    });
+    if (hasConnectedSquarableWays) return [];
+
+
+    // user-configurable square threshold
+    const storageSystem = context.storageSystem();
+    const storedDegreeThreshold = storageSystem.getItem('validate-square-degrees');
+    const degreeThreshold = isNaN(storedDegreeThreshold) ? DEFAULT_DEG_THRESHOLD : parseFloat(storedDegreeThreshold);
+
+    const points = nodes.map(node => context.projection.project(node.loc));
+    if (!geoOrthoCanOrthogonalize(points, isClosed, epsilon, degreeThreshold, true)) return [];
+
+    let autoArgs;
+    // don't allow autosquaring features linked to wikidata
+    if (!entity.tags.wikidata) {
+      // use same degree threshold as for detection
+      let autoAction = actionOrthogonalize(entity.id, context.projection, undefined, degreeThreshold);
+      autoAction.transitionable = false;  // when autofixing, do it instantly
+      autoArgs = [autoAction, l10n.t('operations.orthogonalize.annotation.feature', { n: 1 })];
+    }
 
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .html(t.html('issues.unsquare_way.buildings.reference'));
-        }
-    };
+    return [new ValidationIssue(context, {
+      type: type,
+      subtype: 'building',
+      severity: 'warning',
+      message: function() {
+        const entity = context.hasEntity(this.entityIds[0]);
+        return entity ? l10n.tHtml('issues.unsquare_way.message', {
+          feature: l10n.displayLabel(entity, context.graph())
+        }) : '';
+      },
+      reference: showReference,
+      entityIds: [entity.id],
+      hash: degreeThreshold,
+      autoArgs: autoArgs,
+      dynamicFixes: function() {
+        return [
+          new ValidationFix({
+            icon: 'rapid-operation-orthogonalize',
+            title: l10n.t('issues.fix.square_feature.title'),
+//          autoArgs: autoArgs,
+            onClick: function(context, completionHandler) {
+              const entityID = this.issue.entityIds[0];
+              // use same degree threshold as for detection
+              context.perform(
+                actionOrthogonalize(entityID, context.projection, undefined, degreeThreshold),
+                l10n.t('operations.orthogonalize.annotation.feature', { n: 1 })
+              );
+              // run after the squaring transition (currently 150ms)
+              window.setTimeout(function() { completionHandler(); }, 175);
+            }
+          }),
+/*
+          new ValidationFix({     // Tag as unnsquare
+            title: l10n.tHtml('issues.fix.tag_as_unsquare.title'),
+            onClick: function() {
+              const entityID = this.issue.entityIds[0];
+              const entity = context.entity(entityID);
+              const tags = Object.assign({}, entity.tags);  // shallow copy
+              tags.nonsquare = 'yes';
+              context.perform(
+                actionChangeTags(entityID, tags),
+                l10n.t('issues.fix.tag_as_unsquare.annotation')
+              );
+            }
+          })
+*/
+        ];
+      }
+    })];
+
+    function showReference(selection) {
+      selection.selectAll('.issue-reference')
+        .data([0])
+        .enter()
+        .append('div')
+        .attr('class', 'issue-reference')
+        .html(l10n.tHtml('issues.unsquare_way.buildings.reference'));
+    }
+  };
 
-    validation.type = type;
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/modules/validations/y_shaped_connection.js b/modules/validations/y_shaped_connection.js
index d7989520ad..0972801e5a 100644
--- a/modules/validations/y_shaped_connection.js
+++ b/modules/validations/y_shaped_connection.js
@@ -1,170 +1,163 @@
 import { geoSphericalDistance, vecAngle } from '@rapid-sdk/math';
 
 import { operationDelete } from '../operations/index';
-import { t } from '../core/localizer';
-import { validationIssue, validationIssueFix } from '../core/validation';
+import { ValidationIssue, ValidationFix } from '../core/lib';
 
 
 export function validationYShapedConnection(context) {
-    /* We want to catch and warn about the following "shapes of connections"
-     * that may appear in ML-generated roads:
-     * (1) Two short edges around a connection node, causing a "Y-shaped" connection
-     *     ________ _______
-     *             V
-     *             |
-     *             |
-     *             |
-     * (2) One short edges around a connection node. The connection is not exactly
-     * "Y-shaped", but still a little too detailed.
-     *               _______
-     *  ___________ /
-     *             |
-     *             |
-     *             |
-     * The potential fix is to remove the non-connection nodes causing the short edges,
-     * so that the shape of the connection becomes more like a "T".
-     *
-     * This validation will flag issues on those excessive non-connection nodes around
-     * Y-shaped connections and suggest deletion or move as possible fixes.
-     */
-
-    var type = 'y_shaped_connection';
-    // THD means "threshold"
-    var SHORT_EDGE_THD_METERS = 12;
-    var NON_FLAT_ANGLE_THD_DEGREES = 5;
-
-    var relatedHighways = {
-        residential: true, service: true, track: true, unclassified: true,
-        tertiary: true, secondary: true, primary: true, living_street: true,
-        cycleway: true, trunk: true, motorway: true, road: true, raceway: true
-    };
-
-
-    function isTaggedAsRelatedHighway(entity) {
-        return relatedHighways[entity.tags.highway];
+  /* We want to catch and warn about the following "shapes of connections"
+   * that may appear in ML-generated roads:
+   * (1) Two short edges around a connection node, causing a "Y-shaped" connection
+   *     ________ _______
+   *             V
+   *             |
+   *             |
+   *             |
+   * (2) One short edges around a connection node. The connection is not exactly
+   * "Y-shaped", but still a little too detailed.
+   *               _______
+   *  ___________ /
+   *             |
+   *             |
+   *             |
+   * The potential fix is to remove the non-connection nodes causing the short edges,
+   * so that the shape of the connection becomes more like a "T".
+   *
+   * This validation will flag issues on those excessive non-connection nodes around
+   * Y-shaped connections and suggest deletion or move as possible fixes.
+   */
+
+  const type = 'y_shaped_connection';
+  const l10n = context.localizationSystem();
+  const SHORT_EDGE_THD_METERS = 12;       // (THD means "threshold")
+  const NON_FLAT_ANGLE_THD_DEGREES = 5;
+  const relatedHighways = new Set([
+    'residential', 'service', 'track', 'unclassified',
+    'tertiary', 'secondary', 'primary', 'living_street',
+    'cycleway', 'trunk', 'motorway', 'road', 'raceway'
+  ]);
+
+
+  function getRelatedHighwayParents(node, graph) {
+    const parentWays = graph.parentWays(node);
+    return parentWays.filter(way => relatedHighways.has(way.tags.highway));
+  }
+
+  function createIssueAndFixForNode(node, context) {
+    const deletable = !operationDelete(context, [node.id]).disabled();
+    let fix;
+    if (deletable) {
+      fix = new ValidationFix({
+        icon: 'rapid-operation-delete',
+        title: l10n.t('issues.fix.delete_node_around_conn.title'),
+        entityIds: [node.id],
+        onClick: function() {
+          const id = this.entityIds[0];
+          const operation = operationDelete(context, [id]);
+          if (!operation.disabled()) {
+            operation();
+          }
+        }
+      });
+    } else {
+      fix = new ValidationFix({
+        icon: 'rapid-operation-move',
+        title: l10n.t('issues.fix.move_node_around_conn.title'),
+        entityIds: [node.id]
+      });
     }
 
-    function getRelatedHighwayParents(node, graph) {
-        var parentWays = graph.parentWays(node);
-        return parentWays.filter(function (way) {
-            return isTaggedAsRelatedHighway(way);
-        });
+    return new ValidationIssue(context, {
+      type: type,
+      severity: 'warning',
+      message: () => {
+        return l10n.t('issues.y_shaped_connection.message');
+      },
+      reference: selection => {
+        selection.selectAll('.issue-reference')
+          .data([0])
+          .enter()
+          .append('div')
+          .attr('class', 'issue-reference')
+          .text(l10n.t('issues.y_shaped_connection.reference'));
+      },
+      entityIds: [node.id],
+      fixes: [fix]
+    });
+  }
+
+
+  // Check
+  // (1) if the edge between connNodeIdx and edgeNodeIdx is a short edge
+  // (2) if the node at connNodeIdx is a Y-shaped connection
+  // return true only if both (1) and (2) hold.
+  function isShortEdgeAndYShapedConnection(graph, way, connNodeIdx, edgeNodeIdx) {
+    // conditions for connNode to be a possible Y-shaped connection:
+    // (1) it is a connection node with edges on both side
+    // (2) at least one edge is short
+    // (3) the angle between the two edges are not close to 180 degrees
+
+    if (connNodeIdx <= 0 || connNodeIdx >= way.nodes.length - 1) return false;
+
+    // make sure the node at connNodeIdx is really a connection node
+    const connNid = way.nodes[connNodeIdx];
+    const connNode = graph.entity(connNid);
+    const pways = getRelatedHighwayParents(connNode, graph);
+    if (pways.length < 2) return false;
+
+    // check if the edge between connNode and edgeNode is short
+    const edgeNid = way.nodes[edgeNodeIdx];
+    const edgeNode = graph.entity(edgeNid);
+    const edgeLen = geoSphericalDistance(connNode.loc, edgeNode.loc);
+    if (edgeLen > SHORT_EDGE_THD_METERS) return false;
+
+    // check if connNode is a Y-shaped connection
+    const otherNodeIdx = connNodeIdx < edgeNodeIdx ? connNodeIdx - 1 : connNodeIdx + 1;
+    const otherNid = way.nodes[otherNodeIdx];
+    const otherNode = graph.entity(otherNid);
+    const other = context.projection.project(otherNode.loc);
+    const conn = context.projection.project(connNode.loc);
+    const edge = context.projection.project(edgeNode.loc);
+    let prevEdgeAngle = 0;
+    let nextEdgeAngle = 0;
+    let angleBetweenEdges = 0;
+
+    if (otherNodeIdx < edgeNodeIdx) {
+      // node order along way: otherNode -> connNode -> edgeNode
+      prevEdgeAngle = vecAngle(other, conn);
+      nextEdgeAngle = vecAngle(conn, edge);
+      angleBetweenEdges = Math.abs(nextEdgeAngle - prevEdgeAngle) / Math.PI * 180.0;
+    } else {
+      // node order along way: edgeNode -> connNode -> otherNode
+      prevEdgeAngle = vecAngle(edge, conn);
+      nextEdgeAngle = vecAngle(conn, other);
+      angleBetweenEdges = Math.abs(nextEdgeAngle - prevEdgeAngle) / Math.PI * 180.0;
     }
 
-    function createIssueAndFixForNode(node, context) {
-        var deletable = !operationDelete(context, [node.id]).disabled();
-        var fix;
-        if (deletable) {
-            fix = new validationIssueFix({
-                icon: 'rapid-operation-delete',
-                title: t('issues.fix.delete_node_around_conn.title'),
-                entityIds: [node.id],
-                onClick: function() {
-                    var id = this.entityIds[0];
-                    var operation = operationDelete(context, [id]);
-                    if (!operation.disabled()) {
-                        operation();
-                    }
-                }
-            });
-        } else {
-            fix = new validationIssueFix({
-                icon: 'rapid-operation-move',
-                title: t('issues.fix.move_node_around_conn.title'),
-                entityIds: [node.id]
-            });
-        }
+    return angleBetweenEdges > NON_FLAT_ANGLE_THD_DEGREES;
+  }
 
-        return new validationIssue({
-            type: type,
-            severity: 'warning',
-            message: function() {
-                return t('issues.y_shaped_connection.message');
-            },
-            reference: function(selection) {
-                selection.selectAll('.issue-reference')
-                    .data([0])
-                    .enter()
-                    .append('div')
-                    .attr('class', 'issue-reference')
-                    .text(t('issues.y_shaped_connection.reference'));
-            },
-            entityIds: [node.id],
-            fixes: [fix]
-        });
-    }
 
-    // Check
-    // (1) if the edge between connNodeIdx and edgeNodeIdx is a short edge
-    // (2) if the node at connNodeIdx is a Y-shaped connection
-    // return true only if both (1) and (2) hold.
-    function isShortEdgeAndYShapedConnection(graph, way, connNodeIdx, edgeNodeIdx) {
-        // conditions for connNode to be a possible Y-shaped connection:
-        // (1) it is a connection node with edges on both side
-        // (2) at least one edge is short
-        // (3) the angle between the two edges are not close to 180 degrees
-
-        if (connNodeIdx <= 0 || connNodeIdx >= way.nodes.length - 1) return false;
-
-        // make sure the node at connNodeIdx is really a connection node
-        var connNid = way.nodes[connNodeIdx];
-        var connNode = graph.entity(connNid);
-        var pways = getRelatedHighwayParents(connNode, graph);
-        if (pways.length < 2) return false;
-
-        // check if the edge between connNode and edgeNode is short
-        var edgeNid = way.nodes[edgeNodeIdx];
-        var edgeNode = graph.entity(edgeNid);
-        var edgeLen = geoSphericalDistance(connNode.loc, edgeNode.loc);
-        if (edgeLen > SHORT_EDGE_THD_METERS) return false;
-
-        // check if connNode is a Y-shaped connection
-        var prevEdgeAngle = 0;
-        var nextEdgeAngle = 0;
-        var angleBetweenEdges = 0;
-        var otherNodeIdx = connNodeIdx < edgeNodeIdx ? connNodeIdx - 1 : connNodeIdx + 1;
-        var otherNid = way.nodes[otherNodeIdx];
-        var otherNode = graph.entity(otherNid);
-
-        var other = context.projection.project(otherNode.loc);
-        var conn = context.projection.project(connNode.loc);
-        var edge = context.projection.project(edgeNode.loc);
-        if (otherNodeIdx < edgeNodeIdx) {
-            // node order along way: otherNode -> connNode -> edgeNode
-            prevEdgeAngle = vecAngle(other, conn);
-            nextEdgeAngle = vecAngle(conn, edge);
-            angleBetweenEdges = Math.abs(nextEdgeAngle - prevEdgeAngle) / Math.PI * 180.0;
-        } else {
-            // node order along way: edgeNode -> connNode -> otherNode
-            prevEdgeAngle = vecAngle(edge, conn);
-            nextEdgeAngle = vecAngle(conn, other);
-            angleBetweenEdges = Math.abs(nextEdgeAngle - prevEdgeAngle) / Math.PI * 180.0;
-        }
+  let validation = function(entity, graph) {
+    // Only flag issue on non-connection nodes on negative ways
+    if (entity.type !== 'node') return [];
+    const pways = getRelatedHighwayParents(entity, graph);
+    if (pways.length !== 1 || !pways[0].id.startsWith('w-')) return [];
 
-        return angleBetweenEdges > NON_FLAT_ANGLE_THD_DEGREES;
+    // check if either neighbor node on its parent way is a connection node
+    let issues = [];
+    const way = pways[0];
+    const idx = way.nodes.indexOf(entity.id);
+    if (idx <= 0) return issues;
+    if (isShortEdgeAndYShapedConnection(graph, way, idx - 1, idx) ||
+      isShortEdgeAndYShapedConnection(graph, way, idx + 1, idx)) {
+      issues.push(createIssueAndFixForNode(entity, context));
     }
+    return issues;
+  };
 
 
-    var validation = function(entity, graph) {
-        // Only flag issue on non-connection nodes on negative ways
-        if (entity.type !== 'node') return [];
-        var pways = getRelatedHighwayParents(entity, graph);
-        if (pways.length !== 1 || !pways[0].id.startsWith('w-')) return [];
-
-        // check if either neighbor node on its parent way is a connection node
-        var issues = [];
-        var way = pways[0];
-        var idx = way.nodes.indexOf(entity.id);
-        if (idx <= 0) return issues;
-        if (isShortEdgeAndYShapedConnection(graph, way, idx - 1, idx) ||
-            isShortEdgeAndYShapedConnection(graph, way, idx + 1, idx)) {
-            issues.push(createIssueAndFixForNode(entity, context));
-        }
-        return issues;
-    };
-
-
-    validation.type = type;
+  validation.type = type;
 
-    return validation;
+  return validation;
 }
diff --git a/package-lock.json b/package-lock.json
index f1520ede7c..e87e603425 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "Rapid",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "Rapid",
-      "version": "2.0.2",
+      "version": "2.0.3",
       "license": "ISC",
       "dependencies": {
         "@mapbox/geojson-area": "^0.2.2",
@@ -32,7 +32,7 @@
         "maplibre-gl": "^2.4.0",
         "marked": "~4.3.0",
         "node-diff3": "~3.1.2",
-        "osm-auth": "2.0.1",
+        "osm-auth": "2.1.0",
         "pannellum": "2.5.6",
         "pbf": "^3.2.1",
         "pixi-filters": "5.2.1",
@@ -7705,13 +7705,14 @@
       "license": "MIT"
     },
     "node_modules/osm-auth": {
-      "version": "2.0.1",
-      "license": "ISC",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/osm-auth/-/osm-auth-2.1.0.tgz",
+      "integrity": "sha512-C1T6SCPovt7KagqNV4GXtRNlJ2SJ5SjJWRdtLGU72ntYoeXHGP2IgqeExu17cDeqLY1A3mIofmC6fUGkE7RdbA==",
       "dependencies": {
         "store": "~2.0.12"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=16"
       }
     },
     "node_modules/osm-community-index": {
@@ -16004,7 +16005,9 @@
       "dev": true
     },
     "osm-auth": {
-      "version": "2.0.1",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/osm-auth/-/osm-auth-2.1.0.tgz",
+      "integrity": "sha512-C1T6SCPovt7KagqNV4GXtRNlJ2SJ5SjJWRdtLGU72ntYoeXHGP2IgqeExu17cDeqLY1A3mIofmC6fUGkE7RdbA==",
       "requires": {
         "store": "~2.0.12"
       }
diff --git a/package.json b/package.json
index ab864f9a85..d11f3e1f18 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "maplibre-gl": "^2.4.0",
     "marked": "~4.3.0",
     "node-diff3": "~3.1.2",
-    "osm-auth": "2.0.1",
+    "osm-auth": "2.1.0",
     "pannellum": "2.5.6",
     "pbf": "^3.2.1",
     "pixi-filters": "5.2.1",
diff --git a/test/benchmark/tests/bench.js b/test/benchmark/tests/bench.js
index c27b476cdc..d356a71367 100644
--- a/test/benchmark/tests/bench.js
+++ b/test/benchmark/tests/bench.js
@@ -49,7 +49,7 @@ const timestamp = 1649012524130;
 let content = d3.select('body').append('div');
 let context = Rapid.coreContext().assetPath('../../dist/').init().container(content);
 
-let map = context.map();
+let map = context.mapSystem();
 content.call(map);
 
 
diff --git a/test/index.html b/test/index.html
index 7592fecad7..b86366882d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -28,6 +28,8 @@
 
   <script>
     var scripts = [
+      'spec/Context.test.js',
+
       'spec/actions/add_entity.js',
       'spec/actions/add_member.js',
       'spec/actions/add_midpoint.js',
@@ -64,20 +66,26 @@
       'spec/actions/extract.js',
       'spec/actions/upgrade_tags.js',
 
-      'spec/core/context.js',
-      'spec/core/Difference.test.js',
-      'spec/core/file_fetcher.js',
-      'spec/core/Graph.test.js',
-      'spec/core/history.js',
-      'spec/core/LocationManager.test.js',
-      'spec/core/Tree.test.js',
-      'spec/core/UrlHash.test.js',
-      'spec/core/validator.js',
+      'spec/core/DataLoaderSystem.test.js',
+      'spec/core/EditSystem.test.js',
+      'spec/core/FilterSystem.test.js',
+      'spec/core/LocalizationSystem.test.js',
+      'spec/core/LocationSystem.test.js',
+      'spec/core/MapSystem.Test.js',
+      'spec/core/PresetSystem.test.js',
+      'spec/core/UrlHashSystem.test.js',
+      'spec/core/ValidationSystem.test.js',
+
+      'spec/core/lib/Category.test.js',
+      'spec/core/lib/Collection.test.js',
+      'spec/core/lib/Difference.test.js',
+      'spec/core/lib/Graph.test.js',
+      'spec/core/lib/ImagerySource.test.js',
+      'spec/core/lib/Preset.test.js',
+      'spec/core/lib/Tree.test.js',
 
       'spec/geo/geom.js',
 
-      'spec/lib/locale.js',
-
       'spec/operations/extract.js',
       'spec/operations/straighten.js',
 
@@ -91,23 +99,13 @@
       'spec/osm/relation.js',
       'spec/osm/way.js',
 
-      'spec/presets/category.js',
-      'spec/presets/collection.js',
-      'spec/presets/index.js',
-      'spec/presets/preset.js',
-
-      'spec/renderer/RendererImagerySource.js',
-      'spec/renderer/features.js',
-      'spec/renderer/map.js',
-
-      'spec/services/kartaview.js',
-      'spec/services/mapillary.js',
-      'spec/services/maprules.js',
-      'spec/services/nominatim.js',
-      'spec/services/osm.js',
-      'spec/services/osm_wikibase.js',
-      'spec/services/streetside.js',
-      'spec/services/taginfo.js',
+      'spec/services/KartaviewService.test.js',
+      'spec/services/MapillaryService.test.js',
+      'spec/services/NominatimService.test.js',
+      'spec/services/OsmService.test.js',
+      'spec/services/OsmWikibaseService.test.js',
+      'spec/services/StreetsideService.test.js',
+      'spec/services/TaginfoService.test.js',
 
       'spec/svg/tag_classes.js',
 
@@ -116,7 +114,6 @@
       'spec/ui/confirm.js',
       'spec/ui/flash.js',
       'spec/ui/icon.js',
-      'spec/ui/inspector.js',
       'spec/ui/modal.js',
 
       'spec/ui/sections/raw_tag_editor.js',
@@ -126,9 +123,8 @@
       'spec/ui/fields/wikipedia.js',
 
       'spec/util/keybinding.js',
-      'spec/util/util.js',
 
-//      'spec/validations/almost_junction.js',
+      'spec/validations/almost_junction.js',
       'spec/validations/crossing_ways.js',
       'spec/validations/disconnected_way.js',
       'spec/validations/incompatible_source.js',
diff --git a/test/spec/Context.test.js b/test/spec/Context.test.js
new file mode 100644
index 0000000000..a6ce0a4255
--- /dev/null
+++ b/test/spec/Context.test.js
@@ -0,0 +1,74 @@
+describe('Context', () => {
+  const TESTMAP = {
+    'test/img/loader.gif': '/assets/test/img/loader-b66184b5c4afbccc25f.gif'
+  };
+
+
+  describe('#assetPath', () => {
+    it('sets and gets assetPath', () => {
+      const context = new Rapid.Context();
+      expect(context.assetPath).to.eql('');
+
+      context.assetPath = 'test/';
+      expect(context.assetPath).to.eql('test/');
+    });
+  });
+
+
+  describe('#assetMap', () => {
+    it('sets and gets assetMap', () => {
+      const context = new Rapid.Context();
+      expect(context.assetMap).to.eql({});
+
+      context.assetMap = TESTMAP;
+      expect(context.assetMap).to.eql(TESTMAP);
+    });
+  });
+
+
+  describe('#asset', () => {
+    let context;
+    beforeEach(() => {
+      context = new Rapid.Context();
+      context.assetPath = 'test/';
+      context.assetMap = TESTMAP;
+    });
+
+    it('ignores absolute urls', () => {
+      expect(context.asset('HTTP://hello')).to.eql('HTTP://hello');
+      expect(context.asset('https://world')).to.eql('https://world');
+    });
+    it('looks first in assetMap', () => {
+      expect(context.asset('img/loader.gif')).to.eql('/assets/test/img/loader-b66184b5c4afbccc25f.gif');
+    });
+    it('falls back to prepending assetPath', () => {
+      expect(context.asset('img/spinner.gif')).to.eql('test/img/spinner.gif');
+    });
+  });
+
+
+  describe('#debug', () => {
+    it('sets and gets debug flags', () => {
+      const context = new Rapid.Context();
+      const TESTFLAGS = {
+        tile: false,
+        label: false,
+        imagery: false,
+        target: false,
+        downloaded: false
+      };
+
+      expect(context.debugFlags()).to.eql(TESTFLAGS);
+
+      context.setDebug('tile', true);
+      expect(context.getDebug('tile')).to.be.true;
+
+      context.setDebug('label');
+      expect(context.getDebug('label')).to.be.true;
+
+      context.setDebug('tile', false);
+      expect(context.getDebug('tile')).to.be.false;
+    });
+  });
+
+});
diff --git a/test/spec/actions/change_preset.js b/test/spec/actions/change_preset.js
index 98979e520f..718e4bf0b4 100644
--- a/test/spec/actions/change_preset.js
+++ b/test/spec/actions/change_preset.js
@@ -1,25 +1,30 @@
-describe('actionChangePreset', function() {
-    var oldPreset = Rapid.presetPreset('old', {tags: {old: 'true'}});
-    var newPreset = Rapid.presetPreset('new', {tags: {new: 'true'}});
+describe('actionChangePreset', () => {
+  class MockContext {
+    constructor()   { }
+  }
 
-    it('changes from one preset\'s tags to another\'s', function() {
-        var entity = Rapid.osmNode({tags: {old: 'true'}});
-        var graph = new Rapid.Graph([entity]);
-        var action = Rapid.actionChangePreset(entity.id, oldPreset, newPreset);
-        expect(action(graph).entity(entity.id).tags).to.eql({new: 'true'});
-    });
+  const context = new MockContext();
+  const oldPreset = new Rapid.Preset(context, 'old', {tags: {old: 'true'}});
+  const newPreset = new Rapid.Preset(context, 'new', {tags: {new: 'true'}});
 
-    it('adds the tags of a new preset to an entity without an old preset', function() {
-        var entity = Rapid.osmNode();
-        var graph = new Rapid.Graph([entity]);
-        var action = Rapid.actionChangePreset(entity.id, null, newPreset);
-        expect(action(graph).entity(entity.id).tags).to.eql({new: 'true'});
-    });
+  it('changes from one preset\'s tags to another\'s', () => {
+    const entity = Rapid.osmNode({tags: {old: 'true'}});
+    const graph = new Rapid.Graph([entity]);
+    const action = Rapid.actionChangePreset(entity.id, oldPreset, newPreset);
+    expect(action(graph).entity(entity.id).tags).to.eql({new: 'true'});
+  });
 
-    it('removes the tags of an old preset from an entity without a new preset', function() {
-        var entity = Rapid.osmNode({tags: {old: 'true'}});
-        var graph = new Rapid.Graph([entity]);
-        var action = Rapid.actionChangePreset(entity.id, oldPreset, null);
-        expect(action(graph).entity(entity.id).tags).to.eql({});
-    });
+  it('adds the tags of a new preset to an entity without an old preset', () => {
+    const entity = Rapid.osmNode();
+    const graph = new Rapid.Graph([entity]);
+    const action = Rapid.actionChangePreset(entity.id, null, newPreset);
+    expect(action(graph).entity(entity.id).tags).to.eql({new: 'true'});
+  });
+
+  it('removes the tags of an old preset from an entity without a new preset', () => {
+    const entity = Rapid.osmNode({tags: {old: 'true'}});
+    const graph = new Rapid.Graph([entity]);
+    const action = Rapid.actionChangePreset(entity.id, oldPreset, null);
+    expect(action(graph).entity(entity.id).tags).to.eql({});
+  });
 });
diff --git a/test/spec/actions/merge_remote_changes.js b/test/spec/actions/merge_remote_changes.js
index 0d4938b8da..dfeb5bbe11 100644
--- a/test/spec/actions/merge_remote_changes.js
+++ b/test/spec/actions/merge_remote_changes.js
@@ -72,7 +72,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -84,7 +89,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -96,7 +106,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -108,7 +123,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -121,7 +141,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result.entity('a').version).to.eql('2');
         expect(result.entity('a').tags).to.eql(mergedTags);
@@ -135,7 +160,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result.entity('a').version).to.eql('2');
         expect(result.entity('a').tags).to.eql(mergedTags);
@@ -152,7 +182,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -167,7 +202,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result.entity('a').version).to.eql('2');
         expect(result.entity('a').tags).to.eql(mergedTags);
@@ -184,7 +224,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ tags: remoteTags, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('w1').version).to.eql('2');
         expect(result.entity('w1').tags).to.eql(mergedTags);
@@ -200,7 +245,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ tags: remoteTags, nodes: remoteNodes, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote, r2, r3]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('w1').version).to.eql('2');
         expect(result.entity('w1').tags).to.eql(mergedTags);
@@ -219,7 +269,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ tags: remoteTags, nodes: remoteNodes, version: '2' });
         const localGraph = makeGraph([local, r2, r3]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('w1').version).to.eql('2');
         expect(result.entity('w1').tags).to.eql(mergedTags);
@@ -237,7 +292,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ tags: remoteTags, nodes: remoteNodes, version: '2' });
         const localGraph = makeGraph([local, r1, r2]);
         const remoteGraph = makeGraph([remote, r3, r4]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
 
         expect(result.entity('w1').version).to.eql('2');
@@ -256,7 +316,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ tags: remoteTags, nodes: remoteNodes, version: '2' });
         const localGraph = makeGraph([local, r1, r2]);
         const remoteGraph = makeGraph([remote, r3, r4]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -268,7 +333,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('p1').update({ loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('p1').version).to.eql('2');
         expect(result.entity('p1').loc).to.eql(remoteLoc);
@@ -281,7 +351,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('p1').update({ loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -297,7 +372,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('r').update({ tags: remoteTags, members: remoteMembers, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote, s1, s2, s3, s4, w4]);
-        const action = Rapid.actionMergeRemoteChanges('r', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('r', opts);
         const result = action(localGraph);
         expect(result).to.eql(localGraph);
       });
@@ -312,7 +392,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('r').update({ tags: remoteTags, members: remoteMembers, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('r', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('r', opts);
         const result = action(localGraph);
         expect(result.entity('r').version).to.eql('2');
         expect(result.entity('r').tags).to.eql(mergedTags);
@@ -328,7 +413,12 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags);
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         action(localGraph);
         expect(action.conflicts()).not.to.be.empty;
       });
@@ -347,7 +437,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags).withOption('force_local');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_local'
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result.entity('a').version).to.eql('2');
         expect(result.entity('a').tags).to.eql(localTags);
@@ -363,7 +459,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('a').update({ tags: remoteTags, loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('a', localGraph, remoteGraph, discardTags).withOption('force_remote');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_remote'
+        };
+        const action = Rapid.actionMergeRemoteChanges('a', opts);
         const result = action(localGraph);
         expect(result.entity('a').version).to.eql('2');
         expect(result.entity('a').tags).to.eql(remoteTags);
@@ -381,7 +483,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ tags: remoteTags, nodes: remoteNodes, version: '2' });
         const localGraph = makeGraph([local, r1, r2]);
         const remoteGraph = makeGraph([remote, r3, r4]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags).withOption('force_local');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_local'
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('w1').version).to.eql('2');
         expect(result.entity('w1').tags).to.eql(localTags);
@@ -397,7 +505,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ tags: remoteTags, nodes: remoteNodes, version: '2' });
         const localGraph = makeGraph([local, r1, r2]);
         const remoteGraph = makeGraph([remote, r3, r4]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags).withOption('force_remote');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_remote'
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('w1').version).to.eql('2');
         expect(result.entity('w1').tags).to.eql(remoteTags);
@@ -413,7 +527,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('p1').update({ loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags).withOption('force_local');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_local'
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('p1').version).to.eql('2');
         expect(result.entity('p1').loc).to.eql(localLoc);
@@ -426,7 +546,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('p1').update({ loc: remoteLoc, version: '2' });
         const localGraph = makeGraph([local]);
         const remoteGraph = makeGraph([remote]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags).withOption('force_remote');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_remote'
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('p1').version).to.eql('2');
         expect(result.entity('p1').loc).to.eql(remoteLoc);
@@ -440,7 +566,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('w1').update({ nodes: remoteNodes, version: '2' });
         const localGraph = makeGraph([local, localr1, r2]);
         const remoteGraph = makeGraph([remote, r3, r4]);
-        const action = Rapid.actionMergeRemoteChanges('w1', localGraph, remoteGraph, discardTags).withOption('force_remote');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_remote'
+        };
+        const action = Rapid.actionMergeRemoteChanges('w1', opts);
         const result = action(localGraph);
         expect(result.entity('w1').nodes).to.eql(remoteNodes);
         expect(result.hasEntity('r1')).to.eql(localr1);
@@ -458,7 +590,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('r').update({ tags: remoteTags, members: remoteMembers, version: '2' });
         const localGraph = makeGraph([local, r1, r2, r3, r4, w3]);
         const remoteGraph = makeGraph([remote, s1, s2, s3, s4, w4]);
-        const action = Rapid.actionMergeRemoteChanges('r', localGraph, remoteGraph, discardTags).withOption('force_local');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_local'
+        };
+        const action = Rapid.actionMergeRemoteChanges('r', opts);
         const result = action(localGraph);
         expect(result.entity('r').version).to.eql('2');
         expect(result.entity('r').tags).to.eql(localTags);
@@ -474,7 +612,13 @@ describe('actionMergeRemoteChanges', () => {
         const remote = base.entity('r').update({ tags: remoteTags, members: remoteMembers, version: '2' });
         const localGraph = makeGraph([local, r1, r2, r3, r4, w3]);
         const remoteGraph = makeGraph([remote, s1, s2, s3, s4, w4]);
-        const action = Rapid.actionMergeRemoteChanges('r', localGraph, remoteGraph, discardTags).withOption('force_remote');
+        const opts = {
+          localGraph: localGraph,
+          remoteGraph: remoteGraph,
+          discardTags: discardTags,
+          strategy: 'force_remote'
+        };
+        const action = Rapid.actionMergeRemoteChanges('r', opts);
         const result = action(localGraph);
         expect(result.entity('r').version).to.eql('2');
         expect(result.entity('r').tags).to.eql(remoteTags);
diff --git a/test/spec/core/DataLoaderSystem.test.js b/test/spec/core/DataLoaderSystem.test.js
new file mode 100644
index 0000000000..b23d3edf1f
--- /dev/null
+++ b/test/spec/core/DataLoaderSystem.test.js
@@ -0,0 +1,70 @@
+describe('DataLoaderSystem', () => {
+  let _dataLoader;
+
+  class MockContext {
+    constructor() {}
+    asset(d) { return d; }
+  }
+
+  const context = new MockContext();
+
+
+  beforeEach(() => {
+    _dataLoader = new Rapid.DataLoaderSystem(context);
+    _dataLoader.init();
+  });
+
+
+  describe('#fileMap', () => {
+    it('gets the fileMap', () => {
+      const fileMap = _dataLoader.fileMap;
+      expect(fileMap).to.be.an.instanceof(Map);
+    });
+  });
+
+
+  describe('#get', () => {
+    it('returns a promise resolved if we already have the data', () => {
+      _dataLoader._cachedData.test = { hello: 'world' };
+
+      const prom = _dataLoader.get('test');
+      expect(prom).to.be.an.instanceof(Promise);
+      return prom
+        .then(data => {
+          expect(data).to.be.a('object');
+          expect(data.hello).to.eql('world');
+        });
+    });
+
+    it('returns a promise rejected if we can not get the data', done => {
+      const prom = _dataLoader.get('wat');
+      expect(prom).to.be.an.instanceof(Promise);
+      prom
+        .then(data => {
+          done(new Error(`We were not supposed to get data but did: ${data}`));
+        })
+        .catch(err => {
+          expect(/^Unknown data file/.test(err)).to.be.true;
+          done();
+        });
+    });
+
+    it('returns a promise to fetch data if we do not already have the data', () => {
+      fetchMock.mock('/data/intro_graph.min.json', {
+        body: JSON.stringify({ value: 'success' }),
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const prom = _dataLoader.get('intro_graph');
+      expect(prom).to.be.an.instanceof(Promise);
+      return prom
+        .then(data => {
+          expect(data).to.be.a('object');
+          expect(data.value).to.eql('success');
+          fetchMock.resetHistory();
+        });
+    });
+
+  });
+});
diff --git a/test/spec/core/EditSystem.test.js b/test/spec/core/EditSystem.test.js
new file mode 100644
index 0000000000..34dc77abf8
--- /dev/null
+++ b/test/spec/core/EditSystem.test.js
@@ -0,0 +1,599 @@
+describe('EditSystem', () => {
+  let _editSystem, spy;
+
+  const actionNoop = function() {
+    return (graph) => graph;
+  };
+  const actionAddNode = function (nodeID) {
+    return (graph) => graph.replace(Rapid.osmNode({ id: nodeID }));
+  };
+
+
+  class MockStorageSystem {
+    constructor() { }
+    getItem() { return ''; }
+    hasItem() { return false; }
+    setItem() { }
+  }
+
+  class MockContext {
+    constructor()   {
+      this.projection = new sdk.Projection();
+      this._storageSystem = new MockStorageSystem();
+     }
+    storageSystem() { return this._storageSystem; }
+    selectedIDs() { return []; }
+  }
+
+  const context = new MockContext();
+
+
+  beforeEach(() => {
+    _editSystem = new Rapid.EditSystem(context);
+    _editSystem.init();
+    spy = sinon.spy();
+  });
+
+
+  describe('#reset', () => {
+    it('clears the version stack', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.undo();
+      _editSystem.reset();
+      expect(_editSystem.undoAnnotation()).to.be.undefined;
+      expect(_editSystem.redoAnnotation()).to.be.undefined;
+    });
+  });
+
+
+  describe('#graph', () => {
+    it('returns the current graph', () => {
+      expect(_editSystem.graph()).to.be.an.instanceOf(Rapid.Graph);
+    });
+  });
+
+
+  describe('#merge', () => {
+    it('merges the entities into all graph versions', () => {
+      const n = Rapid.osmNode({id: 'n'});
+      _editSystem.merge([n]);
+      expect(_editSystem.graph().entity('n')).to.equal(n);
+    });
+
+    it('emits a merge event with the new entities', () => {
+      const n = Rapid.osmNode({id: 'n'});
+      _editSystem.on('merge', spy);
+      _editSystem.merge([n]);
+      expect(spy).to.have.been.calledWith(new Set([n.id]));
+    });
+  });
+
+
+  describe('#perform', () => {
+    it('returns a difference', () => {
+      expect(_editSystem.perform(actionNoop()).changes).to.be.empty;
+    });
+
+    it('updates the graph', () => {
+      const node = Rapid.osmNode();
+      _editSystem.perform(graph => { return graph.replace(node); });
+      expect(_editSystem.graph().entity(node.id)).to.equal(node);
+    });
+
+    it('pushes an undo annotation', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      expect(_editSystem.undoAnnotation()).to.equal('annotation1');
+    });
+
+    it('emits a change event', () => {
+      _editSystem.on('change', spy);
+      const difference = _editSystem.perform(actionNoop());
+      expect(spy).to.have.been.calledWith(difference);
+      expect(spy.callCount).to.eql(1);
+    });
+
+    it('performs multiple actions', () => {
+      const action1 = sinon.stub().returns(new Rapid.Graph());
+      const action2 = sinon.stub().returns(new Rapid.Graph());
+      _editSystem.perform(action1, action2, 'annotation1');
+      expect(action1).to.have.been.called;
+      expect(action2).to.have.been.called;
+      expect(_editSystem.undoAnnotation()).to.equal('annotation1');
+    });
+
+    it('performs transitionable actions in a transition', done => {
+      const action1 = () => { return new Rapid.Graph(); };
+      action1.transitionable = true;
+      _editSystem.on('change', spy);
+      _editSystem.perform(action1);
+      window.setTimeout(() => {
+        expect(spy.callCount).to.be.above(2);
+        done();
+      }, 300);
+    });
+  });
+
+
+  describe('#replace', () => {
+    it('returns a difference', () => {
+      expect(_editSystem.replace(actionNoop()).changes).to.be.empty;
+    });
+
+    it('updates the graph', () => {
+      const node = Rapid.osmNode();
+      const action = (graph) => graph.replace(node);
+      _editSystem.replace(action);
+      expect(_editSystem.graph().entity(node.id)).to.equal(node);
+    });
+
+    it('replaces the undo annotation', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.replace(actionNoop(), 'annotation2');
+      expect(_editSystem.undoAnnotation()).to.equal('annotation2');
+    });
+
+    it('emits a change event', () => {
+      _editSystem.on('change', spy);
+      const difference = _editSystem.replace(actionNoop());
+      expect(spy).to.have.been.calledWith(difference);
+    });
+
+    it('performs multiple actions', () => {
+      const action1 = sinon.stub().returns(new Rapid.Graph());
+      const action2 = sinon.stub().returns(new Rapid.Graph());
+      _editSystem.replace(action1, action2, 'annotation1');
+      expect(action1).to.have.been.called;
+      expect(action2).to.have.been.called;
+      expect(_editSystem.undoAnnotation()).to.equal('annotation1');
+    });
+  });
+
+
+  describe('#pop', () => {
+    it('returns a difference', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      expect(_editSystem.pop().changes).to.be.empty;
+    });
+
+    it('updates the graph', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.pop();
+      expect(_editSystem.undoAnnotation()).to.be.undefined;
+    });
+
+    it('does not push the redo stack', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.pop();
+      expect(_editSystem.redoAnnotation()).to.be.undefined;
+    });
+
+    it('emits a change event', () => {
+      _editSystem.perform(actionNoop());
+      _editSystem.on('change', spy);
+      const difference = _editSystem.pop();
+      expect(spy).to.have.been.calledWith(difference);
+    });
+
+    it('pops n times', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.perform(actionNoop(), 'annotation2');
+      _editSystem.perform(actionNoop(), 'annotation3');
+      _editSystem.pop(2);
+      expect(_editSystem.undoAnnotation()).to.equal('annotation1');
+    });
+
+    it('pops 0 times', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.perform(actionNoop(), 'annotation2');
+      _editSystem.perform(actionNoop(), 'annotation3');
+      _editSystem.pop(0);
+      expect(_editSystem.undoAnnotation()).to.equal('annotation3');
+    });
+
+    it('pops 1 time if argument is invalid', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.perform(actionNoop(), 'annotation2');
+      _editSystem.perform(actionNoop(), 'annotation3');
+      _editSystem.pop('foo');
+      expect(_editSystem.undoAnnotation()).to.equal('annotation2');
+      _editSystem.pop(-1);
+      expect(_editSystem.undoAnnotation()).to.equal('annotation1');
+    });
+  });
+
+
+  describe('#overwrite', () => {
+    it('returns a difference', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      expect(_editSystem.overwrite(actionNoop()).changes).to.be.empty;
+    });
+
+    it('updates the graph', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      const node = Rapid.osmNode();
+      _editSystem.overwrite(graph => { return graph.replace(node); });
+      expect(_editSystem.graph().entity(node.id)).to.equal(node);
+    });
+
+    it('replaces the undo annotation', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.overwrite(actionNoop(), 'annotation2');
+      expect(_editSystem.undoAnnotation()).to.equal('annotation2');
+    });
+
+    it('does not push the redo stack', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.overwrite(actionNoop(), 'annotation2');
+      expect(_editSystem.redoAnnotation()).to.be.undefined;
+    });
+
+    it('emits a change event', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.on('change', spy);
+      const difference = _editSystem.overwrite(actionNoop(), 'annotation2');
+      expect(spy).to.have.been.calledWith(difference);
+    });
+
+    it('performs multiple actions', () => {
+      const action1 = sinon.stub().returns(new Rapid.Graph());
+      const action2 = sinon.stub().returns(new Rapid.Graph());
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.overwrite(action1, action2, 'annotation2');
+      expect(action1).to.have.been.called;
+      expect(action2).to.have.been.called;
+      expect(_editSystem.undoAnnotation()).to.equal('annotation2');
+    });
+  });
+
+
+  describe('#undo', () => {
+    it('returns a difference', () => {
+      expect(_editSystem.undo().changes).to.be.empty;
+    });
+
+    it('pops the undo stack', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.undo();
+      expect(_editSystem.undoAnnotation()).to.be.undefined;
+    });
+
+    it('pushes the redo stack', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.undo();
+      expect(_editSystem.redoAnnotation()).to.equal('annotation1');
+    });
+
+    it('emits an undone event', () => {
+      _editSystem.perform(actionNoop());
+      _editSystem.on('undone', spy);
+      _editSystem.undo();
+      expect(spy).to.have.been.called;
+    });
+
+    it('emits a change event', () => {
+      _editSystem.perform(actionNoop());
+      _editSystem.on('change', spy);
+      const difference = _editSystem.undo();
+      expect(spy).to.have.been.calledWith(difference);
+    });
+  });
+
+  describe('#redo', () => {
+    it('returns a difference', () => {
+      expect(_editSystem.redo().changes).to.be.empty;
+    });
+
+    it('does redo into an annotated state', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.on('redone', spy);
+      _editSystem.undo();
+      _editSystem.redo();
+      expect(_editSystem.undoAnnotation()).to.equal('annotation1');
+      expect(spy).to.have.been.called;
+    });
+
+    it('does not redo into a non-annotated state', () => {
+      _editSystem.perform(actionNoop());
+      _editSystem.on('redone', spy);
+      _editSystem.undo();
+      _editSystem.redo();
+      expect(spy).not.to.have.been.called;
+    });
+
+    it('emits a change event', () => {
+      _editSystem.perform(actionNoop());
+      _editSystem.undo();
+      _editSystem.on('change', spy);
+      const difference = _editSystem.redo();
+      expect(spy).to.have.been.calledWith(difference);
+    });
+  });
+
+
+  describe('#pauseChangeDispatch / #resumeChangeDispatch', () => {
+    it('prevents change events from getting dispatched', () => {
+      _editSystem.perform(actionNoop(), 'base');
+      _editSystem.on('change', spy);
+
+      _editSystem.pauseChangeDispatch();
+
+      _editSystem.perform(actionNoop(), 'perform');
+      expect(spy).to.have.not.been.called;
+      _editSystem.replace(actionNoop(), 'replace');
+      expect(spy).to.have.not.been.called;
+      _editSystem.overwrite(actionNoop(), 'replace');
+      expect(spy).to.have.not.been.called;
+      _editSystem.undo();
+      expect(spy).to.have.not.been.called;
+      _editSystem.redo();
+      expect(spy).to.have.not.been.called;
+      _editSystem.pop();
+      expect(spy).to.have.not.been.called;
+
+      const diff = _editSystem.resumeChangeDispatch();
+      expect(spy).to.have.been.calledOnceWith(diff);
+    });
+
+    it('does nothing if resume called before pause', () => {
+      _editSystem.perform(actionNoop(), 'base');
+      _editSystem.on('change', spy);
+
+      _editSystem.resumeChangeDispatch();
+      expect(spy).to.have.not.been.called;
+    });
+
+    it('uses earliest difference if pause called multiple times', () => {
+      _editSystem.perform(actionNoop(), 'base');
+      _editSystem.on('change', spy);
+
+      _editSystem.pauseChangeDispatch();
+      _editSystem.perform(actionAddNode('a'), 'perform');
+
+      _editSystem.pauseChangeDispatch();
+      _editSystem.perform(actionAddNode('b'), 'perform');
+
+      const diff = _editSystem.resumeChangeDispatch();
+      expect(spy).to.have.been.calledOnceWith(diff);
+      expect(diff.changes).to.have.all.keys('a', 'b');
+    });
+  });
+
+
+  describe('#changes', () => {
+    it('includes created entities', () => {
+      const node = Rapid.osmNode();
+      _editSystem.perform(graph => { return graph.replace(node); });
+      expect(_editSystem.changes().created).to.eql([node]);
+    });
+
+    it('includes modified entities', () => {
+      const node1 = Rapid.osmNode({id: 'n1'});
+      const node2 = node1.update({ tags: { yes: 'no' } });
+      _editSystem.merge([node1]);
+      _editSystem.perform(graph => { return graph.replace(node2); });
+      expect(_editSystem.changes().modified).to.eql([node2]);
+    });
+
+    it('includes deleted entities', () => {
+      const node = Rapid.osmNode({id: 'n1'});
+      _editSystem.merge([node]);
+      _editSystem.perform(graph => { return graph.remove(node); });
+      expect(_editSystem.changes().deleted).to.eql([node]);
+    });
+  });
+
+
+  describe('#hasChanges', () => {
+    it('is true when any of change\'s values are nonempty', () => {
+      const node = Rapid.osmNode();
+      _editSystem.perform(graph => { return graph.replace(node); });
+      expect(_editSystem.hasChanges()).to.eql(true);
+    });
+
+    it('is false when all of change\'s values are empty', () => {
+      expect(_editSystem.hasChanges()).to.eql(false);
+    });
+  });
+
+
+  describe('checkpoints', () => {
+    it('saves and resets to checkpoints', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.perform(actionNoop(), 'annotation2');
+      _editSystem.perform(actionNoop(), 'annotation3');
+      _editSystem.setCheckpoint('check1');
+      _editSystem.perform(actionNoop(), 'annotation4');
+      _editSystem.perform(actionNoop(), 'annotation5');
+      _editSystem.setCheckpoint('check2');
+      _editSystem.perform(actionNoop(), 'annotation6');
+      _editSystem.perform(actionNoop(), 'annotation7');
+      _editSystem.perform(actionNoop(), 'annotation8');
+
+      _editSystem.resetToCheckpoint('check1');
+      expect(_editSystem.undoAnnotation()).to.equal('annotation3');
+
+      _editSystem.resetToCheckpoint('check2');
+      expect(_editSystem.undoAnnotation()).to.equal('annotation5');
+
+      _editSystem.resetToCheckpoint('check1');
+      expect(_editSystem.undoAnnotation()).to.equal('annotation3');
+    });
+
+    it('emits a change event', () => {
+      _editSystem.perform(actionNoop(), 'annotation1');
+      _editSystem.setCheckpoint('check1');
+      _editSystem.perform(actionNoop(), 'annotation2');
+
+      _editSystem.on('change', spy);
+      _editSystem.resetToCheckpoint('check1');
+      expect(spy).to.have.been.called;
+    });
+  });
+
+
+  describe('#toJSON', () => {
+    it('doesn\'t generate unsaveable changes', () => {
+      _editSystem.perform(actionAddNode('n-1'));
+      _editSystem.perform(Rapid.actionDeleteNode('n-1'));
+      expect(_editSystem.toJSON()).to.be.not.ok;
+    });
+
+    it('generates v3 JSON', () => {
+      const node_1 = Rapid.osmNode({id: 'n-1'});
+      const node1 = Rapid.osmNode({id: 'n1'});
+      const node2 = Rapid.osmNode({id: 'n2'});
+      const node3 = Rapid.osmNode({id: 'n3'});
+
+      const node_1_json = JSON.parse(JSON.stringify(node_1));
+      const node1_json = JSON.parse(JSON.stringify(node1));
+      const node2_json = JSON.parse(JSON.stringify(node2));
+      const node3_json = JSON.parse(JSON.stringify(node3));
+
+      _editSystem.merge([node1, node2, node3]);                  // merge base entities
+      _editSystem.perform(Rapid.actionAddEntity(node_1));           // add n-1
+      _editSystem.perform(Rapid.actionChangeTags('n2', {k: 'v'}));  // update n2
+      const node2upd = _editSystem.graph().entity('n2');
+      const node2upd_json = JSON.parse(JSON.stringify(node2upd));
+      _editSystem.perform(Rapid.actionDeleteNode('n3'));            // delete n3
+
+      const json = JSON.parse(_editSystem.toJSON());
+      expect(json.version).to.eql(3);
+
+      expect(json.entities).to.deep.include(node_1_json);     // n-1 was added
+      expect(json.entities).to.deep.include(node2upd_json);   // n2 was updated
+      expect(json.entities).to.not.include(node1_json);       // n1 was never updated
+      expect(json.entities).to.not.include(node2_json);       // n2?
+      expect(json.entities).to.not.include(node3_json);       // n3 is now deleted
+
+      // base entities - before all edits
+      expect(json.baseEntities).to.not.include(node_1_json);
+      expect(json.baseEntities).to.not.include(node1_json);     // n1 was never updated
+      expect(json.baseEntities).to.deep.include(node2_json);    // n2 is in base
+      expect(json.baseEntities).to.deep.include(node3_json);    // n3 is in base
+      expect(json.baseEntities).to.not.include(node2upd_json);
+    });
+  });
+
+
+  describe('#fromJSON', () => {
+    it('restores from v2 JSON (creation)', () => {
+      const json = {
+        version: 2,
+        entities: [{ loc: [1, 2], id: 'n-1' }],
+        stack: [
+          { },
+          { modified: ['n-1v0'], imageryUsed: ['Bing'], annotation: 'Added a point.' }
+        ],
+        nextIDs: { node: -2, way: -1, relation: -1 },
+        index: 1
+      };
+      _editSystem.fromJSON(JSON.stringify(json));
+      expect(_editSystem.graph().entity('n-1')).to.eql(Rapid.osmNode({id: 'n-1', loc: [1, 2]}));
+      expect(_editSystem.undoAnnotation()).to.eql('Added a point.');
+      expect(_editSystem.imageryUsed()).to.eql(['Bing']);
+      expect(Rapid.osmEntity.id.next).to.eql({ node: -2, way: -1, relation: -1 });
+      expect(_editSystem.difference().created().length).to.eql(1);
+    });
+
+    it('restores from v2 JSON (modification)', () => {
+      const json = {
+        version: 2,
+        entities: [ { loc: [2, 3], id: 'n1', v: 1 }],
+        stack: [
+          { },
+          { modified: ['n1v1'], imageryUsed: ['Bing'], annotation: 'Moved a point.' }
+        ],
+        nextIDs: { node: -2, way: -1, relation: -1 },
+        index: 1
+      };
+      _editSystem.fromJSON(JSON.stringify(json));
+      _editSystem.merge([Rapid.osmNode({id: 'n1'})]); // Shouldn't be necessary; flaw in v2 format (see iD#2135)
+      expect(_editSystem.graph().entity('n1')).to.eql(Rapid.osmNode({ id: 'n1', loc: [2, 3], v: 1 }));
+      expect(_editSystem.undoAnnotation()).to.eql('Moved a point.');
+      expect(_editSystem.imageryUsed()).to.eql(['Bing']);
+      expect(Rapid.osmEntity.id.next).to.eql({ node: -2, way: -1, relation: -1 });
+      expect(_editSystem.difference().modified().length).to.eql(1);
+    });
+
+    it('restores from v2 JSON (deletion)', () => {
+      const json = {
+        version: 2,
+        entities: [],
+        stack: [
+          { },
+          { deleted: ['n1'], imageryUsed: ['Bing'], annotation: 'Deleted a point.' }
+        ],
+        nextIDs: { node: -1, way: -2, relation: -3 },
+        index: 1
+      };
+      _editSystem.fromJSON(JSON.stringify(json));
+      _editSystem.merge([Rapid.osmNode({id: 'n1'})]); // Shouldn't be necessary; flaw in v2 format (see iD#2135)
+      expect(_editSystem.graph().hasEntity('n1')).to.be.undefined;
+      expect(_editSystem.undoAnnotation()).to.eql('Deleted a point.');
+      expect(_editSystem.imageryUsed()).to.eql(['Bing']);
+      expect(Rapid.osmEntity.id.next).to.eql({ node: -1, way: -2, relation: -3 });
+      expect(_editSystem.difference().deleted().length).to.eql(1);
+    });
+
+    it('restores from v3 JSON (creation)', () => {
+      const json = {
+        version: 3,
+        entities: [{ loc: [1, 2], id: 'n-1' }],
+        baseEntities: [],
+        stack: [
+          { },
+          { modified: ['n-1v0'], imageryUsed: ['Bing'], annotation: 'Added a point.' }
+        ],
+        nextIDs: { node: -2, way: -1, relation: -1 },
+        index: 1
+      };
+      _editSystem.fromJSON(JSON.stringify(json));
+      expect(_editSystem.graph().entity('n-1')).to.eql(Rapid.osmNode({id: 'n-1', loc: [1, 2]}));
+      expect(_editSystem.undoAnnotation()).to.eql('Added a point.');
+      expect(_editSystem.imageryUsed()).to.eql(['Bing']);
+      expect(Rapid.osmEntity.id.next).to.eql({ node: -2, way: -1, relation: -1 });
+      expect(_editSystem.difference().created().length).to.eql(1);
+    });
+
+    it('restores from v3 JSON (modification)', () => {
+      const json = {
+        version: 3,
+        entities: [{ loc: [2, 3], id: 'n1', v: 1 }],
+        baseEntities: [{ loc: [1, 2], id: 'n1' }],
+        stack: [
+          { },
+          { modified: ['n1v1'], imageryUsed: ['Bing'], annotation: 'Moved a point.' }
+        ],
+        nextIDs: { node: -2, way: -1, relation: -1 },
+        index: 1
+      };
+      _editSystem.fromJSON(JSON.stringify(json));
+      expect(_editSystem.graph().entity('n1')).to.eql(Rapid.osmNode({ id: 'n1', loc: [2, 3], v: 1 }));
+      expect(_editSystem.undoAnnotation()).to.eql('Moved a point.');
+      expect(_editSystem.imageryUsed()).to.eql(['Bing']);
+      expect(Rapid.osmEntity.id.next).to.eql({ node: -2, way: -1, relation: -1 });
+      expect(_editSystem.difference().modified().length).to.eql(1);
+    });
+
+    it('restores from v3 JSON (deletion)', () => {
+      const json = {
+        version: 3,
+        entities: [],
+        baseEntities: [{ loc: [1, 2], id: 'n1' }],
+        stack: [
+          { },
+          { deleted: ['n1'], imageryUsed: ['Bing'], annotation: 'Deleted a point.' }
+        ],
+        nextIDs: { node: -1, way: -2, relation: -3 },
+        index: 1
+      };
+      _editSystem.fromJSON(JSON.stringify(json));
+      expect(_editSystem.graph().hasEntity('n1')).to.be.undefined;
+      expect(_editSystem.undoAnnotation()).to.eql('Deleted a point.');
+      expect(_editSystem.imageryUsed()).to.eql(['Bing']);
+      expect(Rapid.osmEntity.id.next).to.eql({ node: -1, way: -2, relation: -3 });
+      expect(_editSystem.difference().deleted().length).to.eql(1);
+    });
+  });
+});
diff --git a/test/spec/core/FilterSystem.test.js b/test/spec/core/FilterSystem.test.js
new file mode 100644
index 0000000000..2551f7bbc2
--- /dev/null
+++ b/test/spec/core/FilterSystem.test.js
@@ -0,0 +1,636 @@
+describe('FilterSystem', () => {
+  let _filterSystem;
+
+  class MockStorageSystem {
+    constructor() { }
+    getItem() { return ''; }
+    setItem() { }
+  }
+
+  class MockUrlHashSystem {
+    constructor() { }
+    getParam() { return ''; }
+    setParam() { }
+    on() { return this; }
+  }
+
+  class MockContext {
+    constructor()   {
+      this._storageSystem = new MockStorageSystem();
+      this._urlHashSystem = new MockUrlHashSystem();
+     }
+    storageSystem() { return this._storageSystem; }
+    urlHashSystem() { return this._urlHashSystem; }
+    hasEntity()     { return null; }
+  }
+
+
+  beforeEach(() => {
+    _filterSystem = new Rapid.FilterSystem(new MockContext());
+    _filterSystem.init();
+  });
+
+
+  it('gets keys', () => {
+    const keys = _filterSystem.keys;
+    expect(keys).to.include(
+      'points', 'traffic_roads', 'service_roads', 'paths',
+      'buildings', 'landuse', 'boundaries', 'water', 'rail',
+      'power', 'past_future', 'others'
+    );
+  });
+
+  it('disable', () => {
+    _filterSystem.disable('water');
+    expect(_filterSystem.isEnabled('water')).to.be.false;
+  });
+
+  it('disableAll', () => {
+    _filterSystem.disableAll();
+    for (const k of _filterSystem.keys) {
+      expect(_filterSystem.isEnabled(k)).to.be.false;
+    }
+  });
+
+  it('enable', () => {
+    _filterSystem.disable('water');
+    _filterSystem.enable('water');
+    expect(_filterSystem.isEnabled('water')).to.be.true;
+  });
+
+  it('enableAll', () => {
+    _filterSystem.disableAll();
+    _filterSystem.enableAll();
+    for (const k of _filterSystem.keys) {
+      expect(_filterSystem.isEnabled(k)).to.be.true;
+    }
+  });
+
+  describe('#toggle', () => {
+    it('toggles', () => {
+      _filterSystem.toggle('water');
+      expect(_filterSystem.isEnabled('water')).to.be.false;
+
+      _filterSystem.toggle('water');
+      expect(_filterSystem.isEnabled('water')).to.be.true;
+    });
+  });
+
+
+  describe('#gatherStats', () => {
+    it('counts features', () => {
+      const graph = new Rapid.Graph([
+        Rapid.osmNode({id: 'point_bar', tags: { amenity: 'bar' }, version: 1}),
+        Rapid.osmNode({id: 'point_dock', tags: { waterway: 'dock' }, version: 1}),
+        Rapid.osmNode({id: 'point_rail_station', tags: { railway: 'station' }, version: 1}),
+        Rapid.osmNode({id: 'point_generator', tags: { power: 'generator' }, version: 1}),
+        Rapid.osmNode({id: 'point_old_rail_station', tags: { railway: 'station', disused: 'yes' }, version: 1}),
+        Rapid.osmWay({id: 'motorway', tags: { highway: 'motorway' }, version: 1}),
+        Rapid.osmWay({id: 'building_yes', tags: { area: 'yes', amenity: 'school', building: 'yes' }, version: 1}),
+        Rapid.osmWay({id: 'boundary', tags: { boundary: 'administrative' }, version: 1}),
+        Rapid.osmWay({id: 'fence', tags: { barrier: 'fence' }, version: 1})
+      ]);
+      const all = [...graph.base.entities.values()];
+
+      _filterSystem.gatherStats(all, graph);
+      const stats = _filterSystem.stats();
+
+      expect(stats.boundaries).to.eql(1);
+      expect(stats.buildings).to.eql(1);
+      expect(stats.landuse).to.eql(0);
+      expect(stats.traffic_roads).to.eql(1);
+      expect(stats.service_roads).to.eql(0);
+      expect(stats.others).to.eql(1);
+      expect(stats.past_future).to.eql(1);
+      expect(stats.paths).to.eql(0);
+      expect(stats.points).to.eql(5);
+      expect(stats.power).to.eql(1);
+      expect(stats.rail).to.eql(2);
+      expect(stats.water).to.eql(1);
+    });
+  });
+
+
+  describe('matching', () => {
+    const graph = new Rapid.Graph([
+      // Points
+      Rapid.osmNode({id: 'point_bar', tags: {amenity: 'bar'}, version: 1}),
+      Rapid.osmNode({id: 'point_dock', tags: {waterway: 'dock'}, version: 1}),
+      Rapid.osmNode({id: 'point_rail_station', tags: {railway: 'station'}, version: 1}),
+      Rapid.osmNode({id: 'point_generator', tags: {power: 'generator'}, version: 1}),
+      Rapid.osmNode({id: 'point_old_rail_station', tags: {railway: 'station', disused: 'yes'}, version: 1}),
+
+      // Traffic Roads
+      Rapid.osmWay({id: 'motorway', tags: {highway: 'motorway'}, version: 1}),
+      Rapid.osmWay({id: 'motorway_link', tags: {highway: 'motorway_link'}, version: 1}),
+      Rapid.osmWay({id: 'trunk', tags: {highway: 'trunk'}, version: 1}),
+      Rapid.osmWay({id: 'trunk_link', tags: {highway: 'trunk_link'}, version: 1}),
+      Rapid.osmWay({id: 'primary', tags: {highway: 'primary'}, version: 1}),
+      Rapid.osmWay({id: 'primary_link', tags: {highway: 'primary_link'}, version: 1}),
+      Rapid.osmWay({id: 'secondary', tags: {highway: 'secondary'}, version: 1}),
+      Rapid.osmWay({id: 'secondary_link', tags: {highway: 'secondary_link'}, version: 1}),
+      Rapid.osmWay({id: 'tertiary', tags: {highway: 'tertiary'}, version: 1}),
+      Rapid.osmWay({id: 'tertiary_link', tags: {highway: 'tertiary_link'}, version: 1}),
+      Rapid.osmWay({id: 'residential', tags: {highway: 'residential'}, version: 1}),
+      Rapid.osmWay({id: 'unclassified', tags: {highway: 'unclassified'}, version: 1}),
+      Rapid.osmWay({id: 'living_street', tags: {highway: 'living_street'}, version: 1}),
+
+      // Service Roads
+      Rapid.osmWay({id: 'service', tags: {highway: 'service'}, version: 1}),
+      Rapid.osmWay({id: 'road', tags: {highway: 'road'}, version: 1}),
+      Rapid.osmWay({id: 'track', tags: {highway: 'track'}, version: 1}),
+
+      // Paths
+      Rapid.osmWay({id: 'path', tags: {highway: 'path'}, version: 1}),
+      Rapid.osmWay({id: 'footway', tags: {highway: 'footway'}, version: 1}),
+      Rapid.osmWay({id: 'cycleway', tags: {highway: 'cycleway'}, version: 1}),
+      Rapid.osmWay({id: 'bridleway', tags: {highway: 'bridleway'}, version: 1}),
+      Rapid.osmWay({id: 'steps', tags: {highway: 'steps'}, version: 1}),
+      Rapid.osmWay({id: 'pedestrian', tags: {highway: 'pedestrian'}, version: 1}),
+
+      // Buildings
+      Rapid.osmWay({id: 'building_yes', tags: {area: 'yes', amenity: 'school', building: 'yes'}, version: 1}),
+      Rapid.osmWay({id: 'building_no', tags: {area: 'yes', amenity: 'school', building: 'no'}, version: 1}),
+      Rapid.osmWay({id: 'building_part', tags: { 'building:part': 'yes'}, version: 1}),
+      Rapid.osmWay({id: 'garage1', tags: {area: 'yes', amenity: 'parking', parking: 'multi-storey'}, version: 1}),
+      Rapid.osmWay({id: 'garage2', tags: {area: 'yes', amenity: 'parking', parking: 'sheds'}, version: 1}),
+      Rapid.osmWay({id: 'garage3', tags: {area: 'yes', amenity: 'parking', parking: 'carports'}, version: 1}),
+      Rapid.osmWay({id: 'garage4', tags: {area: 'yes', amenity: 'parking', parking: 'garage_boxes'}, version: 1}),
+
+      // Indoor
+      Rapid.osmWay({id: 'room', tags: {area: 'yes', indoor: 'room'}, version: 1}),
+      Rapid.osmWay({id: 'indoor_area', tags: {area: 'yes', indoor: 'area'}, version: 1}),
+      Rapid.osmWay({id: 'indoor_bar', tags: {area: 'yes', indoor: 'room', amenity: 'bar'}, version: 1}),
+      Rapid.osmWay({id: 'corridor', tags: {highway: 'corridor', indoor: 'yes'}, version: 1}),
+
+      // Pistes
+      Rapid.osmWay({id: 'downhill_piste', tags: {'piste:type': 'downhill'}, version: 1}),
+      Rapid.osmWay({id: 'piste_track_combo', tags: {'piste:type': 'alpine', highway: 'track'}, version: 1}),
+
+      // Aerialways
+      Rapid.osmWay({id: 'gondola', tags: {aerialway: 'gondola'}, version: 1}),
+      Rapid.osmWay({id: 'zip_line', tags: {aerialway: 'zip_line'}, version: 1}),
+      Rapid.osmWay({id: 'aerialway_platform', tags: {public_transport: 'platform', aerialway: 'yes'}, version: 1}),
+      Rapid.osmWay({id: 'old_aerialway_station', tags: {area: 'yes', aerialway: 'station'}, version: 1}),
+
+      // Landuse
+      Rapid.osmWay({id: 'forest', tags: {area: 'yes', landuse: 'forest'}, version: 1}),
+      Rapid.osmWay({id: 'scrub', tags: {area: 'yes', natural: 'scrub'}, version: 1}),
+      Rapid.osmWay({id: 'industrial', tags: {area: 'yes', landuse: 'industrial'}, version: 1}),
+      Rapid.osmWay({id: 'parkinglot', tags: {area: 'yes', amenity: 'parking', parking: 'surface'}, version: 1}),
+
+      // Landuse Multipolygon
+      Rapid.osmWay({id: 'outer', version: 1}),
+      Rapid.osmWay({id: 'inner1', version: 1}),
+      Rapid.osmWay({id: 'inner2', tags: {barrier: 'fence'}, version: 1}),
+      Rapid.osmWay({id: 'inner3', tags: {highway: 'residential'}, version: 1}),
+      Rapid.osmRelation({id: 'retail', tags: {landuse: 'retail', type: 'multipolygon'},
+        members: [
+          {id: 'outer', role: 'outer', type: 'way'},
+          {id: 'inner1', role: 'inner', type: 'way'},
+          {id: 'inner2', role: 'inner', type: 'way'},
+          {id: 'inner3', role: 'inner', type: 'way'}
+        ],
+        version: 1
+      }),
+
+      // Boundaries
+      Rapid.osmWay({id: 'boundary', tags: {boundary: 'administrative'}, version: 1}),
+      Rapid.osmWay({id: 'boundary_road', tags: {boundary: 'administrative', highway: 'primary'}, version: 1}),
+      Rapid.osmWay({id: 'boundary_member', version: 1}),
+      Rapid.osmWay({id: 'boundary_member2', version: 1}),
+
+      // Boundary relations
+      Rapid.osmRelation({id: 'boundary_relation', tags: {type: 'boundary', boundary: 'administrative'},
+        members: [
+          {id: 'boundary_member'},
+        ],
+        version: 1
+      }),
+      Rapid.osmRelation({id: 'boundary_relation2', tags: {type: 'boundary', boundary: 'administrative'},
+        members: [
+          // ways can be members of multiple boundary relations
+          {id: 'boundary_member'},
+          {id: 'boundary_member2'}
+        ],
+        version: 1
+      }),
+
+      // Water
+      Rapid.osmWay({id: 'water', tags: {area: 'yes', natural: 'water'}, version: 1}),
+      Rapid.osmWay({id: 'coastline', tags: {natural: 'coastline'}, version: 1}),
+      Rapid.osmWay({id: 'bay', tags: {area: 'yes', natural: 'bay'}, version: 1}),
+      Rapid.osmWay({id: 'pond', tags: {area: 'yes', landuse: 'pond'}, version: 1}),
+      Rapid.osmWay({id: 'basin', tags: {area: 'yes', landuse: 'basin'}, version: 1}),
+      Rapid.osmWay({id: 'reservoir', tags: {area: 'yes', landuse: 'reservoir'}, version: 1}),
+      Rapid.osmWay({id: 'salt_pond', tags: {area: 'yes', landuse: 'salt_pond'}, version: 1}),
+      Rapid.osmWay({id: 'river', tags: {waterway: 'river'}, version: 1}),
+
+      // Rail
+      Rapid.osmWay({id: 'railway', tags: {railway: 'rail'}, version: 1}),
+      Rapid.osmWay({id: 'rail_landuse', tags: {area: 'yes', landuse: 'railway'}, version: 1}),
+      Rapid.osmWay({id: 'rail_disused', tags: {railway: 'disused'}, version: 1}),
+      Rapid.osmWay({id: 'rail_streetcar', tags: {railway: 'tram', highway: 'residential'}, version: 1}),
+      Rapid.osmWay({id: 'rail_trail', tags: {railway: 'disused', highway: 'cycleway'}, version: 1}),
+
+      // Power
+      Rapid.osmWay({id: 'power_line', tags: {power: 'line'}, version: 1}),
+
+      // Past/Future
+      Rapid.osmWay({id: 'motorway_construction', tags: {highway: 'construction', construction: 'motorway'}, version: 1}),
+      Rapid.osmWay({id: 'cycleway_proposed', tags: {highway: 'proposed', proposed: 'cycleway'}, version: 1}),
+      Rapid.osmWay({id: 'landuse_construction', tags: {area: 'yes', landuse: 'construction'}, version: 1}),
+
+      // Others
+      Rapid.osmWay({id: 'fence', tags: {barrier: 'fence'}, version: 1}),
+      Rapid.osmWay({id: 'pipeline', tags: {man_made: 'pipeline'}, version: 1}),
+
+      // Site relation
+      Rapid.osmRelation({id: 'site', tags: {type: 'site'},
+        members: [
+          {id: 'fence', role: 'perimeter'},
+          {id: 'building_yes'}
+        ],
+        version: 1
+      })
+
+    ]);
+
+    const all = [...graph.base.entities.values()];
+
+
+    function doMatch(rule, ids) {
+      for (const id of ids) {
+        const entity = graph.entity(id);
+        const geometry = entity.geometry(graph);
+        expect(_filterSystem.getMatches(entity, graph, geometry), `doMatch: ${id}`)
+          .to.have.property(rule);
+      }
+    }
+
+    function dontMatch(rule, ids) {
+      for (const id of ids) {
+        const entity = graph.entity(id);
+        const geometry = entity.geometry(graph);
+        expect(_filterSystem.getMatches(entity, graph, geometry), `dontMatch: ${id}`)
+          .not.to.have.property(rule);
+      }
+    }
+
+
+    it('matches points', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('points', [
+        'point_bar', 'point_dock', 'point_rail_station',
+        'point_generator', 'point_old_rail_station'
+      ]);
+
+      dontMatch('points', [
+        'motorway', 'service', 'path', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches traffic roads', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('traffic_roads', [
+        'motorway', 'motorway_link', 'trunk', 'trunk_link',
+        'primary', 'primary_link', 'secondary', 'secondary_link',
+        'tertiary', 'tertiary_link', 'residential', 'living_street',
+        'unclassified', 'boundary_road', 'inner3'
+      ]);
+
+      dontMatch('traffic_roads', [
+        'point_bar', 'service', 'road', 'track', 'path', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches service roads', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('service_roads', [
+        'service', 'road', 'track', 'piste_track_combo'
+      ]);
+
+      dontMatch('service_roads', [
+        'point_bar', 'motorway', 'unclassified', 'living_street',
+        'path', 'building_yes', 'forest', 'boundary', 'boundary_member', 'water',
+        'railway', 'power_line', 'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches paths', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('paths', [
+        'path', 'footway', 'cycleway', 'bridleway',
+        'steps', 'pedestrian'
+      ]);
+
+      dontMatch('paths', [
+        'point_bar', 'motorway', 'service', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence', 'corridor'
+      ]);
+    });
+
+
+    it('matches buildings', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('buildings', [
+        'building_yes',
+        'garage1', 'garage2', 'garage3', 'garage4'
+      ]);
+
+      dontMatch('buildings', [
+        'building_no', 'point_bar', 'motorway', 'service', 'path',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches building_parts', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('building_parts', [
+        'building_part'
+      ]);
+
+      dontMatch('building_parts', [
+        'building_yes',
+        'garage1', 'garage2', 'garage3', 'garage4',
+        'building_no', 'point_bar', 'motorway', 'service', 'path',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches indoor', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('indoor', [
+        'room', 'indoor_area', 'indoor_bar', 'corridor'
+      ]);
+
+      dontMatch('indoor', [
+        'downhill_piste', 'piste_track_combo',
+        'building_part', 'garage1', 'garage2', 'garage3', 'garage4',
+        'building_no', 'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence',
+        'inner3', 'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
+        'rail_landuse', 'landuse_construction', 'retail',
+        'outer', 'inner1', 'inner2'
+      ]);
+    });
+
+
+    it('matches pistes', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('pistes', [
+        'downhill_piste', 'piste_track_combo'
+      ]);
+
+      dontMatch('pistes', [
+        'room', 'indoor_area', 'indoor_bar', 'corridor',
+        'building_part', 'garage1', 'garage2', 'garage3', 'garage4',
+        'building_no', 'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence',
+        'inner3', 'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
+        'rail_landuse', 'landuse_construction', 'retail',
+        'outer', 'inner1', 'inner2'
+      ]);
+    });
+
+
+    it('matches aerialways', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('aerialways', [
+        'gondola', 'zip_line'
+      ]);
+
+      dontMatch('aerialways', [
+        'aerialway_platform', 'old_aerialway_station',
+
+        'downhill_piste', 'piste_track_combo',
+        'room', 'indoor_area', 'indoor_bar', 'corridor',
+        'building_part', 'garage1', 'garage2', 'garage3', 'garage4',
+        'building_no', 'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence',
+        'inner3', 'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
+        'rail_landuse', 'landuse_construction', 'retail',
+        'outer', 'inner1', 'inner2'
+      ]);
+    });
+
+
+    it('matches landuse', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('landuse', [
+        'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
+        'rail_landuse', 'landuse_construction', 'retail',
+        'outer', 'inner1', 'inner2'  // non-interesting members of landuse multipolygon
+      ]);
+
+      dontMatch('landuse', [
+        'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence',
+        'inner3'   // member of landuse multipolygon, but tagged as highway
+      ]);
+    });
+
+
+    it('matches boundaries', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('boundaries', [
+        'boundary',
+        // match ways that are part of boundary relations - #5601
+        'boundary_member', 'boundary_member2',
+        // relations
+        'boundary_relation', 'boundary_relation2'
+      ]);
+
+      dontMatch('boundaries', [
+        'boundary_road',   // because boundary also used as highway - #4973
+        'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'forest', 'water', 'railway', 'power_line',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches water', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('water', [
+        'point_dock', 'water', 'coastline', 'bay', 'pond',
+        'basin', 'reservoir', 'salt_pond', 'river'
+      ]);
+
+      dontMatch('water', [
+        'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'railway', 'power_line',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches rail', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('rail', [
+        'point_rail_station', 'point_old_rail_station',
+        'railway', 'rail_landuse', 'rail_disused'
+      ]);
+
+      dontMatch('rail', [
+        'rail_streetcar', 'rail_trail',  // because rail also used as highway
+        'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'water', 'power_line',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches power', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('power', [
+        'point_generator', 'power_line'
+      ]);
+
+      dontMatch('power', [
+        'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway',
+        'motorway_construction', 'fence'
+      ]);
+    });
+
+
+    it('matches past/future', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('past_future', [
+        'point_old_rail_station', 'rail_disused',
+        'motorway_construction', 'cycleway_proposed', 'landuse_construction'
+      ]);
+
+      dontMatch('past_future', [
+        'rail_trail',  // because rail also used as highway
+        'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line', 'fence'
+      ]);
+    });
+
+
+    it('matches others', () => {
+      _filterSystem.gatherStats(all, graph);
+
+      doMatch('others', [
+        'fence', 'pipeline'
+      ]);
+
+      dontMatch('others', [
+        'point_bar', 'motorway', 'service', 'path', 'building_yes',
+        'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
+        'motorway_construction', 'retail', 'outer', 'inner1', 'inner2', 'inner3'
+      ]);
+    });
+  });
+
+
+  describe('hiding', () => {
+    it('hides child vertices on a hidden way', () => {
+      const a = Rapid.osmNode({id: 'a', version: 1});
+      const b = Rapid.osmNode({id: 'b', version: 1});
+      const w = Rapid.osmWay({id: 'w', nodes: [a.id, b.id], tags: { highway: 'path' }, version: 1});
+      const graph = new Rapid.Graph([a, b, w]);
+      const geometry = a.geometry(graph);
+      const all = [...graph.base.entities.values()];
+
+      _filterSystem.disable('paths');
+      _filterSystem.gatherStats(all, graph);
+
+      expect(_filterSystem.isHiddenChild(a, graph, geometry)).to.be.true;
+      expect(_filterSystem.isHiddenChild(b, graph, geometry)).to.be.true;
+      expect(_filterSystem.isHidden(a, graph, geometry)).to.be.true;
+      expect(_filterSystem.isHidden(b, graph, geometry)).to.be.true;
+    });
+
+    it('hides uninteresting (e.g. untagged or "other") member ways on a hidden multipolygon relation', () => {
+      const outer = Rapid.osmWay({id: 'outer', tags: {area: 'yes', natural: 'wood'}, version: 1});
+      const inner1 = Rapid.osmWay({id: 'inner1', tags: {barrier: 'fence'}, version: 1});
+      const inner2 = Rapid.osmWay({id: 'inner2', version: 1});
+      const inner3 = Rapid.osmWay({id: 'inner3', tags: {highway: 'residential'}, version: 1});
+      const r = Rapid.osmRelation({
+        id: 'r',
+        tags: {type: 'multipolygon'},
+        members: [
+          {id: outer.id, role: 'outer', type: 'way'},
+          {id: inner1.id, role: 'inner', type: 'way'},
+          {id: inner2.id, role: 'inner', type: 'way'},
+          {id: inner3.id, role: 'inner', type: 'way'}
+        ],
+        version: 1
+      });
+      const graph = new Rapid.Graph([outer, inner1, inner2, inner3, r]);
+      const all = [...graph.base.entities.values()];
+
+      _filterSystem.disable('landuse');
+      _filterSystem.gatherStats(all, graph);
+
+      expect(_filterSystem.isHidden(outer, graph, outer.geometry(graph))).to.be.true;     // iD#2548
+      expect(_filterSystem.isHidden(inner1, graph, inner1.geometry(graph))).to.be.true;   // iD#2548
+      expect(_filterSystem.isHidden(inner2, graph, inner2.geometry(graph))).to.be.true;   // iD#2548
+      expect(_filterSystem.isHidden(inner3, graph, inner3.geometry(graph))).to.be.false;  // iD#2887
+    });
+
+    it('hides only versioned entities', () => {
+      const a = Rapid.osmNode({id: 'a', version: 1});
+      const b = Rapid.osmNode({id: 'b'});
+      const graph = new Rapid.Graph([a, b]);
+      const ageo = a.geometry(graph);
+      const bgeo = b.geometry(graph);
+      const all = [...graph.base.entities.values()];
+
+      _filterSystem.disable('points');
+      _filterSystem.gatherStats(all, graph);
+
+      expect(_filterSystem.isHidden(a, graph, ageo)).to.be.true;
+      expect(_filterSystem.isHidden(b, graph, bgeo)).to.be.false;
+    });
+
+    it('shows a hidden entity if forceVisible', () => {
+      const a = Rapid.osmNode({id: 'a', version: 1});
+      const graph = new Rapid.Graph([a]);
+      const ageo = a.geometry(graph);
+      const all = [...graph.base.entities.values()];
+
+      _filterSystem.disable('points');
+      _filterSystem.gatherStats(all, graph);
+      _filterSystem.forceVisible(['a']);
+
+      expect(_filterSystem.isHidden(a, graph, ageo)).to.be.false;
+    });
+
+  });
+
+});
diff --git a/test/spec/core/LocalizationSystem.test.js b/test/spec/core/LocalizationSystem.test.js
new file mode 100644
index 0000000000..45ea349438
--- /dev/null
+++ b/test/spec/core/LocalizationSystem.test.js
@@ -0,0 +1,109 @@
+describe('LocalizationSystem', () => {
+  let _l10n;
+
+  class MockContext {
+    constructor() {}
+  }
+
+  const context = new MockContext();
+
+
+  beforeEach(() => {
+    _l10n = new Rapid.LocalizationSystem(context);
+    _l10n._cache = {
+      general: {
+        en: {
+          inspector: {
+            display_name: {
+              network_ref_name: '{network} {ref}: {name}',
+              ref_name: '{ref}: {name}',
+              direction: '{direction}',
+              network: '{network}',
+              from_to: 'from {from} to {to}',
+              from_to_via: 'from {from} to {to} via {via}',
+              network_direction: '{network} {direction}',
+              network_from_to: '{network} from {from} to {to}',
+              network_from_to_via: '{network} from {from} to {to} via {via}',
+              ref: '{ref}',
+              ref_direction: '{ref} {direction}',
+              ref_from_to: '{ref} from {from} to {to}',
+              ref_from_to_via: '{ref} from {from} to {to} via {via}',
+              network_ref: '{network} {ref}',
+              network_ref_direction: '{network} {ref} {direction}',
+              network_ref_from_to: '{network} {ref} from {from} to {to}',
+              network_ref_from_to_via: '{network} {ref} from {from} to {to} via {via}'
+            }
+          }
+        }
+      }
+    };
+  });
+
+
+  describe('#displayName', () => {
+    it('returns the name if tagged with a name', () => {
+      const entity = { tags: { name: 'East Coast Greenway' }};
+      expect(_l10n.displayName(entity)).to.eql('East Coast Greenway');
+    });
+
+    it('returns just the name for non-routes', () => {
+      const entity = { tags: { name: 'Abyssinian Room', ref: '260-115' }};
+      expect(_l10n.displayName(entity)).to.eql('Abyssinian Room');
+    });
+
+    it('returns the name and the ref for routes', () => {
+      const entity1 = { tags: { name: 'Lynfield Express', ref: '25L', route: 'bus' }};
+      expect(_l10n.displayName(entity1)).to.eql('25L: Lynfield Express');
+      const entity2 = { tags: { name: 'Kāpiti Expressway', ref: 'SH1', route: 'road' }};
+      expect(_l10n.displayName(entity2)).to.eql('SH1: Kāpiti Expressway');
+    });
+
+    it('returns the name, ref, and network for routes', () => {
+      const entity = { tags: { name: 'Lynfield Express', ref: '25L', network: 'AT', route: 'bus' }};
+      expect(_l10n.displayName(entity)).to.eql('AT 25L: Lynfield Express');
+    });
+
+    it('does not use the network tag if the hideNetwork argument is true', () => {
+      const entity1 = { tags: { name: 'Lynfield Express', ref: '25L', network: 'AT', route: 'bus' }};
+      expect(_l10n.displayName(entity1, true)).to.eql('25L: Lynfield Express');
+      const entity2 = { tags: { network: 'SORTA', ref: '3X' }};
+      expect(_l10n.displayName(entity2, true)).to.eql('3X');
+    });
+
+    it('distinguishes unnamed features by ref', () => {
+      const entity = { tags: { ref: '66' }};
+      expect(_l10n.displayName(entity)).to.eql('66');
+    });
+
+    it('distinguishes unnamed features by network or cycle_network', () => {
+      const entity1 = { tags: { network: 'SORTA', ref: '3X' }};
+      expect(_l10n.displayName(entity1)).to.eql('SORTA 3X');
+      const entity2 = { tags: { network: 'ncn', cycle_network: 'US:US', ref: '76' }};
+      expect(_l10n.displayName(entity2)).to.eql('US:US 76');
+    });
+
+    it('distinguishes unnamed routes by direction', () => {
+      const entity1 = { tags: { network: 'US:US', ref: '66', direction: 'west', route: 'road' }};
+      expect(_l10n.displayName(entity1)).to.eql('US:US 66 west');
+      const entity2 = { tags: { network: 'Marguerite', ref: 'X', direction: 'anticlockwise', route: 'bus' }};
+      expect(_l10n.displayName(entity2)).to.eql('Marguerite X anticlockwise');
+    });
+
+    it('distinguishes unnamed routes by waypoints', () => {
+      const entity1 = { tags: { network: 'SORTA', ref: '3X', from: 'Downtown', route: 'bus' }};
+      expect(_l10n.displayName(entity1)).to.eql('SORTA 3X');
+      const entity2 = { tags: { network: 'SORTA', ref: '3X', to: 'Kings Island', route: 'bus' }};
+      expect(_l10n.displayName(entity2)).to.eql('SORTA 3X');
+      const entity3 = { tags: {network: 'SORTA', ref: '3X', via: 'Montgomery', route: 'bus' }};
+      expect(_l10n.displayName(entity3)).to.eql('SORTA 3X');
+
+      // Green Line: Old Ironsides => Winchester
+      const entity4 = { tags: { network: 'VTA', ref: 'Green', from: 'Old Ironsides', to: 'Winchester', route: 'bus' }};
+      expect(_l10n.displayName(entity4)).to.eql('VTA Green from Old Ironsides to Winchester');
+
+      // BART Yellow Line: Antioch => Pittsburg/Bay Point => SFO Airport => Millbrae
+      const entity5 = { tags: { network: 'BART', ref: 'Yellow', from: 'Antioch', to: 'Millbrae', via: 'Pittsburg/Bay Point;San Francisco International Airport', route: 'subway' }};
+      expect(_l10n.displayName(entity5)).to.eql('BART Yellow from Antioch to Millbrae via Pittsburg/Bay Point;San Francisco International Airport');
+    });
+  });
+});
diff --git a/test/spec/core/LocationManager.test.js b/test/spec/core/LocationSystem.test.js
similarity index 62%
rename from test/spec/core/LocationManager.test.js
rename to test/spec/core/LocationSystem.test.js
index 5280af91ee..f9039c979b 100644
--- a/test/spec/core/LocationManager.test.js
+++ b/test/spec/core/LocationSystem.test.js
@@ -1,5 +1,5 @@
-describe('LocationManager', () => {
-  let locationManager;
+describe('LocationSystem', () => {
+  let _locationSystem;
 
   const colorado = {
     type: 'Feature',
@@ -24,22 +24,22 @@ describe('LocationManager', () => {
 
 
   beforeEach(() => {
-    // make a new one each time, so we aren't accidentally testing the "global" locationManager
-    locationManager = new Rapid.LocationManager();
+    _locationSystem = new Rapid.LocationSystem();
   });
 
 
   describe('#mergeCustomGeoJSON', () => {
     it('merges geojson into lococation-conflation cache', () => {
-      locationManager.mergeCustomGeoJSON(fc);
-      expect(locationManager.loco()._cache['colorado.geojson']).to.be.eql(colorado);
+      _locationSystem.mergeCustomGeoJSON(fc);
+      expect(_locationSystem.loco()._cache['colorado.geojson']).to.be.eql(colorado);
     });
   });
 
 
   describe('#mergeLocationSets', () => {
     it('returns a promise rejected if not passed an array', done => {
-      const prom = locationManager.mergeLocationSets({});
+      const prom = _locationSystem.mergeLocationSets({});
+      expect(prom).to.be.an.instanceof(Promise);
       prom
         .then(() => {
           done(new Error('This was supposed to fail, but somehow succeeded.'));
@@ -48,70 +48,58 @@ describe('LocationManager', () => {
           expect(/^nothing to do/.test(err)).to.be.true;
           done();
         });
-
-      window.setTimeout(() => {}, 20);  // async - to let the promise settle in phantomjs
     });
 
-    it('resolves locationSets, assigning locationSetID', done => {
+    it('resolves locationSets, assigning locationSetID', () => {
       const data = [
         { id: 'world', locationSet: { include: ['001'] } },
         { id: 'usa',   locationSet: { include: ['usa'] } }
       ];
 
-      const prom = locationManager.mergeLocationSets(data);
-      prom
+      return _locationSystem.mergeLocationSets(data)
         .then(data => {
           expect(data).to.be.a('array');
           expect(data[0].locationSetID).to.eql('+[Q2]');
           expect(data[1].locationSetID).to.eql('+[Q30]');
-          done();
-        })
-        .catch(err => done(err));
-
-      window.setTimeout(() => {}, 20); // async - to let the promise settle in phantomjs
+        });
     });
 
-    it('resolves locationSets, falls back to world locationSetID on errror', done => {
+    it('resolves locationSets, falls back to world locationSetID on errror', () => {
       const data = [
         { id: 'bogus1', locationSet: { foo: 'bar' } },
         { id: 'bogus2', locationSet: { include: ['fake.geojson'] } }
       ];
 
-      const prom = locationManager.mergeLocationSets(data);
-      prom
+      return _locationSystem.mergeLocationSets(data)
         .then(data => {
           expect(data).to.be.a('array');
           expect(data[0].locationSetID).to.eql('+[Q2]');
           expect(data[1].locationSetID).to.eql('+[Q2]');
-          done();
-        })
-        .catch(err => done(err));
-
-      window.setTimeout(() => {}, 20); // async - to let the promise settle in phantomjs
+        });
     });
   });
 
 
   describe('#locationSetID', () => {
     it('calculates a locationSetID for a locationSet', () => {
-      expect(locationManager.locationSetID({ include: ['usa'] })).to.be.eql('+[Q30]');
+      expect(_locationSystem.locationSetID({ include: ['usa'] })).to.be.eql('+[Q30]');
     });
 
     it('falls back to the world locationSetID in case of errors', () => {
-      expect(locationManager.locationSetID({ foo: 'bar' })).to.be.eql('+[Q2]');
-      expect(locationManager.locationSetID({ include: ['fake.geojson'] })).to.be.eql('+[Q2]');
+      expect(_locationSystem.locationSetID({ foo: 'bar' })).to.be.eql('+[Q2]');
+      expect(_locationSystem.locationSetID({ include: ['fake.geojson'] })).to.be.eql('+[Q2]');
     });
   });
 
 
   describe('#feature', () => {
     it('has the world locationSet pre-resolved', () => {
-      const result = locationManager.feature('+[Q2]');
+      const result = _locationSystem.feature('+[Q2]');
       expect(result).to.include({ type: 'Feature', id: '+[Q2]' });
     });
 
     it('falls back to the world locationSetID in case of errors', () => {
-      const result = locationManager.feature('fake');
+      const result = _locationSystem.feature('fake');
       expect(result).to.include({ type: 'Feature', id: '+[Q2]' });
     });
   });
@@ -119,34 +107,31 @@ describe('LocationManager', () => {
 
   describe('#locationSetsAt', () => {
     it('has the world locationSet pre-resolved', () => {
-      const result1 = locationManager.locationSetsAt([-108.557, 39.065]);  // Grand Junction
+      const result1 = _locationSystem.locationSetsAt([-108.557, 39.065]);  // Grand Junction
       expect(result1).to.be.an('object').that.has.all.keys('+[Q2]');
-      const result2 = locationManager.locationSetsAt([-74.481, 40.797]);   // Morristown
+      const result2 = _locationSystem.locationSetsAt([-74.481, 40.797]);   // Morristown
       expect(result2).to.be.an('object').that.has.all.keys('+[Q2]');
-      const result3 = locationManager.locationSetsAt([13.575, 41.207,]);   // Gaeta
+      const result3 = _locationSystem.locationSetsAt([13.575, 41.207,]);   // Gaeta
       expect(result3).to.be.an('object').that.has.all.keys('+[Q2]');
     });
 
-    it('returns valid locationSets at a given lon,lat', done => {
+    it('returns valid locationSets at a given lon,lat', () => {
       // setup, load colorado.geojson and resolve some locationSets
-      locationManager.mergeCustomGeoJSON(fc);
-      locationManager.mergeLocationSets([
+      _locationSystem.mergeCustomGeoJSON(fc);
+      const data = [
         { id: 'OSM-World', locationSet: { include: ['001'] } },
         { id: 'OSM-USA', locationSet: { include: ['us'] } },
         { id: 'OSM-Colorado', locationSet: { include: ['colorado.geojson'] } }
-      ])
+      ];
+      return _locationSystem.mergeLocationSets(data)
         .then(() => {
-          const result1 = locationManager.locationSetsAt([-108.557, 39.065]);  // Grand Junction
+          const result1 = _locationSystem.locationSetsAt([-108.557, 39.065]);  // Grand Junction
           expect(result1).to.be.an('object').that.has.all.keys('+[Q2]', '+[Q30]', '+[colorado.geojson]');
-          const result2 = locationManager.locationSetsAt([-74.481, 40.797]);   // Morristown
+          const result2 = _locationSystem.locationSetsAt([-74.481, 40.797]);   // Morristown
           expect(result2).to.be.an('object').that.has.all.keys('+[Q2]', '+[Q30]');
-          const result3 = locationManager.locationSetsAt([13.575, 41.207,]);   // Gaeta
+          const result3 = _locationSystem.locationSetsAt([13.575, 41.207,]);   // Gaeta
           expect(result3).to.be.an('object').that.has.all.keys('+[Q2]');
-          done();
-        })
-        .catch(err => done(err));
-
-      window.setTimeout(() => {}, 20);  // async - to let the promise settle in phantomjs
+        });
     });
   });
 
diff --git a/test/spec/core/MapSystem.Test.js b/test/spec/core/MapSystem.Test.js
new file mode 100644
index 0000000000..40f6541a97
--- /dev/null
+++ b/test/spec/core/MapSystem.Test.js
@@ -0,0 +1,178 @@
+describe('MapSystem', () => {
+  let _container, _mapSystem;
+
+  class MockOn {   // an event emitter, mocks .on()
+    constructor() { }
+    on() { return this; }
+  }
+
+  class MockStorageSystem {
+    constructor() { }
+    getItem() { return ''; }
+  }
+
+  class MockLocalizationSystem {
+    constructor() { }
+    initAsync()   { return Promise.resolve(); }
+    t()           { return ''; }
+    tHtml()       { return ''; }
+  }
+
+  class MockScene {
+    constructor() { }
+    on() { return this; }
+  }
+
+  class MockRenderer {
+    constructor(context) {
+      this.context = context;
+      this.scene = new MockScene();
+    }
+    resize() {}
+    render() {}
+    deferredRender() {}
+    setTransformAsync(t) {
+      this.context.projection.transform(t);
+      return Promise.resolve(t);
+    }
+    on() { return this; }
+  }
+
+  class MockContext {
+    constructor()   {
+      this.services = new Map();
+      this.projection = new sdk.Projection();
+      this._localizationSystem = new MockLocalizationSystem();
+      this._storageSystem = new MockStorageSystem();
+      this._mockOn = new MockOn();
+    }
+    container()           { return _container; }
+    localizationSystem()  { return this._localizationSystem; }
+    storageSystem()       { return this._storageSystem; }
+    keybinding()          { return this._mockOn; }
+    editSystem()          { return this._mockOn; }
+    filterSystem()        { return this._mockOn; }
+    urlHashSystem()       { return this._mockOn; }
+  }
+
+
+  beforeEach(() => {
+    _container = d3.select('body').append('div');
+    const context = new MockContext();  // get a fresh projection each time
+    _mapSystem = new Rapid.MapSystem(context);
+    _mapSystem._renderer = new MockRenderer(context);
+    _mapSystem.init();
+    _mapSystem.render(_container);
+  });
+
+  afterEach(() => {
+    _container.remove();
+  });
+
+
+  describe('#zoom', () => {
+    it('gets and sets zoom level', () => {
+      expect(_mapSystem.zoom(4)).to.equal(_mapSystem);
+      expect(_mapSystem.zoom()).to.equal(4);
+    });
+
+    it('respects minzoom', () => {
+      _mapSystem.zoom(1);
+      expect(_mapSystem.zoom()).to.equal(2);
+    });
+  });
+
+
+  describe('#zoomIn', () => {
+    it('increments zoom', done => {
+      expect(_mapSystem.zoom(4)).to.equal(_mapSystem);
+      _mapSystem.zoomIn();
+      window.setTimeout(() => {
+        d3.timerFlush();
+        expect(_mapSystem.zoom()).to.be.closeTo(5, 1e-6);
+        done();
+      }, 1);
+    });
+  });
+
+  describe('#zoomOut', () => {
+    it('decrements zoom', done => {
+      expect(_mapSystem.zoom(4)).to.equal(_mapSystem);
+      _mapSystem.zoomOut();
+      window.setTimeout(() => {
+        d3.timerFlush();
+        expect(_mapSystem.zoom()).to.be.closeTo(3, 1e-6);
+        done();
+      }, 1);
+    });
+  });
+
+  describe('#center', () => {
+    it('gets and sets center', () => {
+      expect(_mapSystem.center([0, 0])).to.equal(_mapSystem);
+      expect(_mapSystem.center()[0]).to.be.closeTo(0, 1e-6);
+      expect(_mapSystem.center()[1]).to.be.closeTo(0, 1e-6);
+      expect(_mapSystem.center([10, 15])).to.equal(_mapSystem);
+      expect(_mapSystem.center()[0]).to.be.closeTo(10, 1e-6);
+      expect(_mapSystem.center()[1]).to.be.closeTo(15, 1e-6);
+    });
+  });
+
+  describe('#centerEase', () => {
+    it('sets center', done => {
+      expect(_mapSystem.center([10, 10])).to.equal(_mapSystem);
+      expect(_mapSystem.centerEase([20, 20], 1)).to.equal(_mapSystem);
+      window.setTimeout(() => {
+        d3.timerFlush();
+        expect(_mapSystem.center()[0]).to.be.closeTo(20, 1e-6);
+        expect(_mapSystem.center()[1]).to.be.closeTo(20, 1e-6);
+        done();
+      }, 1);
+    });
+  });
+
+  describe('#centerZoom', () => {
+    it('gets and sets center and zoom', () => {
+      expect(_mapSystem.centerZoom([20, 25], 4)).to.equal(_mapSystem);
+      expect(_mapSystem.center()[0]).to.be.closeTo(20, 1e-6);
+      expect(_mapSystem.center()[1]).to.be.closeTo(25, 1e-6);
+      expect(_mapSystem.zoom()).to.be.equal(4);
+    });
+  });
+
+  describe('#extent', () => {
+    it('gets and sets extent', () => {
+      _mapSystem.dimensions = [100,100];
+      _mapSystem.center([0, 0]);
+      let extent;
+
+      // get
+      extent = new sdk.Extent(_mapSystem.extent());
+      expect(extent.min[0]).to.be.closeTo(-17.5, 0.1);
+      expect(extent.min[1]).to.be.closeTo(-17.3, 0.1);
+      expect(extent.max[0]).to.be.closeTo(17.5, 0.1);
+      expect(extent.max[1]).to.be.closeTo(17.3, 0.1);
+
+      // set
+      _mapSystem.extent( new sdk.Extent([10, 1], [30, 1]) );
+
+      // get
+      extent = new sdk.Extent(_mapSystem.extent());
+      expect(extent.min[0]).to.be.closeTo(10, 0.1);
+      expect(extent.min[1]).to.be.closeTo(-9, 0.1);
+      expect(extent.max[0]).to.be.closeTo(30, 0.1);
+      expect(extent.max[1]).to.be.closeTo(11, 0.1);
+
+      // set
+      _mapSystem.extent( new sdk.Extent([-1, -40], [1, -20]) );
+
+      // get
+      extent = new sdk.Extent(_mapSystem.extent());
+      expect(extent.min[0]).to.be.closeTo(-11.6, 0.1);
+      expect(extent.min[1]).to.be.closeTo(-39.5, 0.1);
+      expect(extent.max[0]).to.be.closeTo(11.6, 0.1);
+      expect(extent.max[1]).to.be.closeTo(-19.4, 0.1);
+    });
+  });
+
+});
diff --git a/test/spec/core/PresetSystem.test.js b/test/spec/core/PresetSystem.test.js
new file mode 100644
index 0000000000..95303f2c41
--- /dev/null
+++ b/test/spec/core/PresetSystem.test.js
@@ -0,0 +1,271 @@
+describe('PresetSystem', () => {
+  let _savedAreaKeys;
+
+  class MockStorageSystem {
+    constructor() { }
+    getItem() { return ''; }
+  }
+
+  class MockContext {
+    constructor()   {
+      this._dataLoaderSystem = new Rapid.DataLoaderSystem(this);
+      this._locationSystem = new Rapid.LocationSystem(this);
+      this._storageSystem = new MockStorageSystem();
+     }
+    dataLoaderSystem() { return this._dataLoaderSystem; }
+    locationSystem()   { return this._locationSystem; }
+    storageSystem()    { return this._storageSystem; }
+  }
+
+  const context = new MockContext();
+
+
+  beforeEach(() => {
+    _savedAreaKeys = Rapid.osmAreaKeys;
+  });
+
+  afterEach(() => {
+    Rapid.osmSetAreaKeys(_savedAreaKeys);
+  });
+
+
+  describe('#initAsync', () => {
+    it('has a fallback point preset', () => {
+      const node = Rapid.osmNode({ id: 'n' });
+      const graph = new Rapid.Graph([node]);
+      const presets = new Rapid.PresetSystem(context);
+      expect(presets.match(node, graph).id).to.eql('point');
+    });
+
+    it('has a fallback line preset', () => {
+      const node = Rapid.osmNode({ id: 'n' });
+      const way = Rapid.osmWay({ id: 'w', nodes: ['n'] });
+      const graph = new Rapid.Graph([node, way]);
+      const presets = new Rapid.PresetSystem(context);
+      expect(presets.match(way, graph).id).to.eql('line');
+    });
+
+    it('has a fallback area preset', () => {
+      const node = Rapid.osmNode({ id: 'n' });
+      const way = Rapid.osmWay({ id: 'w', nodes: ['n'], tags: { area: 'yes' }});
+      const graph = new Rapid.Graph([node, way]);
+      const presets = new Rapid.PresetSystem(context);
+      expect(presets.match(way, graph).id).to.eql('area');
+    });
+
+    it('has a fallback relation preset', () => {
+      const relation = Rapid.osmRelation({ id: 'r' });
+      const graph = new Rapid.Graph([relation]);
+      const presets = new Rapid.PresetSystem(context);
+      expect(presets.match(relation, graph).id).to.eql('relation');
+    });
+  });
+
+
+  describe('#match', () => {
+    beforeEach(() => {
+      const testPresets = {
+        residential: { tags: { highway: 'residential' }, geometry: ['line'] },
+        park: { tags: { leisure: 'park' }, geometry: ['point', 'area'] }
+      };
+      context.dataLoaderSystem()._cachedData.preset_presets = testPresets;
+    });
+
+    it('returns a collection containing presets matching a geometry and tags', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        const way = Rapid.osmWay({ tags: { highway: 'residential' } });
+        const graph = new Rapid.Graph([way]);
+        expect(presets.match(way, graph).id).to.eql('residential');
+      });
+    });
+
+    it('returns the appropriate fallback preset when no tags match', () => {
+      const presets = new Rapid.PresetSystem(context);
+      const point = Rapid.osmNode();
+      const line = Rapid.osmWay({ tags: { foo: 'bar' } });
+      const graph = new Rapid.Graph([point, line]);
+
+      return presets.initAsync().then(() => {
+        expect(presets.match(point, graph).id).to.eql('point');
+        expect(presets.match(line, graph).id).to.eql('line');
+      });
+    });
+
+    it('matches vertices on a line as points', () => {
+      const presets = new Rapid.PresetSystem(context);
+      const point = Rapid.osmNode({ tags: { leisure: 'park' } });
+      const line = Rapid.osmWay({ nodes: [point.id], tags: { 'highway': 'residential' } });
+      const graph = new Rapid.Graph([point, line]);
+
+      return presets.initAsync().then(() => {
+        expect(presets.match(point, graph).id).to.eql('point');
+      });
+    });
+
+    it('matches vertices on an addr:interpolation line as points', () => {
+      const presets = new Rapid.PresetSystem(context);
+      const point = Rapid.osmNode({ tags: { leisure: 'park' } });
+      const line = Rapid.osmWay({ nodes: [point.id], tags: { 'addr:interpolation': 'even' } });
+      const graph = new Rapid.Graph([point, line]);
+
+      return presets.initAsync().then(() => {
+        expect(presets.match(point, graph).id).to.eql('park');
+      });
+    });
+  });
+
+
+  describe('#areaKeys', () => {
+    beforeEach(() => {
+      const testPresets = {
+        'amenity/fuel/shell': { tags: { 'amenity': 'fuel' }, geometry: ['point', 'area'], suggestion: true },
+        'highway/foo': { tags: { 'highway': 'foo' }, geometry: ['area'] },
+        'leisure/track': { tags: { 'leisure': 'track' }, geometry: ['line', 'area'] },
+        'natural': { tags: { 'natural': '*' }, geometry: ['point', 'vertex', 'area'] },
+        'natural/peak': { tags: { 'natural': 'peak' }, geometry: ['point', 'vertex'] },
+        'natural/tree_row': { tags: { 'natural': 'tree_row' }, geometry: ['line'] },
+        'natural/wood': { tags: { 'natural': 'wood' }, geometry: ['point', 'area'] }
+      };
+      context.dataLoaderSystem()._cachedData.preset_presets = testPresets;
+    });
+
+    it('includes keys for presets with area geometry', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        expect(presets.areaKeys()).to.include.keys('natural');
+      });
+    });
+
+    it('discards key-values for presets with a line geometry', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        expect(presets.areaKeys().natural).to.include.keys('tree_row');
+        expect(presets.areaKeys().natural.tree_row).to.be.true;
+      });
+    });
+
+    it('discards key-values for presets with both area and line geometry', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        expect(presets.areaKeys().leisure).to.include.keys('track');
+      });
+    });
+
+    it('does not discard key-values for presets with neither area nor line geometry', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        expect(presets.areaKeys().natural).not.to.include.keys('peak');
+      });
+    });
+
+    it('does not discard generic \'*\' key-values', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        expect(presets.areaKeys().natural).not.to.include.keys('natural');
+      });
+    });
+
+    it('ignores keys like \'highway\' that are assumed to be lines', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        expect(presets.areaKeys()).not.to.include.keys('highway');
+      });
+    });
+
+    it('ignores suggestion presets', () => {
+      const presets = new Rapid.PresetSystem(context);
+      return presets.initAsync().then(() => {
+        expect(presets.areaKeys()).not.to.include.keys('amenity');
+      });
+    });
+  });
+
+
+  describe('#merge', () => {
+    it('builds presets from provided', () => {
+      const surfShop = Rapid.osmNode({ tags: { amenity: 'shop', 'shop:type': 'surf' } });
+      const presets = new Rapid.PresetSystem(context);
+      const presetData = {
+        presets: {
+          'amenity/shop/surf': {
+            tags: { amenity: 'shop', 'shop:type': 'surf' },
+            geometry: ['point', 'area']
+          }
+        }
+      };
+
+      let matched = presets.match(surfShop, new Rapid.Graph([surfShop]));
+      expect(matched.id).to.eql('point');   // no surfshop preset yet, matches fallback point
+      presets.merge(presetData);
+
+      matched = presets.match(surfShop, new Rapid.Graph([surfShop]));
+      expect(matched.id).to.eql('amenity/shop/surf');
+    });
+  });
+
+
+  describe('#match', () => {
+
+    beforeEach(() => {
+      const testPresets = {
+        building: {
+          name: 'Building',
+          tags: { building: 'yes' },
+          geometry: ['area']
+        },
+        'type/multipolygon': {
+          name: 'Multipolygon',
+          geometry: ['area', 'relation'],
+          tags: { 'type': 'multipolygon' },
+          searchable: false,
+          matchScore: 0.1
+        },
+        address: {
+          name: 'Address',
+          geometry: ['point', 'vertex', 'area'],
+          tags: { 'addr:*': '*' },
+          matchScore: 0.15
+        },
+        'highway/pedestrian_area': {
+          name: 'Pedestrian Area',
+          geometry: ['area'],
+          tags: { highway: 'pedestrian', area: 'yes' }
+        }
+      };
+      context.dataLoaderSystem()._cachedData.preset_presets = testPresets;
+    });
+
+
+    it('prefers building to multipolygon', () => {
+      const presets = new Rapid.PresetSystem(context);
+      const relation = Rapid.osmRelation({ tags: { type: 'multipolygon', building: 'yes' } });
+      const graph = new Rapid.Graph([relation]);
+      return presets.initAsync().then(() => {
+        const match = presets.match(relation, graph);
+        expect(match.id).to.eql('building');
+      });
+    });
+
+    it('prefers building to address', () => {
+      const presets = new Rapid.PresetSystem(context);
+      const way = Rapid.osmWay({ tags: { area: 'yes', building: 'yes', 'addr:housenumber': '1234' } });
+      const graph = new Rapid.Graph([way]);
+      return presets.initAsync().then(() => {
+        const match = presets.match(way, graph);
+        expect(match.id).to.eql('building');
+      });
+    });
+
+    it('prefers pedestrian to area', () => {
+      const presets = new Rapid.PresetSystem(context);
+      const way = Rapid.osmWay({ tags: { area: 'yes', highway: 'pedestrian' } });
+      const graph = new Rapid.Graph([way]);
+      return presets.initAsync().then(() => {
+        const match = presets.match(way, graph);
+        expect(match.id).to.eql('highway/pedestrian_area');
+      });
+    });
+  });
+
+});
diff --git a/test/spec/core/UrlHash.test.js b/test/spec/core/UrlHashSystem.test.js
similarity index 60%
rename from test/spec/core/UrlHash.test.js
rename to test/spec/core/UrlHashSystem.test.js
index 37c1ad42d0..2114c4473c 100644
--- a/test/spec/core/UrlHash.test.js
+++ b/test/spec/core/UrlHashSystem.test.js
@@ -1,4 +1,4 @@
-describe.skip('UrlHash', () => {
+describe.skip('UrlHashSystem', () => {
   mocha.globals('__onhashchange.hash');
 
   let hash, context;
@@ -6,8 +6,12 @@ describe.skip('UrlHash', () => {
   beforeEach(() => {
     window.location.hash = '#background=none';   // Try not to load imagery
     const container = d3.select(document.createElement('div'));
-    context = Rapid.coreContext().assetPath('../dist/').init().container(container);
-    container.call(context.map().render);
+
+    context = Rapid.coreContext();
+    window.context = context;  // lol
+    context.init();
+    context.container(container);
+    container.call(context.mapSystem().render);
     hash = new Rapid.UrlHash(context);
   });
 
@@ -20,17 +24,17 @@ describe.skip('UrlHash', () => {
   it('centerZooms map to requested level', () => {
     window.location.hash = '#background=none&map=20.00/38.87952/-77.02405';
     hash.enable();
-    expect(context.map().center()[0]).to.be.closeTo(-77.02405, 0.1);
-    expect(context.map().center()[1]).to.be.closeTo(38.87952, 0.1);
-    expect(context.map().zoom()).to.equal(20.0);
+    expect(context.mapSystem().center()[0]).to.be.closeTo(-77.02405, 0.1);
+    expect(context.mapSystem().center()[1]).to.be.closeTo(38.87952, 0.1);
+    expect(context.mapSystem().zoom()).to.equal(20.0);
   });
 
   it('centerZooms map at requested coordinates on hashchange', done => {
     hash.enable();
     d3.select(window).on('hashchange', () => {
-      expect(context.map().center()[0]).to.be.closeTo(-77.02405, 0.1);
-      expect(context.map().center()[1]).to.be.closeTo(38.87952, 0.1);
-      expect(context.map().zoom()).to.equal(20.0);
+      expect(context.mapSystem().center()[0]).to.be.closeTo(-77.02405, 0.1);
+      expect(context.mapSystem().center()[1]).to.be.closeTo(38.87952, 0.1);
+      expect(context.mapSystem().zoom()).to.equal(20.0);
       d3.select(window).on('hashchange', null);
       done();
     });
@@ -39,8 +43,8 @@ describe.skip('UrlHash', () => {
 
   it('stores the current zoom and coordinates in window.location.hash on map move events', done => {
     hash.enable();
-    context.map().center([-77.0, 38.9]);
-    context.map().zoom(2.0);
+    context.mapSystem().center([-77.0, 38.9]);
+    context.mapSystem().zoom(2.0);
     window.setTimeout(() => {
       expect(window.location.hash).to.equal('#background=none&map=2.00/38.9/-77.0');
       done();
diff --git a/test/spec/core/ValidationSystem.test.js b/test/spec/core/ValidationSystem.test.js
new file mode 100644
index 0000000000..abca4858e3
--- /dev/null
+++ b/test/spec/core/ValidationSystem.test.js
@@ -0,0 +1,97 @@
+describe('ValidationSystem', () => {
+  let _validator;
+
+  class MockStorageSystem {
+    constructor() { }
+    getItem() { return ''; }
+    hasItem() { return false; }
+    setItem() { }
+  }
+
+  class MockLocalizationSystem {
+    constructor() { }
+    initAsync()   { return Promise.resolve(); }
+    t()           { return ''; }
+    tHtml()       { return ''; }
+  }
+
+  class MockPresetSystem {
+    constructor() { }
+  }
+
+  class MockMapSystem {
+    constructor() { }
+    extent()      { return new sdk.Extent(); }
+  }
+
+  class MockContext {
+    constructor()   {
+      this.initialHashParams = {};
+      this.projection = new sdk.Projection();
+
+      this._localizationSystem = new MockLocalizationSystem();
+      this._mapSystem = new MockMapSystem();
+      this._presetSystem = new MockPresetSystem();
+      this._storageSystem = new MockStorageSystem();
+
+      this._dataLoaderSystem = new Rapid.DataLoaderSystem(this);
+      this._dataLoaderSystem.init();
+
+      this._editSystem = new Rapid.EditSystem(this);
+      this.graph = this._editSystem.graph;
+      this.hasEntity = (id) => this._editSystem.graph().hasEntity(id);
+      this._editSystem.init();
+     }
+
+    dataLoaderSystem()    { return this._dataLoaderSystem; }
+    editSystem()          { return this._editSystem; }
+    localizationSystem()  { return this._localizationSystem; }
+    mapSystem()           { return this._mapSystem; }
+    presetSystem()        { return this._presetSystem; }
+    storageSystem()       { return this._storageSystem; }
+    selectedIDs()         { return []; }
+    on() {}
+  }
+
+  const context = new MockContext();
+
+
+  beforeEach(() => {
+    _validator = new Rapid.ValidationSystem(context);
+    _validator.init();
+
+    // For now just run the one rule we are testing.
+    // Otherwise we need to mock out anything used by any validator.
+    for (const ruleID of _validator._rules.keys()) {
+      if (ruleID !== 'private_data') {
+        _validator._rules.delete(ruleID);
+      }
+    }
+  });
+
+
+  it('has no issues on init', () => {
+    const issues = _validator.getIssues({ what: 'all', where: 'all' });
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+  it('validateAsync returns a Promise, fulfilled when the validation has completed', () => {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, 0], tags: { building: 'house', phone: '555-1212' } });
+    context.editSystem().perform( Rapid.actionAddEntity(n1) );
+
+    const prom = _validator.validateAsync();
+    expect(prom).to.be.a('promise');
+
+    return prom
+      .then(() => {
+        const issues = _validator.getIssues({ what: 'all', where: 'all' });
+        expect(issues).to.have.lengthOf(1);
+        const issue = issues[0];
+        expect(issue.type).to.eql('private_data');
+        expect(issue.entityIds).to.have.lengthOf(1);
+        expect(issue.entityIds[0]).to.eql('n-1');
+      });
+  });
+
+});
diff --git a/test/spec/core/context.js b/test/spec/core/context.js
deleted file mode 100644
index 65b1ec1237..0000000000
--- a/test/spec/core/context.js
+++ /dev/null
@@ -1,68 +0,0 @@
-describe('coreContext', function() {
-    var assets = {
-        'test/img/loader.gif': '/assets/test/img/loader-b66184b5c4afbccc25f.gif'
-    };
-
-    describe('#assetPath', function() {
-        it('sets and gets assetPath', function() {
-            var context = Rapid.coreContext();
-            expect(context.assetPath()).to.eql('');
-
-            context.assetPath('test/');
-            expect(context.assetPath()).to.eql('test/');
-        });
-    });
-
-    describe('#assetMap', function() {
-        it('sets and gets assetMap', function() {
-            var context = Rapid.coreContext();
-            expect(context.assetMap()).to.eql({});
-
-            context.assetMap(assets);
-            expect(context.assetMap()).to.eql(assets);
-        });
-    });
-
-    describe('#asset', function() {
-        var context;
-        beforeEach(function() {
-            context = Rapid.coreContext().assetPath('test/').assetMap(assets);
-        });
-
-        it('ignores absolute urls', function() {
-            expect(context.asset('HTTP://hello')).to.eql('HTTP://hello');
-            expect(context.asset('https://world')).to.eql('https://world');
-        });
-        it('looks first in assetMap', function() {
-            expect(context.asset('img/loader.gif')).to.eql('/assets/test/img/loader-b66184b5c4afbccc25f.gif');
-        });
-        it('falls back to prepending assetPath', function() {
-            expect(context.asset('img/spinner.gif')).to.eql('test/img/spinner.gif');
-        });
-    });
-
-    describe('#debug', function() {
-        it('sets and gets debug flags', function() {
-            var context = Rapid.coreContext();
-            var flags = {
-                tile: false,
-                label: false,
-                imagery: false,
-                target: false,
-                downloaded: false
-            };
-
-            expect(context.debugFlags()).to.eql(flags);
-
-            context.setDebug('tile', true);
-            expect(context.getDebug('tile')).to.be.true;
-
-            context.setDebug('label');
-            expect(context.getDebug('label')).to.be.true;
-
-            context.setDebug('tile', false);
-            expect(context.getDebug('tile')).to.be.false;
-        });
-    });
-
-});
diff --git a/test/spec/core/file_fetcher.js b/test/spec/core/file_fetcher.js
deleted file mode 100644
index 24d8c76384..0000000000
--- a/test/spec/core/file_fetcher.js
+++ /dev/null
@@ -1,69 +0,0 @@
-describe('coreFileFetcher', function() {
-
-    describe('#fileMap', function() {
-        it('gets the fileMap', function() {
-            var data = Rapid.coreFileFetcher();
-            expect(data.fileMap()).to.be.a('object');
-        });
-        it('sets the fileMap', function() {
-            var data = Rapid.coreFileFetcher();
-            var files = { 'intro_graph': 'data/intro_graph.min.json' };
-            expect(data.fileMap(files)).to.be.ok;
-        });
-    });
-
-    describe('#get', function() {
-        it('returns a promise resolved if we already have the data', function(done) {
-            var data = Rapid.coreFileFetcher();
-            data.cache().test = { hello: 'world' };
-
-            var prom = data.get('test');
-            // expect(prom).to.be.a('promise');   // these are polyfilled in phantomjs
-            prom
-                .then(function(data) {
-                    expect(data).to.be.a('object');
-                    expect(data.hello).to.eql('world');
-                    done();
-                })
-                .catch(function(err) {
-                    done(err);
-                });
-
-            window.setTimeout(function() {}, 20); // async - to let the promise settle in phantomjs
-        });
-
-        it('returns a promise rejected if we can not get the data', function(done) {
-            var data = Rapid.coreFileFetcher().assetPath('../dist/');
-            var prom = data.get('wat');
-            prom
-                .then(function(data) {
-                    done(new Error('We were not supposed to get data but did: ' + data));
-                })
-                .catch(function(err) {
-                    expect(/^Unknown data file/.test(err)).to.be.true;
-                    done();
-                });
-
-            window.setTimeout(function() {}, 20);  // async - to let the promise settle in phantomjs
-        });
-
-        it('returns a promise to fetch data if we do not already have the data', function(done) {
-            var files = { 'intro_graph': 'data/intro_graph.min.json' };
-            var data = Rapid.coreFileFetcher().assetPath('../dist/').fileMap(files);
-            var prom = data.get('intro_graph');
-            // expect(prom).to.be.a('promise');   // these are polyfilled in phantomjs
-            prom
-                .then(function(data) {
-                    expect(data).to.be.a('object');
-                    expect(data.n2061.tags.name).to.eql('Three Rivers City Hall');
-                    done();
-                })
-                .catch(function(err) {
-                    done(err);
-                });
-
-            window.setTimeout(function() {}, 20);  // async - to let the promise settle in phantomjs
-        });
-    });
-
-});
diff --git a/test/spec/core/history.js b/test/spec/core/history.js
deleted file mode 100644
index e525544ab1..0000000000
--- a/test/spec/core/history.js
+++ /dev/null
@@ -1,575 +0,0 @@
-describe('coreHistory', function () {
-    var context, history, spy;
-    var actionNoop = function(g) { return g; };
-    var actionAddNode = function (nodeID) {
-        return function(g) {
-            return g.replace(Rapid.osmNode({ id: nodeID }));
-        };
-    };
-
-    beforeEach(function () {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-        history = context.history();
-        spy = sinon.spy();
-        // clear lock
-        Rapid.prefs(history._getKey('lock'), null);
-    });
-
-    describe('#graph', function () {
-        it('returns the current graph', function () {
-            expect(history.graph()).to.be.an.instanceOf(Rapid.Graph);
-        });
-    });
-
-    describe('#merge', function () {
-        it('merges the entities into all graph versions', function () {
-            var n = Rapid.osmNode({id: 'n'});
-            history.merge([n]);
-            expect(history.graph().entity('n')).to.equal(n);
-        });
-
-        it('emits a merge event with the new entities', function () {
-            var n = Rapid.osmNode({id: 'n'});
-            history.on('merge', spy);
-            history.merge([n]);
-            expect(spy).to.have.been.calledWith(new Set([n.id]));
-        });
-    });
-
-    describe('#perform', function () {
-        it('returns a difference', function () {
-            expect(history.perform(actionNoop).changes).to.be.empty;
-        });
-
-        it('updates the graph', function () {
-            var node = Rapid.osmNode();
-            history.perform(function (graph) { return graph.replace(node); });
-            expect(history.graph().entity(node.id)).to.equal(node);
-        });
-
-        it('pushes an undo annotation', function () {
-            history.perform(actionNoop, 'annotation');
-            expect(history.undoAnnotation()).to.equal('annotation');
-        });
-
-        it('emits a change event', function () {
-            history.on('change', spy);
-            var difference = history.perform(actionNoop);
-            expect(spy).to.have.been.calledWith(difference);
-            expect(spy.callCount).to.eql(1);
-        });
-
-        it('performs multiple actions', function () {
-            var action1 = sinon.stub().returns(new Rapid.Graph());
-            var action2 = sinon.stub().returns(new Rapid.Graph());
-            history.perform(action1, action2, 'annotation');
-            expect(action1).to.have.been.called;
-            expect(action2).to.have.been.called;
-            expect(history.undoAnnotation()).to.equal('annotation');
-        });
-
-        it('performs transitionable actions in a transition', function (done) {
-            var action1 = function() { return new Rapid.Graph(); };
-            action1.transitionable = true;
-            history.on('change', spy);
-            history.perform(action1);
-            window.setTimeout(function() {
-                expect(spy.callCount).to.be.above(2);
-                done();
-            }, 300);
-        });
-    });
-
-    describe('#replace', function () {
-        it('returns a difference', function () {
-            expect(history.replace(actionNoop).changes).to.be.empty;
-        });
-
-        it('updates the graph', function () {
-            var node = Rapid.osmNode();
-            history.replace(function (graph) { return graph.replace(node); });
-            expect(history.graph().entity(node.id)).to.equal(node);
-        });
-
-        it('replaces the undo annotation', function () {
-            history.perform(actionNoop, 'annotation1');
-            history.replace(actionNoop, 'annotation2');
-            expect(history.undoAnnotation()).to.equal('annotation2');
-        });
-
-        it('emits a change event', function () {
-            history.on('change', spy);
-            var difference = history.replace(actionNoop);
-            expect(spy).to.have.been.calledWith(difference);
-        });
-
-        it('performs multiple actions', function () {
-            var action1 = sinon.stub().returns(new Rapid.Graph());
-            var action2 = sinon.stub().returns(new Rapid.Graph());
-            history.replace(action1, action2, 'annotation');
-            expect(action1).to.have.been.called;
-            expect(action2).to.have.been.called;
-            expect(history.undoAnnotation()).to.equal('annotation');
-        });
-    });
-
-    describe('#pop', function () {
-        it('returns a difference', function () {
-            history.perform(actionNoop, 'annotation');
-            expect(history.pop().changes).to.be.empty;
-        });
-
-        it('updates the graph', function () {
-            history.perform(actionNoop, 'annotation');
-            history.pop();
-            expect(history.undoAnnotation()).to.be.undefined;
-        });
-
-        it('does not push the redo stack', function () {
-            history.perform(actionNoop, 'annotation');
-            history.pop();
-            expect(history.redoAnnotation()).to.be.undefined;
-        });
-
-        it('emits a change event', function () {
-            history.perform(actionNoop);
-            history.on('change', spy);
-            var difference = history.pop();
-            expect(spy).to.have.been.calledWith(difference);
-        });
-
-        it('pops n times', function () {
-            history.perform(actionNoop, 'annotation1');
-            history.perform(actionNoop, 'annotation2');
-            history.perform(actionNoop, 'annotation3');
-            history.pop(2);
-            expect(history.undoAnnotation()).to.equal('annotation1');
-        });
-
-        it('pops 0 times', function () {
-            history.perform(actionNoop, 'annotation1');
-            history.perform(actionNoop, 'annotation2');
-            history.perform(actionNoop, 'annotation3');
-            history.pop(0);
-            expect(history.undoAnnotation()).to.equal('annotation3');
-        });
-
-        it('pops 1 time if argument is invalid', function () {
-            history.perform(actionNoop, 'annotation1');
-            history.perform(actionNoop, 'annotation2');
-            history.perform(actionNoop, 'annotation3');
-            history.pop('foo');
-            expect(history.undoAnnotation()).to.equal('annotation2');
-            history.pop(-1);
-            expect(history.undoAnnotation()).to.equal('annotation1');
-        });
-    });
-
-    describe('#overwrite', function () {
-        it('returns a difference', function () {
-            history.perform(actionNoop, 'annotation');
-            expect(history.overwrite(actionNoop).changes).to.be.empty;
-        });
-
-        it('updates the graph', function () {
-            history.perform(actionNoop, 'annotation');
-            var node = Rapid.osmNode();
-            history.overwrite(function (graph) { return graph.replace(node); });
-            expect(history.graph().entity(node.id)).to.equal(node);
-        });
-
-        it('replaces the undo annotation', function () {
-            history.perform(actionNoop, 'annotation1');
-            history.overwrite(actionNoop, 'annotation2');
-            expect(history.undoAnnotation()).to.equal('annotation2');
-        });
-
-        it('does not push the redo stack', function () {
-            history.perform(actionNoop, 'annotation');
-            history.overwrite(actionNoop, 'annotation2');
-            expect(history.redoAnnotation()).to.be.undefined;
-        });
-
-        it('emits a change event', function () {
-            history.perform(actionNoop, 'annotation');
-            history.on('change', spy);
-            var difference = history.overwrite(actionNoop, 'annotation2');
-            expect(spy).to.have.been.calledWith(difference);
-        });
-
-        it('performs multiple actions', function () {
-            var action1 = sinon.stub().returns(new Rapid.Graph());
-            var action2 = sinon.stub().returns(new Rapid.Graph());
-            history.perform(actionNoop, 'annotation');
-            history.overwrite(action1, action2, 'annotation2');
-            expect(action1).to.have.been.called;
-            expect(action2).to.have.been.called;
-            expect(history.undoAnnotation()).to.equal('annotation2');
-        });
-    });
-
-    describe('#undo', function () {
-        it('returns a difference', function () {
-            expect(history.undo().changes).to.be.empty;
-        });
-
-        it('pops the undo stack', function () {
-            history.perform(actionNoop, 'annotation');
-            history.undo();
-            expect(history.undoAnnotation()).to.be.undefined;
-        });
-
-        it('pushes the redo stack', function () {
-            history.perform(actionNoop, 'annotation');
-            history.undo();
-            expect(history.redoAnnotation()).to.equal('annotation');
-        });
-
-        it('emits an undone event', function () {
-            history.perform(actionNoop);
-            history.on('undone', spy);
-            history.undo();
-            expect(spy).to.have.been.called;
-        });
-
-        it('emits a change event', function () {
-            history.perform(actionNoop);
-            history.on('change', spy);
-            var difference = history.undo();
-            expect(spy).to.have.been.calledWith(difference);
-        });
-    });
-
-    describe('#redo', function () {
-        it('returns a difference', function () {
-            expect(history.redo().changes).to.be.empty;
-        });
-
-        it('does redo into an annotated state', function () {
-            history.perform(actionNoop, 'annotation');
-            history.on('redone', spy);
-            history.undo();
-            history.redo();
-            expect(history.undoAnnotation()).to.equal('annotation');
-            expect(spy).to.have.been.called;
-        });
-
-        it('does not redo into a non-annotated state', function () {
-            history.perform(actionNoop);
-            history.on('redone', spy);
-            history.undo();
-            history.redo();
-            expect(spy).not.to.have.been.called;
-        });
-
-        it('emits a change event', function () {
-            history.perform(actionNoop);
-            history.undo();
-            history.on('change', spy);
-            var difference = history.redo();
-            expect(spy).to.have.been.calledWith(difference);
-        });
-    });
-
-    describe('#pauseChangeDispatch / #resumeChangeDispatch', function() {
-        it('prevents change events from getting dispatched', function() {
-            history.perform(actionNoop, 'base');
-            history.on('change', spy);
-
-            history.pauseChangeDispatch();
-
-            history.perform(actionNoop, 'perform');
-            expect(spy).to.have.not.been.called;
-            history.replace(actionNoop, 'replace');
-            expect(spy).to.have.not.been.called;
-            history.overwrite(actionNoop, 'replace');
-            expect(spy).to.have.not.been.called;
-            history.undo();
-            expect(spy).to.have.not.been.called;
-            history.redo();
-            expect(spy).to.have.not.been.called;
-            history.pop();
-            expect(spy).to.have.not.been.called;
-
-            var diff = history.resumeChangeDispatch();
-            expect(spy).to.have.been.calledOnceWith(diff);
-        });
-
-        it('does nothing if resume called before pause', function() {
-            history.perform(actionNoop, 'base');
-            history.on('change', spy);
-
-            history.resumeChangeDispatch();
-            expect(spy).to.have.not.been.called;
-        });
-
-        it('uses earliest difference if pause called multiple times', function() {
-            history.perform(actionNoop, 'base');
-            history.on('change', spy);
-
-            history.pauseChangeDispatch();
-            history.perform(actionAddNode('a'), 'perform');
-
-            history.pauseChangeDispatch();
-            history.perform(actionAddNode('b'), 'perform');
-
-            var diff = history.resumeChangeDispatch();
-            expect(spy).to.have.been.calledOnceWith(diff);
-            expect(diff.changes).to.have.all.keys('a', 'b');
-        });
-    });
-
-    describe('#changes', function () {
-        it('includes created entities', function () {
-            var node = Rapid.osmNode();
-            history.perform(function (graph) { return graph.replace(node); });
-            expect(history.changes().created).to.eql([node]);
-        });
-
-        it('includes modified entities', function () {
-            var node1 = Rapid.osmNode({id: 'n1'});
-            var node2 = node1.update({ tags: { yes: 'no' } });
-            history.merge([node1]);
-            history.perform(function (graph) { return graph.replace(node2); });
-            expect(history.changes().modified).to.eql([node2]);
-        });
-
-        it('includes deleted entities', function () {
-            var node = Rapid.osmNode({id: 'n1'});
-            history.merge([node]);
-            history.perform(function (graph) { return graph.remove(node); });
-            expect(history.changes().deleted).to.eql([node]);
-        });
-    });
-
-    describe('#hasChanges', function() {
-        it('is true when any of change\'s values are nonempty', function() {
-            var node = Rapid.osmNode();
-            history.perform(function (graph) { return graph.replace(node); });
-            expect(history.hasChanges()).to.eql(true);
-        });
-
-        it('is false when all of change\'s values are empty', function() {
-            expect(history.hasChanges()).to.eql(false);
-        });
-    });
-
-    describe('#reset', function () {
-        it('clears the version stack', function () {
-            history.perform(actionNoop, 'annotation');
-            history.perform(actionNoop, 'annotation');
-            history.undo();
-            history.reset();
-            expect(history.undoAnnotation()).to.be.undefined;
-            expect(history.redoAnnotation()).to.be.undefined;
-        });
-
-        it('emits a change event', function () {
-            history.on('change', spy);
-            history.reset();
-            expect(spy).to.have.been.called;
-        });
-    });
-
-    describe('#checkpoint', function () {
-        it('saves and resets to checkpoints', function () {
-            history.perform(actionNoop, 'annotation1');
-            history.perform(actionNoop, 'annotation2');
-            history.perform(actionNoop, 'annotation3');
-            history.checkpoint('check1');
-            history.perform(actionNoop, 'annotation4');
-            history.perform(actionNoop, 'annotation5');
-            history.checkpoint('check2');
-            history.perform(actionNoop, 'annotation6');
-            history.perform(actionNoop, 'annotation7');
-            history.perform(actionNoop, 'annotation8');
-
-            history.reset('check1');
-            expect(history.undoAnnotation()).to.equal('annotation3');
-
-            history.reset('check2');
-            expect(history.undoAnnotation()).to.equal('annotation5');
-
-            history.reset('check1');
-            expect(history.undoAnnotation()).to.equal('annotation3');
-        });
-
-        it('emits a change event', function () {
-            history.on('change', spy);
-            history.reset();
-            expect(spy).to.have.been.called;
-        });
-    });
-
-    describe('#toJSON', function() {
-        it('doesn\'t generate unsaveable changes', function() {
-            history.perform(actionAddNode('n-1'));
-            history.perform(Rapid.actionDeleteNode('n-1'));
-            expect(history.toJSON()).to.be.not.ok;
-        });
-
-        it('generates v3 JSON', function() {
-            const node_1 = Rapid.osmNode({id: 'n-1'});
-            const node1 = Rapid.osmNode({id: 'n1'});
-            const node2 = Rapid.osmNode({id: 'n2'});
-            const node3 = Rapid.osmNode({id: 'n3'});
-
-            const node_1_json = JSON.parse(JSON.stringify(node_1));
-            const node1_json = JSON.parse(JSON.stringify(node1));
-            const node2_json = JSON.parse(JSON.stringify(node2));
-            const node3_json = JSON.parse(JSON.stringify(node3));
-
-            history.merge([node1, node2, node3]);                  // merge base entities
-            history.perform(Rapid.actionAddEntity(node_1));           // add n-1
-            history.perform(Rapid.actionChangeTags('n2', {k: 'v'}));  // update n2
-            const node2upd = history.graph().entity('n2');
-            const node2upd_json = JSON.parse(JSON.stringify(node2upd));
-            history.perform(Rapid.actionDeleteNode('n3'));            // delete n3
-
-            var json = JSON.parse(history.toJSON());
-            expect(json.version).to.eql(3);
-
-            expect(json.entities).to.deep.include(node_1_json);     // n-1 was added
-            expect(json.entities).to.deep.include(node2upd_json);   // n2 was updated
-            expect(json.entities).to.not.include(node1_json);       // n1 was never updated
-            expect(json.entities).to.not.include(node2_json);       // n2?
-            expect(json.entities).to.not.include(node3_json);       // n3 is now deleted
-
-            // base entities - before all edits
-            expect(json.baseEntities).to.not.include(node_1_json);
-            expect(json.baseEntities).to.not.include(node1_json);     // n1 was never updated
-            expect(json.baseEntities).to.deep.include(node2_json);    // n2 is in base
-            expect(json.baseEntities).to.deep.include(node3_json);    // n3 is in base
-            expect(json.baseEntities).to.not.include(node2upd_json);
-        });
-    });
-
-    describe('#fromJSON', function() {
-        it('restores from v2 JSON (creation)', function() {
-            var json = {
-                'version': 2,
-                'entities': [
-                    {'loc': [1, 2], 'id': 'n-1'}
-                ],
-                'stack': [
-                    {},
-                    {'modified': ['n-1v0'], 'imageryUsed': ['Bing'], 'annotation': 'Added a point.'}
-                ],
-                'nextIDs': {'node': -2, 'way': -1, 'relation': -1},
-                'index': 1
-            };
-            history.fromJSON(JSON.stringify(json));
-            expect(history.graph().entity('n-1')).to.eql(Rapid.osmNode({id: 'n-1', loc: [1, 2]}));
-            expect(history.undoAnnotation()).to.eql('Added a point.');
-            expect(history.imageryUsed()).to.eql(['Bing']);
-            expect(Rapid.osmEntity.id.next).to.eql({node: -2, way: -1, relation: -1});
-            expect(history.difference().created().length).to.eql(1);
-        });
-
-        it('restores from v2 JSON (modification)', function() {
-            var json = {
-                'version': 2,
-                'entities': [
-                    {'loc': [2, 3], 'id': 'n1', 'v': 1}
-                ],
-                'stack': [
-                    {},
-                    {'modified': ['n1v1'], 'imageryUsed': ['Bing'], 'annotation': 'Moved a point.'}
-                ],
-                'nextIDs': {'node': -2, 'way': -1, 'relation': -1},
-                'index': 1
-            };
-            history.fromJSON(JSON.stringify(json));
-            history.merge([Rapid.osmNode({id: 'n1'})]); // Shouldn't be necessary; flaw in v2 format (see #2135)
-            expect(history.graph().entity('n1')).to.eql(Rapid.osmNode({id: 'n1', loc: [2, 3], v: 1}));
-            expect(history.undoAnnotation()).to.eql('Moved a point.');
-            expect(history.imageryUsed()).to.eql(['Bing']);
-            expect(Rapid.osmEntity.id.next).to.eql({node: -2, way: -1, relation: -1});
-            expect(history.difference().modified().length).to.eql(1);
-        });
-
-        it('restores from v2 JSON (deletion)', function() {
-            var json = {
-                'version': 2,
-                'entities': [],
-                'stack': [
-                    {},
-                    {'deleted': ['n1'], 'imageryUsed': ['Bing'], 'annotation': 'Deleted a point.'}
-                ],
-                'nextIDs': {'node': -1, 'way': -2, 'relation': -3},
-                'index': 1
-            };
-            history.fromJSON(JSON.stringify(json));
-            history.merge([Rapid.osmNode({id: 'n1'})]); // Shouldn't be necessary; flaw in v2 format (see #2135)
-            expect(history.graph().hasEntity('n1')).to.be.undefined;
-            expect(history.undoAnnotation()).to.eql('Deleted a point.');
-            expect(history.imageryUsed()).to.eql(['Bing']);
-            expect(Rapid.osmEntity.id.next).to.eql({node: -1, way: -2, relation: -3});
-            expect(history.difference().deleted().length).to.eql(1);
-        });
-
-        it('restores from v3 JSON (creation)', function() {
-            var json = {
-                'version': 3,
-                'entities': [
-                    {'loc': [1, 2], 'id': 'n-1'}
-                ],
-                'baseEntities': [],
-                'stack': [
-                    {},
-                    {'modified': ['n-1v0'], 'imageryUsed': ['Bing'], 'annotation': 'Added a point.'}
-                ],
-                'nextIDs': {'node': -2, 'way': -1, 'relation': -1},
-                'index': 1
-            };
-            history.fromJSON(JSON.stringify(json));
-            expect(history.graph().entity('n-1')).to.eql(Rapid.osmNode({id: 'n-1', loc: [1, 2]}));
-            expect(history.undoAnnotation()).to.eql('Added a point.');
-            expect(history.imageryUsed()).to.eql(['Bing']);
-            expect(Rapid.osmEntity.id.next).to.eql({node: -2, way: -1, relation: -1});
-            expect(history.difference().created().length).to.eql(1);
-        });
-
-        it('restores from v3 JSON (modification)', function() {
-            var json = {
-                'version': 3,
-                'entities': [
-                    {'loc': [2, 3], 'id': 'n1', 'v': 1}
-                ],
-                'baseEntities': [{'loc': [1, 2], 'id': 'n1'}],
-                'stack': [
-                    {},
-                    {'modified': ['n1v1'], 'imageryUsed': ['Bing'], 'annotation': 'Moved a point.'}
-                ],
-                'nextIDs': {'node': -2, 'way': -1, 'relation': -1},
-                'index': 1
-            };
-            history.fromJSON(JSON.stringify(json));
-            expect(history.graph().entity('n1')).to.eql(Rapid.osmNode({id: 'n1', loc: [2, 3], v: 1}));
-            expect(history.undoAnnotation()).to.eql('Moved a point.');
-            expect(history.imageryUsed()).to.eql(['Bing']);
-            expect(Rapid.osmEntity.id.next).to.eql({node: -2, way: -1, relation: -1});
-            expect(history.difference().modified().length).to.eql(1);
-        });
-
-        it('restores from v3 JSON (deletion)', function() {
-            var json = {
-                'version': 3,
-                'entities': [],
-                'baseEntities': [{'loc': [1, 2], 'id': 'n1'}],
-                'stack': [
-                    {},
-                    {'deleted': ['n1'], 'imageryUsed': ['Bing'], 'annotation': 'Deleted a point.'}
-                ],
-                'nextIDs': {'node': -1, 'way': -2, 'relation': -3},
-                'index': 1
-            };
-            history.fromJSON(JSON.stringify(json));
-            expect(history.graph().hasEntity('n1')).to.be.undefined;
-            expect(history.undoAnnotation()).to.eql('Deleted a point.');
-            expect(history.imageryUsed()).to.eql(['Bing']);
-            expect(Rapid.osmEntity.id.next).to.eql({node: -1, way: -2, relation: -3});
-            expect(history.difference().deleted().length).to.eql(1);
-        });
-    });
-});
diff --git a/test/spec/core/lib/Category.test.js b/test/spec/core/lib/Category.test.js
new file mode 100644
index 0000000000..da8683c519
--- /dev/null
+++ b/test/spec/core/lib/Category.test.js
@@ -0,0 +1,30 @@
+describe('Category', () => {
+
+  class MockContext {
+    constructor()   { }
+  }
+
+  const context = new MockContext();
+  const residential = new Rapid.Preset(context, 'highway/residential', { tags: { highway: 'residential' }, geometry: ['line'] });
+  const allPresets = { 'highway/residential': residential };
+
+  const categoryData = {
+    'geometry': 'line',
+    'icon': 'highway',
+    'name': 'roads',
+    'members': [ 'highway/residential' ]
+  };
+  const category = new Rapid.Category(context, 'road', categoryData, allPresets);
+
+  it('maps members names to preset instances', () => {
+    expect(category.members).to.be.an.instanceof(Rapid.Collection);
+    expect(category.members.array[0]).to.eql(residential);
+  });
+
+  describe('#matchGeometry', () => {
+    it('matches the type of an entity', () => {
+      expect(category.matchGeometry('line')).to.be.true;
+      expect(category.matchGeometry('point')).to.be.false;
+    });
+  });
+});
diff --git a/test/spec/core/lib/Collection.test.js b/test/spec/core/lib/Collection.test.js
new file mode 100644
index 0000000000..6b506f3a71
--- /dev/null
+++ b/test/spec/core/lib/Collection.test.js
@@ -0,0 +1,132 @@
+describe('Collection', () => {
+  class MockContext {
+    constructor()  {}
+    t(id)      { return id; }
+    tHtml(id)  { return id; }
+  }
+
+  const context = new MockContext();
+
+  const p = {
+    grill: new Rapid.Preset(context, 'amenity/bbq',
+      { name: 'Grill', tags: { amenity: 'bbq' }, geometry: ['point'], terms: [] }
+    ),
+    sandpit: new Rapid.Preset(context, 'amenity/grit_bin',
+      { name: 'Sandpit', tags: { amenity: 'grit_bin' }, geometry: ['point'], terms: [] }
+    ),
+    residential: new Rapid.Preset(context, 'highway/residential',
+      { name: 'Residential Area', tags: { highway: 'residential' }, geometry: ['point', 'area'], terms: [] }
+    ),
+    grass1: new Rapid.Preset(context, 'landuse/grass1',
+      { name: 'Grass', tags: { landuse: 'grass' }, geometry: ['point', 'area'], terms: [] }
+    ),
+    grass2: new Rapid.Preset(context, 'landuse/grass2',
+      { name: 'Ğṝȁß', tags: { landuse: 'ğṝȁß' }, geometry: ['point', 'area'], terms: [] }
+    ),
+    park: new Rapid.Preset(context, 'leisure/park',
+      { name: 'Park', tags: { leisure: 'park' }, geometry: ['point', 'area'], terms: [ 'grass' ], matchScore: 0.5 }
+    ),
+    parking: new Rapid.Preset(context, 'amenity/parking',
+      { name: 'Parking', tags: { amenity: 'parking' }, geometry: ['point', 'area'], terms: [ 'cars' ] }
+    ),
+    soccer: new Rapid.Preset(context, 'leisure/pitch/soccer',
+      { name: 'Soccer Field', tags: { leisure: 'pitch', sport: 'soccer' }, geometry: ['point', 'area'], terms: ['fußball'] }
+    ),
+    football: new Rapid.Preset(context, 'leisure/pitch/american_football',
+      { name: 'Football Field', tags: { leisure: 'pitch', sport: 'american_football' }, geometry: ['point', 'area'], terms: ['gridiron'] }
+    ),
+    excluded: new Rapid.Preset(context, 'amenity/excluded',
+      { name: 'Excluded', tags: { amenity: 'excluded' }, geometry: ['point'], terms: [], searchable: false }
+    )
+  };
+
+  const collection = new Rapid.Collection(context, [
+    p.grill, p.sandpit, p.residential, p.grass1, p.grass2,
+    p.park, p.parking, p.soccer, p.football, p.excluded
+  ]);
+
+  describe('#item', () => {
+    it('fetches a preset by id', () => {
+      expect(collection.item('highway/residential')).to.equal(p.residential);
+    });
+  });
+
+  describe('#index', () => {
+    it('return -1 when given id for preset not in the collection', () => {
+      expect(collection.index('foobar')).to.equal(-1);
+    });
+  });
+
+  describe('#matchGeometry', () => {
+    it('returns a new collection only containing presets matching a geometry', () => {
+      expect(collection.matchGeometry('area').array).to.include.members(
+        [p.residential, p.park, p.soccer, p.football]
+      );
+    });
+  });
+
+  describe.skip('#search', () => {
+//// TODO fix - these are all messed up
+    it('matches leading name', () => {
+      const result = collection.search('resid', 'area').array;
+      expect(result.indexOf(p.residential)).to.eql(0);  // 1. 'Residential' (by name)
+    });
+
+    it.skip('returns alternate matches in correct order', () => {
+////      const result = collection.search('gri', 'point').matchGeometry('point').array;
+
+//// as of today it is returning
+//['amenity/grit_bin',
+// 'amenity/bbq',
+// 'leisure/park',
+// 'landuse/grass1',
+// 'landuse/grass2',
+// 'amenity/parking',
+// 'highway/residential',
+// 'leisure/pitch/soccer',
+// 'leisure/pitch/american_football'
+// ]
+//
+//      expect(result.indexOf(p.grill), 'Grill').to.eql(0);            // 1. 'Grill' (leading name)
+//      expect(result.indexOf(p.football), 'Football').to.eql(1);      // 2. 'Football' (leading term 'gridiron')
+//      expect(result.indexOf(p.sandpit), 'Sandpit').to.eql(2);        // 3. 'Sandpit' (leading tag value 'grit_bin')
+//      expect(result.indexOf(p.grass1), 'Grass').to.be.within(3,5);   // 4. 'Grass' (similar name)
+//      expect(result.indexOf(p.grass2), 'Ğṝȁß').to.be.within(3,5);    // 5. 'Ğṝȁß' (similar name)
+//      expect(result.indexOf(p.park), 'Park').to.be.within(3,5);      // 6. 'Park' (similar term 'grass')
+    });
+
+    it('sorts preset with matchScore penalty below others', () => {
+      const result = collection.search('par', 'point').matchGeometry('point').array;
+      expect(result.indexOf(p.parking), 'Parking').to.eql(0);   // 1. 'Parking' (default matchScore)
+      expect(result.indexOf(p.park), 'Park').to.eql(1);         // 2. 'Park' (low matchScore)
+    });
+
+    it('ignores matchScore penalty for exact name match', () => {
+      const result = collection.search('park', 'point').matchGeometry('point').array;
+      expect(result.indexOf(p.park), 'Park').to.eql(0);         // 1. 'Park' (low matchScore)
+      expect(result.indexOf(p.parking), 'Parking').to.eql(1);   // 2. 'Parking' (default matchScore)
+    });
+
+    it('considers diacritics on exact matches', () => {
+      const result = collection.search('ğṝȁ', 'point').matchGeometry('point').array;
+      expect(result.indexOf(p.grass2), 'Ğṝȁß').to.eql(0);    // 1. 'Ğṝȁß'  (leading name)
+      expect(result.indexOf(p.grass1), 'Grass').to.eql(1);   // 2. 'Grass' (similar name)
+    });
+
+    it('replaces diacritics on fuzzy matches', () => {
+      const result = collection.search('graß', 'point').matchGeometry('point').array;
+      expect(result.indexOf(p.grass1), 'Grass').to.be.within(0,1);   // 1. 'Grass' (similar name)
+      expect(result.indexOf(p.grass2), 'Ğṝȁß').to.be.within(0,1);    // 2. 'Ğṝȁß'  (similar name)
+    });
+
+    // it('includes the appropriate fallback preset', () => {
+    //   expect(collection.search('foo', 'point').array, 'point').to.include(p.point);
+    //   expect(collection.search('foo', 'line').array, 'line').to.include(p.line);
+    //   expect(collection.search('foo', 'area').array, 'area').to.include(p.area);
+    // });
+
+    it('excludes presets with searchable: false', () => {
+      expect(collection.search('excluded', 'point').array).not.to.include(p.excluded);
+    });
+  });
+});
diff --git a/test/spec/core/Difference.test.js b/test/spec/core/lib/Difference.test.js
similarity index 100%
rename from test/spec/core/Difference.test.js
rename to test/spec/core/lib/Difference.test.js
diff --git a/test/spec/core/Graph.test.js b/test/spec/core/lib/Graph.test.js
similarity index 100%
rename from test/spec/core/Graph.test.js
rename to test/spec/core/lib/Graph.test.js
diff --git a/test/spec/core/lib/ImagerySource.test.js b/test/spec/core/lib/ImagerySource.test.js
new file mode 100644
index 0000000000..30ef71bcd8
--- /dev/null
+++ b/test/spec/core/lib/ImagerySource.test.js
@@ -0,0 +1,111 @@
+describe('ImagerySource', () => {
+
+  class MockContext {
+    constructor() {}
+    t() {}
+    tHtml() {}
+  }
+  const context = new MockContext();
+
+
+  it('does not error with blank template', () => {
+    const source = new Rapid.ImagerySource(context, { template: '', id:'anyid' });
+    expect(source.url([0,1,2])).to.equal('');
+  });
+
+  it('supports tms replacement tokens', () => {
+    const source = new Rapid.ImagerySource(context, {
+      id: 'anyid',
+      type: 'tms',
+      template: '{z}/{x}/{y}'
+    });
+    expect(source.url([0,1,2])).to.equal('2/0/1');
+  });
+
+  it('supports wms replacement tokens', () => {
+    const source = new Rapid.ImagerySource(context, {
+      id:'anyid',
+      type: 'wms',
+      projection: 'EPSG:3857',
+      template: 'SRS={proj}&imageSR={wkid}&bboxSR={wkid}&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}'
+    });
+
+    const result = sdk.utilStringQs(source.url([0,1,2]));
+    expect(result.SRS).to.equal('EPSG:3857');
+    expect(result.imageSR).to.equal('3857');
+    expect(result.bboxSR).to.equal('3857');
+    expect(result.FORMAT).to.equal('image/jpeg');
+    expect(result.WIDTH).to.equal('256');
+    expect(result.HEIGHT).to.equal('256');
+
+    const bbox = result.BBOX.split(',');
+    expect(+bbox[0]).to.be.closeTo(-20037508.34, 1e-3);
+    expect(+bbox[1]).to.be.closeTo(0, 1e-3);
+    expect(+bbox[2]).to.be.closeTo(-10018754.17, 1e-3);
+    expect(+bbox[3]).to.be.closeTo(10018754.17, 1e-3);
+  });
+
+  it('supports subdomains', () => {
+    const source = new Rapid.ImagerySource(context, { id:'anyid', template: '{switch:a,b}/{z}/{x}/{y}'});
+    expect(source.url([0,1,2])).to.equal('b/2/0/1');
+  });
+
+  it('distributes requests between subdomains', () => {
+    const source = new Rapid.ImagerySource(context, { id:'anyid', template: '{switch:a,b}/{z}/{x}/{y}' });
+    expect(source.url([0,1,1])).to.equal('b/1/0/1');
+    expect(source.url([0,2,1])).to.equal('a/1/0/2');
+  });
+
+  it('correctly displays an overlay with no overzoom specified', () => {
+    const source = new Rapid.ImagerySource(context, { id:'anyid', zoomExtent: [6,16] });
+    expect(source.validZoom(10)).to.be.true;
+    expect(source.validZoom(3)).to.be.false;
+    expect(source.validZoom(17)).to.be.true;
+  });
+
+  it('correctly displays an overlay with an invalid overzoom', () => {
+    const source = new Rapid.ImagerySource(context, { id:'anyid', zoomExtent: [6,16], overzoom: 'gibberish'});
+    expect(source.validZoom(10)).to.be.true;
+    expect(source.validZoom(3)).to.be.false;
+    expect(source.validZoom(17)).to.be.true;
+  });
+
+  it('correctly displays an overlay with overzoom:true', () => {
+    const source = new Rapid.ImagerySource(context, { id:'anyid', zoomExtent: [6,16], overzoom: true});
+    expect(source.validZoom(10)).to.be.true;
+    expect(source.validZoom(3)).to.be.false;
+    expect(source.validZoom(17)).to.be.true;
+  });
+
+  it('correctly displays an overlay with overzoom:false', () => {
+    const source = new Rapid.ImagerySource(context, { id:'anyid', zoomExtent: [6,16], overzoom: false});
+    expect(source.validZoom(10)).to.be.true;
+    expect(source.validZoom(3)).to.be.false;
+    expect(source.validZoom(17)).to.be.false;
+  });
+});
+
+describe('ImagerySourceCustom', () => {
+  describe('imageryUsed', () => {
+    it('returns an imagery_used string', () => {
+      const source = new Rapid.ImagerySourceCustom(context, 'http://example.com');
+      expect(source.imageryUsed).to.eql('Custom (http://example.com )');  // note ' )' space
+    });
+    it('sanitizes `access_token`', () => {
+      const source = new Rapid.ImagerySourceCustom(context, 'http://example.com?access_token=MYTOKEN');
+      expect(source.imageryUsed).to.eql('Custom (http://example.com?access_token={apikey} )');
+    });
+    it('sanitizes `connectId`', () => {
+      const source = new Rapid.ImagerySourceCustom(context, 'http://example.com?connectId=MYTOKEN');
+      expect(source.imageryUsed).to.eql('Custom (http://example.com?connectId={apikey} )');
+    });
+    it('sanitizes `token`', () => {
+      const source = new Rapid.ImagerySourceCustom(context, 'http://example.com?token=MYTOKEN');
+      expect(source.imageryUsed).to.eql('Custom (http://example.com?token={apikey} )');
+    });
+    it('sanitizes wms path `token`', () => {
+      const source = new Rapid.ImagerySourceCustom(context, 'http://example.com/wms/v1/token/MYTOKEN/1.0.0/layer');
+      expect(source.imageryUsed).to.eql('Custom (http://example.com/wms/v1/token/{apikey}/1.0.0/layer )');
+    });
+  });
+});
diff --git a/test/spec/core/lib/Preset.test.js b/test/spec/core/lib/Preset.test.js
new file mode 100644
index 0000000000..3f502f6b46
--- /dev/null
+++ b/test/spec/core/lib/Preset.test.js
@@ -0,0 +1,226 @@
+describe('Preset', () => {
+
+  class MockContext {
+    constructor()  { }
+  }
+
+  const context = new MockContext();
+
+
+  describe('#fields', () => {
+    it('has no fields by default', () => {
+      const preset = new Rapid.Preset(context, 'test', {});
+      expect(preset.fields()).to.eql([]);
+    });
+  });
+
+  describe('#moreFields', () => {
+    it('has no moreFields by default', () => {
+      const preset = new Rapid.Preset(context, 'test', {});
+      expect(preset.moreFields()).to.eql([]);
+    });
+  });
+
+  describe('#matchGeometry', () => {
+    it('returns false if it doesn\'t match', () => {
+      const preset = new Rapid.Preset(context, 'test', { geometry: ['line'] });
+      expect(preset.matchGeometry('point')).to.be.false;
+    });
+
+    it('returns true if it does match', () => {
+      const preset = new Rapid.Preset(context, 'test', { geometry: ['point', 'line'] });
+      expect(preset.matchGeometry('point')).to.be.true;
+    });
+  });
+
+  describe('#matchAllGeometry', () => {
+    it('returns false if they don\'t all match', () => {
+      const preset = new Rapid.Preset(context, 'test', { geometry: ['line'] });
+      expect(preset.matchAllGeometry(['point','line'])).to.be.false;
+    });
+
+    it('returns true if they do all match', () => {
+      const preset = new Rapid.Preset(context, 'test', { geometry: ['point', 'line'] });
+      expect(preset.matchAllGeometry(['point','line'])).to.be.true;
+    });
+  });
+
+  describe('#matchScore', () => {
+    it('returns -1 if preset does not match tags', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { foo: 'bar' } });
+      const entity = Rapid.osmWay({ tags: { highway: 'motorway' } });
+      expect(preset.matchScore(entity.tags)).to.equal(-1);
+    });
+
+    it('returns the value of the matchScore property when matched', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { highway: 'motorway' }, matchScore: 0.2 });
+      const entity = Rapid.osmWay({ tags: { highway: 'motorway' } });
+      expect(preset.matchScore(entity.tags)).to.equal(0.2);
+    });
+
+    it('defaults to the number of matched tags', () => {
+      let preset = new Rapid.Preset(context, 'test', { tags: { highway: 'residential' } });
+      let entity = Rapid.osmWay({ tags: { highway: 'residential' } });
+      expect(preset.matchScore(entity.tags)).to.equal(1);
+
+      preset = new Rapid.Preset(context, 'test', { tags: { highway: 'service', service: 'alley' } });
+      entity = Rapid.osmWay({ tags: { highway: 'service', service: 'alley' } });
+      expect(preset.matchScore(entity.tags)).to.equal(2);
+    });
+
+    it('counts * as a match for any value with score 0.5', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { building: '*' } });
+      const entity = Rapid.osmWay({ tags: { building: 'yep' } });
+      expect(preset.matchScore(entity.tags)).to.equal(0.5);
+    });
+
+    it('boosts matchScore for additional matches in addTags', () => {
+      const presetSupercenter = new Rapid.Preset(context, 'shop/supermarket/walmart_supercenter', {
+        tags: { 'brand:wikidata': 'Q483551', 'shop': 'supermarket' },
+        addTags: { 'name': 'Walmart Supercenter'  }
+      });
+      const presetMarket = new Rapid.Preset(context, 'shop/supermarket/walmart_market', {
+        tags: { 'brand:wikidata': 'Q483551', 'shop': 'supermarket' },
+        addTags: { 'name': 'Walmart Neighborhood Market'  }
+      });
+
+      const supercenter = Rapid.osmWay({ tags: {
+        'brand:wikidata': 'Q483551',
+        'shop': 'supermarket',
+        'name': 'Walmart Supercenter'
+      } });
+      const market = Rapid.osmWay({ tags: {
+        'brand:wikidata': 'Q483551',
+        'shop': 'supermarket',
+        'name': 'Walmart Neighborhood Market'
+      } });
+
+      expect(presetSupercenter.matchScore(supercenter.tags))
+        .to.be.greaterThan(presetMarket.matchScore(supercenter.tags));
+
+      expect(presetMarket.matchScore(market.tags))
+        .to.be.greaterThan(presetSupercenter.matchScore(market.tags));
+      });
+    });
+
+  describe('isFallback', () => {
+    it('returns true if preset has no tags', () => {
+      const preset = new Rapid.Preset(context, 'point', { tags: {} });
+      expect(preset.isFallback()).to.be.true;
+    });
+
+    it('returns true if preset has a single \'area\' tag', () => {
+      const preset = new Rapid.Preset(context, 'area', { tags: { area: 'yes' } });
+      expect(preset.isFallback()).to.be.true;
+    });
+
+    it('returns false if preset has a single non-\'area\' tag', () => {
+      const preset = new Rapid.Preset(context, 'building', { tags: { building: 'yes' } });
+      expect(preset.isFallback()).to.be.false;
+    });
+
+    it('returns false if preset has multiple tags', () => {
+      const preset = new Rapid.Preset(context, 'building', { tags: { area: 'yes', building: 'yes' } });
+      expect(preset.isFallback()).to.be.false;
+    });
+  });
+
+  describe('#setTags', () => {
+    let _savedAreaKeys;
+
+    before(() => {
+      _savedAreaKeys = Rapid.osmAreaKeys;
+      Rapid.osmSetAreaKeys({ building: {}, natural: {} });
+    });
+
+    after(() => {
+      Rapid.osmSetAreaKeys(_savedAreaKeys);
+    });
+
+    it('adds match tags', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { highway: 'residential' } });
+      expect(preset.setTags({}, 'line')).to.eql({ highway: 'residential' });
+    });
+
+    it('adds wildcard tags with value \'yes\'', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { natural: '*' } });
+      expect(preset.setTags({}, 'area')).to.eql({ natural: 'yes' });
+    });
+
+    it('prefers to add tags of addTags property', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { building: '*' }, addTags: { building: 'ok' } });
+      expect(preset.setTags({}, 'area')).to.eql({ building: 'ok' });
+    });
+
+    it('adds default tags of fields with matching geometry', () => {
+      const field = new Rapid.Field(context, 'field', { key: 'building', geometry: 'area', default: 'yes' });
+      const preset = new Rapid.Preset(context, 'test', { fields: ['field'] }, { field: field });
+      expect(preset.setTags({}, 'area')).to.eql({ area: 'yes', building: 'yes' });
+    });
+
+    it('adds no default tags of fields with non-matching geometry', () => {
+      const field = new Rapid.Field(context, 'field', { key: 'building', geometry: 'area', default: 'yes' });
+      const preset = new Rapid.Preset(context, 'test', { fields: ['field'] }, { field: field });
+      expect(preset.setTags({}, 'point')).to.eql({});
+    });
+
+    describe('for a preset with no tag in areaKeys', () => {
+      const preset = new Rapid.Preset(context, 'test', { geometry: ['line', 'area'], tags: { name: 'testname', highway: 'pedestrian' } });
+
+      it('doesn\'t add area=yes to non-areas', () => {
+        expect(preset.setTags({}, 'line')).to.eql({ name: 'testname', highway: 'pedestrian' });
+      });
+
+      it('adds area=yes to areas', () => {
+        expect(preset.setTags({}, 'area')).to.eql({ name: 'testname', highway: 'pedestrian', area: 'yes' });
+      });
+    });
+
+    describe('for a preset with a tag in areaKeys', () => {
+      it('doesn\'t add area=yes automatically', () => {
+        const preset = new Rapid.Preset(context, 'test', { geometry: ['area'], tags: { name: 'testname', building: 'yes' } });
+        expect(preset.setTags({}, 'area')).to.eql({ name: 'testname', building: 'yes' });
+      });
+
+      it('does add area=yes if asked to', () => {
+        const preset = new Rapid.Preset(context, 'test', { geometry: ['area'], tags: { name: 'testname', area: 'yes' } });
+        expect(preset.setTags({}, 'area')).to.eql({ name: 'testname', area: 'yes' });
+      });
+    });
+  });
+
+  describe('#unsetTags', () => {
+    it('removes tags that match preset tags', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { highway: 'residential' } });
+      expect(preset.unsetTags({ highway: 'residential' }, 'area')).to.eql({});
+    });
+
+    it('removes tags that match field default tags', () => {
+      const field = new Rapid.Field(context, 'field', { key: 'building', geometry: 'area', default: 'yes' });
+      const preset = new Rapid.Preset(context, 'test', { fields: ['field'] }, { field: field });
+      expect(preset.unsetTags({ building: 'yes' }, 'area')).to.eql({});
+    });
+
+    it('removes area=yes', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { highway: 'pedestrian' } });
+      expect(preset.unsetTags({ highway: 'pedestrian', area: 'yes' }, 'area')).to.eql({});
+    });
+
+    it('preserves tags that do not match field default tags', () => {
+      const field = new Rapid.Field(context, 'field', { key: 'building', geometry: 'area', default: 'yes' });
+      const preset = new Rapid.Preset(context, 'test', { fields: ['field'] }, { field: field });
+      expect(preset.unsetTags({ building: 'yep' }, 'area')).to.eql({ building: 'yep' });
+    });
+
+    it('preserves tags that are not listed in removeTags', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { a: 'b' }, removeTags: {} });
+      expect(preset.unsetTags({ a: 'b' }, 'area')).to.eql({ a: 'b' });
+    });
+
+    it('uses tags from addTags if removeTags is not defined', () => {
+      const preset = new Rapid.Preset(context, 'test', { tags: { a: 'b' }, addTags: { remove: 'me' } });
+      expect(preset.unsetTags({ a: 'b', remove: 'me' }, 'area')).to.eql({ a: 'b' });
+    });
+  });
+
+});
diff --git a/test/spec/core/Tree.test.js b/test/spec/core/lib/Tree.test.js
similarity index 99%
rename from test/spec/core/Tree.test.js
rename to test/spec/core/lib/Tree.test.js
index fb9c84c235..ca35ef2c87 100644
--- a/test/spec/core/Tree.test.js
+++ b/test/spec/core/lib/Tree.test.js
@@ -1,4 +1,5 @@
 describe('Tree', () => {
+
   describe('#rebase', () => {
     it('adds entities to the tree', () => {
       const graph = new Rapid.Graph();
diff --git a/test/spec/core/validator.js b/test/spec/core/validator.js
deleted file mode 100644
index a81325a455..0000000000
--- a/test/spec/core/validator.js
+++ /dev/null
@@ -1,52 +0,0 @@
-describe('coreValidator', function () {
-    var context;
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
-
-    function createInvalidWay() {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2']});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w)
-        );
-    }
-
-    it('has no issues on init', function() {
-        var validator = new Rapid.coreValidator(context);
-        validator.init();
-        var issues = validator.getIssues();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('validate returns a promise, fulfilled when the validation has completed', function(done) {
-        createInvalidWay();
-        var validator = new Rapid.coreValidator(context);
-        validator.init();
-        var issues = validator.getIssues();
-        expect(issues).to.have.lengthOf(0);
-
-        var prom = validator.validate();
-        prom
-            .then(function() {
-                issues = validator.getIssues();
-                expect(issues).to.have.lengthOf(1);
-                var issue = issues[0];
-                expect(issue.type).to.eql('missing_tag');
-                expect(issue.entityIds).to.have.lengthOf(1);
-                expect(issue.entityIds[0]).to.eql('w-1');
-                done();
-            })
-            .catch(function(err) {
-                done(err);
-            });
-
-        window.setTimeout(function() {}, 20); // async - to let the promise settle in phantomjs
-    });
-
-});
diff --git a/test/spec/lib/locale.js b/test/spec/lib/locale.js
deleted file mode 100644
index 081a1e4959..0000000000
--- a/test/spec/lib/locale.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* global locale:true, t:false */
-/* eslint no-console: 0 */
-
-describe.skip('locale', function() {
-    var saved, error;
-
-    beforeEach(function() {
-        saved = locale;
-        error = console.error;
-        console.error = function () {};
-        locale = { _current: 'en', en: {test: 'test', foo: 'bar'}, __: {}};
-    });
-
-    afterEach(function() {
-        locale = saved;
-        console.error = error;
-    });
-
-    describe('t', function() {
-        it('defaults to locale._current', function() {
-            expect(t('test')).to.equal('test');
-        });
-
-        it('supports a default option', function() {
-            expect(t('nonesuch', {default: 'default'})).to.equal('default');
-        });
-
-        it('falls back to en', function() {
-            locale._current = '__';
-            expect(t('test')).to.equal('test');
-        });
-    });
-});
diff --git a/test/spec/operations/extract.js b/test/spec/operations/extract.js
index 6383542b40..4ac59bd342 100644
--- a/test/spec/operations/extract.js
+++ b/test/spec/operations/extract.js
@@ -1,173 +1,180 @@
-describe('operationExtract', function () {
-    var graph;
-
-    // Set up the fake context
-    var fakeMap = {};
-    fakeMap.extent = function() { return new sdk.Extent([-180, -90], [180, 90]); };
-
-    var fakeContext = {};
-    fakeContext.graph = function() { return graph; };
-    fakeContext.entity = function(id) { return graph.entity(id); };
-    fakeContext.hasEntity = function(id) { return graph.hasEntity(id); };
-    fakeContext.hasHiddenConnections = function() { return false; };
-    fakeContext.inIntro = function() { return false; };
-    fakeContext.keyBinding = function() { return false; };
-    fakeContext.map = function() { return fakeMap; };
-
-    var fakeTags = { 'name': 'fake' };
-
-    // Set up graph
-    var createFakeNode = function (id, hasTags) {
-        return hasTags
-            ? { id: id, type: 'node', loc: [0, 0], tags: fakeTags }
-            : { id: id, type: 'node', loc: [0, 0] };
-    };
-
-    describe('available', function () {
-        beforeEach(function () {
-            // a - node with tags & parent way
-            // b - node with tags & 2 parent ways
-            // c - node with no tags, parent way
-            // d - node with no tags, 2 parent ways
-            // e - node with tags, no parent way
-            // f - node with no tags, no parent way
-            graph = new Rapid.Graph([
-                Rapid.osmNode(createFakeNode('a', true)),
-                Rapid.osmNode(createFakeNode('b', true)),
-                Rapid.osmNode(createFakeNode('c', false)),
-                Rapid.osmNode(createFakeNode('d', false)),
-                Rapid.osmNode(createFakeNode('e', true)),
-                Rapid.osmNode(createFakeNode('f', false)),
-                Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c', 'd'] }),
-                Rapid.osmWay({ id: 'y', nodes: ['b', 'd'] })
-            ]);
-        });
-
-        it('is not available for no selected ids', function () {
-            var result = Rapid.operationExtract(fakeContext, []).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for unknown selected id', function () {
-            var result = Rapid.operationExtract(fakeContext, ['z']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for selected way', function () {
-            var result = Rapid.operationExtract(fakeContext, ['x']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for selected node with tags, no parent way', function () {
-            var result = Rapid.operationExtract(fakeContext, ['e']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for selected node with no tags, no parent way', function () {
-            var result = Rapid.operationExtract(fakeContext, ['f']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for selected node with no tags, parent way', function () {
-            var result = Rapid.operationExtract(fakeContext, ['c']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for selected node with no tags, two parent ways', function () {
-            var result = Rapid.operationExtract(fakeContext, ['d']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is available for selected node with tags, parent way', function () {
-            var result = Rapid.operationExtract(fakeContext, ['a']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for selected node with tags, two parent ways', function () {
-            var result = Rapid.operationExtract(fakeContext, ['b']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for two selected nodes with tags and parent ways', function () {
-            var result = Rapid.operationExtract(fakeContext, ['a', 'b']).available();
-            expect(result).to.be.ok;
-        });
+describe('operationExtract', () => {
+  let _graph;
+
+  class MockMap {
+    constructor() { }
+    extent() { return new sdk.Extent([-180, -90], [180, 90]); }
+  }
+
+  class MockContext {
+    constructor()           {
+      this._map = new MockMap();
+      this._storageSystem = new Rapid.StorageSystem(this);
+      this._presetSystem = new Rapid.PresetSystem(this);
+    }
+    mapSystem()             { return this._map; }
+    storageSystem()         { return this._storageSystem; }
+    presetSystem()          { return this._presetSystem; }
+    graph()                 { return _graph; }
+    entity(id)              { return _graph.entity(id); }
+    hasEntity(id)           { return _graph.hasEntity(id); }
+    hasHiddenConnections()  { return false; }
+    inIntro()               { return false; }
+    keyBinding()            { return false; }
+    t(id)                   { return id; }
+    tHtml(id)               { return id; }
+  }
+
+  const context = new MockContext();
+
+
+  describe('available', () => {
+    beforeEach(() => {
+      // a - node with tags & parent way
+      // b - node with tags & 2 parent ways
+      // c - node with no tags, parent way
+      // d - node with no tags, 2 parent ways
+      // e - node with tags, no parent way
+      // f - node with no tags, no parent way
+      _graph = new Rapid.Graph([
+        Rapid.osmNode({ id: 'a', loc: [0, 0], tags: { 'name': 'fake' } }),
+        Rapid.osmNode({ id: 'b', loc: [0, 0], tags: { 'name': 'fake' } }),
+        Rapid.osmNode({ id: 'c', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'd', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'e', loc: [0, 0], tags: { 'name': 'fake' } }),
+        Rapid.osmNode({ id: 'f', loc: [0, 0] }),
+        Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c', 'd'] }),
+        Rapid.osmWay({ id: 'y', nodes: ['b', 'd'] })
+      ]);
     });
 
+    it('is not available for no selected ids', () => {
+      const result = Rapid.operationExtract(context, []).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for unknown selected id', () => {
+      const result = Rapid.operationExtract(context, ['z']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for selected way', () => {
+      const result = Rapid.operationExtract(context, ['x']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for selected node with tags, no parent way', () => {
+      const result = Rapid.operationExtract(context, ['e']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for selected node with no tags, no parent way', () => {
+      const result = Rapid.operationExtract(context, ['f']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for selected node with no tags, parent way', () => {
+      const result = Rapid.operationExtract(context, ['c']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for selected node with no tags, two parent ways', () => {
+      const result = Rapid.operationExtract(context, ['d']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is available for selected node with tags, parent way', () => {
+      const result = Rapid.operationExtract(context, ['a']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for selected node with tags, two parent ways', () => {
+      const result = Rapid.operationExtract(context, ['b']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for two selected nodes with tags and parent ways', () => {
+      const result = Rapid.operationExtract(context, ['a', 'b']).available();
+      expect(result).to.be.ok;
+    });
+  });
+
+
+  describe('disabled', () => {
+    it('returns enabled for non-related node', () => {
+      _graph = new Rapid.Graph([
+        Rapid.osmNode({ id: 'a', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'b', loc: [0, 0], tags: { 'name': 'fake' } }),
+        Rapid.osmNode({ id: 'c', loc: [0, 0] }),
+        Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c'] })
+      ]);
 
-    describe('disabled', function () {
-        it('returns enabled for non-related node', function () {
-            graph = new Rapid.Graph([
-                Rapid.osmNode(createFakeNode('a', false)),
-                Rapid.osmNode(createFakeNode('b', true)),
-                Rapid.osmNode(createFakeNode('c', false)),
-                Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c'] })
-            ]);
-            var result = Rapid.operationExtract(fakeContext, ['b']).disabled();
-            expect(result).to.be.not.ok;
-        });
-
-        it('returns enabled for non-restriction related node', function () {
-            graph = new Rapid.Graph([
-                Rapid.osmNode(createFakeNode('a', false)),
-                Rapid.osmNode(createFakeNode('b', true)),
-                Rapid.osmNode(createFakeNode('c', false)),
-                Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c'] }),
-                Rapid.osmRelation({ id: 'r', members: [{ id: 'b', role: 'label' }] })
-            ]);
-            var result = Rapid.operationExtract(fakeContext, ['b']).disabled();
-            expect(result).to.be.not.ok;
-        });
-
-        it('returns enabled for via node in restriction', function () {
-            // https://wiki.openstreetmap.org/wiki/Relation:restriction indicates that
-            // from & to roles are only appropriate for Ways
-            graph = new Rapid.Graph([
-                Rapid.osmNode(createFakeNode('a', false)),
-                Rapid.osmNode(createFakeNode('b', false)),
-                Rapid.osmNode(createFakeNode('c', false)),
-                Rapid.osmNode(createFakeNode('d', true)),
-                Rapid.osmNode(createFakeNode('e', false)),
-                Rapid.osmNode(createFakeNode('f', false)),
-                Rapid.osmNode(createFakeNode('g', false)),
-                Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c'] }),
-                Rapid.osmWay({ id: 'y', nodes: ['e', 'f', 'g'] }),
-                Rapid.osmRelation({id: 'r', tags: {type: 'restriction', restriction: 'no_right_turn'},
-                    members: [
-                        { id: 'x', type: 'way', role: 'from' },
-                        { id: 'd', type: 'node', role: 'via' },
-                        { id: 'z', type: 'way', role: 'to' }
-                    ]
-                })
-            ]);
-            var result = Rapid.operationExtract(fakeContext, ['d']).disabled();
-            expect(result).to.be.not.ok;
-        });
-
-        it('returns enabled for location_hint node in restriction', function () {
-            // https://wiki.openstreetmap.org/wiki/Relation:restriction indicates that
-            // from & to roles are only appropriate for Ways
-            graph = new Rapid.Graph([
-                Rapid.osmNode(createFakeNode('a', false)),
-                Rapid.osmNode(createFakeNode('b', false)),
-                Rapid.osmNode(createFakeNode('c', false)),
-                Rapid.osmNode(createFakeNode('d', true)),
-                Rapid.osmNode(createFakeNode('e', false)),
-                Rapid.osmNode(createFakeNode('f', false)),
-                Rapid.osmNode(createFakeNode('g', false)),
-                Rapid.osmWay({ id: 'x', nodes: ['a', 'b'] }),
-                Rapid.osmWay({ id: 'y', nodes: ['e', 'f', 'g'] }),
-                Rapid.osmRelation({id: 'r', tags: {type: 'restriction', restriction: 'no_right_turn'},
-                    members: [
-                        { id: 'x', type: 'way', role: 'from' },
-                        { id: 'c', type: 'node', role: 'via' },
-                        { id: 'd', type: 'node', role: 'location_hint' },
-                        { id: 'z', type: 'way', role: 'to' }
-                    ]
-                })
-            ]);
-            var result = Rapid.operationExtract(fakeContext, ['d']).disabled();
-            expect(result).to.be.not.ok;
-        });
+      const result = Rapid.operationExtract(context, ['b']).disabled();
+      expect(result).to.be.not.ok;
     });
+
+    it('returns enabled for non-restriction related node', () => {
+      _graph = new Rapid.Graph([
+        Rapid.osmNode({ id: 'a', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'b', loc: [0, 0], tags: { 'name': 'fake' } }),
+        Rapid.osmNode({ id: 'c', loc: [0, 0] }),
+        Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c'] }),
+        Rapid.osmRelation({ id: 'r', members: [{ id: 'b', role: 'label' }] })
+      ]);
+      const result = Rapid.operationExtract(context, ['b']).disabled();
+      expect(result).to.be.not.ok;
+    });
+
+    it('returns enabled for via node in restriction', () => {
+      // https://wiki.openstreetmap.org/wiki/Relation:restriction indicates that
+      // from and to roles are only appropriate for Ways
+      _graph = new Rapid.Graph([
+        Rapid.osmNode({ id: 'a', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'b', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'c', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'd', loc: [0, 0], tags: { 'name': 'fake' } }),
+        Rapid.osmNode({ id: 'e', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'f', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'g', loc: [0, 0] }),
+        Rapid.osmWay({ id: 'x', nodes: ['a', 'b', 'c'] }),
+        Rapid.osmWay({ id: 'y', nodes: ['e', 'f', 'g'] }),
+        Rapid.osmRelation({id: 'r', tags: { type: 'restriction', restriction: 'no_right_turn' },
+          members: [
+            { id: 'x', type: 'way', role: 'from' },
+            { id: 'd', type: 'node', role: 'via' },
+            { id: 'z', type: 'way', role: 'to' }
+          ]
+        })
+      ]);
+      const result = Rapid.operationExtract(context, ['d']).disabled();
+      expect(result).to.be.not.ok;
+    });
+
+    it('returns enabled for location_hint node in restriction', () => {
+      // https://wiki.openstreetmap.org/wiki/Relation:restriction indicates that
+      // from and to roles are only appropriate for Ways
+      _graph = new Rapid.Graph([
+        Rapid.osmNode({ id: 'a', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'b', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'c', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'd', loc: [0, 0], tags: { 'name': 'fake' } }),
+        Rapid.osmNode({ id: 'e', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'f', loc: [0, 0] }),
+        Rapid.osmNode({ id: 'g', loc: [0, 0] }),
+        Rapid.osmWay({ id: 'x', nodes: ['a', 'b'] }),
+        Rapid.osmWay({ id: 'y', nodes: ['e', 'f', 'g'] }),
+        Rapid.osmRelation({id: 'r', tags: {type: 'restriction', restriction: 'no_right_turn'},
+          members: [
+            { id: 'x', type: 'way', role: 'from' },
+            { id: 'c', type: 'node', role: 'via' },
+            { id: 'd', type: 'node', role: 'location_hint' },
+            { id: 'z', type: 'way', role: 'to' }
+          ]
+        })
+      ]);
+      const result = Rapid.operationExtract(context, ['d']).disabled();
+      expect(result).to.be.not.ok;
+    });
+  });
+
 });
diff --git a/test/spec/operations/straighten.js b/test/spec/operations/straighten.js
index ef4f460608..5ec17dcb23 100644
--- a/test/spec/operations/straighten.js
+++ b/test/spec/operations/straighten.js
@@ -1,121 +1,133 @@
-describe('operationStraighten', function () {
-    var graph;
-
-    // Set up the fake context
-    var fakeContext = {};
-    fakeContext.graph = function() { return graph; };
-    fakeContext.entity = function(id) { return graph.entity(id); };
-    fakeContext.hasEntity = function(id) { return graph.hasEntity(id); };
-    fakeContext.hasHiddenConnections = function() { return false; };
-    fakeContext.inIntro = function() { return false; };
-    fakeContext.keyBinding = function () { return false; };
-
-    describe('#available', function () {
-        beforeEach(function () {
-            // w1 - way with 2 nodes
-            // w1-2 - way with 2 nodes connected to w1
-            // w2 - way with 3 nodes connected to w1
-            // w3 - way with 3 nodes connected to w2
-            // w4 - way with 3 nodes connected to w3
-            // w5 - way with 4 nodes not connected to any other nodes
-            graph = new Rapid.Graph([
-                Rapid.osmNode({ id: 'n1', type: 'node' }),
-                Rapid.osmNode({ id: 'n2', type: 'node' }),
-                Rapid.osmNode({ id: 'n2-1', type: 'node' }),
-                Rapid.osmNode({ id: 'n3', type: 'node' }),
-                Rapid.osmNode({ id: 'n4', type: 'node' }),
-                Rapid.osmNode({ id: 'n5', type: 'node' }),
-                Rapid.osmNode({ id: 'n6', type: 'node' }),
-                Rapid.osmNode({ id: 'n7', type: 'node' }),
-                Rapid.osmNode({ id: 'n8', type: 'node' }),
-                Rapid.osmNode({ id: 'n9', type: 'node' }),
-                Rapid.osmNode({ id: 'n10', type: 'node' }),
-                Rapid.osmNode({ id: 'n11', type: 'node' }),
-                Rapid.osmNode({ id: 'n12', type: 'node' }),
-                Rapid.osmNode({ id: 'n13', type: 'node' }),
-                Rapid.osmWay({ id: 'w1', nodes: ['n1', 'n2'] }),
-                Rapid.osmWay({ id: 'w1-2', nodes: ['n2', 'n2-1'] }),
-                Rapid.osmWay({ id: 'w2', nodes: ['n2', 'n3', 'n4'] }),
-                Rapid.osmWay({ id: 'w2-2', nodes: ['n4', 'n13', 'n2'] }), // w-2 reversed
-                Rapid.osmWay({ id: 'w3', nodes: ['n4', 'n5', 'n6'] }),
-                Rapid.osmWay({ id: 'w4', nodes: ['n6', 'n7', 'n8'] }),
-                Rapid.osmWay({ id: 'w5', nodes: ['n9', 'n10', 'n11', 'n12'] }),
-            ]);
-        });
-
-        it('is not available for no selected ids', function () {
-            var result = Rapid.operationStraighten(fakeContext, []).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for way with only 2 nodes', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w1']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is available for way with only 2 nodes connected to another 2-node way', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w1', 'w1-2']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is not available for non-continuous ways', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w2', 'w4']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is available for selected way with more than 2 nodes', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w2']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for selected, ordered, continuous ways', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w1', 'w2', 'w3']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for selected, un-ordered, continuous ways', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w1', 'w3', 'w2']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for selected, continuous ways with different way-directions', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w1', 'w3', 'w2-2']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for 2 selected nodes in the same way, more than one node apart', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w5', 'n9', 'n11']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for 2 selected nodes in adjacent ways, more than one node apart', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w2', 'w3', 'n5', 'n3']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for 2 selected nodes in non-adjacent ways, providing in between ways are selected', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['n2', 'n7', 'w4', 'w1', 'w3', 'w2']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is available for 2 selected nodes in non-adjacent, non-same-directional ways, providing in between ways are selected', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['n2', 'n7', 'w4', 'w1', 'w3', 'w2-2']).available();
-            expect(result).to.be.ok;
-        });
-
-        it('is not available for nodes not on selected ways', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w5', 'n4', 'n11']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for one selected node', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w5', 'n9']).available();
-            expect(result).to.be.not.ok;
-        });
-
-        it('is not available for more than two selected nodes', function () {
-            var result = Rapid.operationStraighten(fakeContext, ['w5', 'n9', 'n11', 'n12']).available();
-            expect(result).to.be.not.ok;
-        });
+describe('operationStraighten', () => {
+  let _graph;
+
+  class MockMap {
+    constructor() { }
+    extent() { return new sdk.Extent([-180, -90], [180, 90]); }
+  }
+
+  class MockContext {
+    constructor()           { this.map = new MockMap(); }
+    mapSystem()             { return this.map; }
+    graph()                 { return _graph; }
+    entity(id)              { return _graph.entity(id); }
+    hasEntity(id)           { return _graph.hasEntity(id); }
+    hasHiddenConnections()  { return false; }
+    inIntro()               { return false; }
+    keyBinding()            { return false; }
+    t(id)                   { return id; }
+    tHtml(id)               { return id; }
+  }
+
+  const context = new MockContext();
+
+
+  describe('#available', () => {
+    beforeEach(() => {
+      // w1 - way with 2 nodes
+      // w1-2 - way with 2 nodes connected to w1
+      // w2 - way with 3 nodes connected to w1
+      // w3 - way with 3 nodes connected to w2
+      // w4 - way with 3 nodes connected to w3
+      // w5 - way with 4 nodes not connected to any other nodes
+      _graph = new Rapid.Graph([
+        Rapid.osmNode({ id: 'n1' }),
+        Rapid.osmNode({ id: 'n2' }),
+        Rapid.osmNode({ id: 'n2-1' }),
+        Rapid.osmNode({ id: 'n3' }),
+        Rapid.osmNode({ id: 'n4' }),
+        Rapid.osmNode({ id: 'n5' }),
+        Rapid.osmNode({ id: 'n6' }),
+        Rapid.osmNode({ id: 'n7' }),
+        Rapid.osmNode({ id: 'n8' }),
+        Rapid.osmNode({ id: 'n9' }),
+        Rapid.osmNode({ id: 'n10' }),
+        Rapid.osmNode({ id: 'n11' }),
+        Rapid.osmNode({ id: 'n12' }),
+        Rapid.osmNode({ id: 'n13' }),
+        Rapid.osmWay({ id: 'w1', nodes: ['n1', 'n2'] }),
+        Rapid.osmWay({ id: 'w1-2', nodes: ['n2', 'n2-1'] }),
+        Rapid.osmWay({ id: 'w2', nodes: ['n2', 'n3', 'n4'] }),
+        Rapid.osmWay({ id: 'w2-2', nodes: ['n4', 'n13', 'n2'] }), // w-2 reversed
+        Rapid.osmWay({ id: 'w3', nodes: ['n4', 'n5', 'n6'] }),
+        Rapid.osmWay({ id: 'w4', nodes: ['n6', 'n7', 'n8'] }),
+        Rapid.osmWay({ id: 'w5', nodes: ['n9', 'n10', 'n11', 'n12'] }),
+      ]);
     });
+
+    it('is not available for no selected ids', () => {
+      const result = Rapid.operationStraighten(context, []).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for way with only 2 nodes', () => {
+      const result = Rapid.operationStraighten(context, ['w1']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is available for way with only 2 nodes connected to another 2-node way', () => {
+      const result = Rapid.operationStraighten(context, ['w1', 'w1-2']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is not available for non-continuous ways', () => {
+      const result = Rapid.operationStraighten(context, ['w2', 'w4']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is available for selected way with more than 2 nodes', () => {
+      const result = Rapid.operationStraighten(context, ['w2']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for selected, ordered, continuous ways', () => {
+      const result = Rapid.operationStraighten(context, ['w1', 'w2', 'w3']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for selected, un-ordered, continuous ways', () => {
+      const result = Rapid.operationStraighten(context, ['w1', 'w3', 'w2']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for selected, continuous ways with different way-directions', () => {
+      const result = Rapid.operationStraighten(context, ['w1', 'w3', 'w2-2']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for 2 selected nodes in the same way, more than one node apart', () => {
+      const result = Rapid.operationStraighten(context, ['w5', 'n9', 'n11']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for 2 selected nodes in adjacent ways, more than one node apart', () => {
+      const result = Rapid.operationStraighten(context, ['w2', 'w3', 'n5', 'n3']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for 2 selected nodes in non-adjacent ways, providing in between ways are selected', () => {
+      const result = Rapid.operationStraighten(context, ['n2', 'n7', 'w4', 'w1', 'w3', 'w2']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is available for 2 selected nodes in non-adjacent, non-same-directional ways, providing in between ways are selected', () => {
+      const result = Rapid.operationStraighten(context, ['n2', 'n7', 'w4', 'w1', 'w3', 'w2-2']).available();
+      expect(result).to.be.ok;
+    });
+
+    it('is not available for nodes not on selected ways', () => {
+      const result = Rapid.operationStraighten(context, ['w5', 'n4', 'n11']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for one selected node', () => {
+      const result = Rapid.operationStraighten(context, ['w5', 'n9']).available();
+      expect(result).to.be.not.ok;
+    });
+
+    it('is not available for more than two selected nodes', () => {
+      const result = Rapid.operationStraighten(context, ['w5', 'n9', 'n11', 'n12']).available();
+      expect(result).to.be.not.ok;
+    });
+  });
 });
diff --git a/test/spec/pixi/PixiLayerMapUI.js b/test/spec/pixi/PixiLayerMapUI.js
index e9e820347a..3f5c33d696 100644
--- a/test/spec/pixi/PixiLayerMapUI.js
+++ b/test/spec/pixi/PixiLayerMapUI.js
@@ -4,7 +4,7 @@ describe('PixiLayerMapUI', () => {
   beforeEach(() => {
     container = d3.select('body').append('div');
     context = Rapid.coreContext().assetPath('../dist/').init().container(container);
-    map = context.map();
+    map = context.mapSystem();
     map.render(container);
   });
 
diff --git a/test/spec/presets/category.js b/test/spec/presets/category.js
deleted file mode 100644
index 70ecea92a2..0000000000
--- a/test/spec/presets/category.js
+++ /dev/null
@@ -1,27 +0,0 @@
-describe('presetCategory', function() {
-    var category = {
-        'geometry': 'line',
-        'icon': 'highway',
-        'name': 'roads',
-        'members': [ 'highway/residential' ]
-    };
-
-    var residential = Rapid.presetPreset('highway/residential',
-        { tags: { highway: 'residential' }, geometry: ['line'] }
-    );
-    var allPresets = { 'highway/residential': residential };
-
-
-    it('maps members names to preset instances', function() {
-        var c = Rapid.presetCategory('road', category, allPresets);
-        expect(c.members.collection[0]).to.eql(residential);
-    });
-
-    describe('#matchGeometry', function() {
-        it('matches the type of an entity', function() {
-            var c = Rapid.presetCategory('road', category, allPresets);
-            expect(c.matchGeometry('line')).to.eql(true);
-            expect(c.matchGeometry('point')).to.eql(false);
-        });
-    });
-});
diff --git a/test/spec/presets/collection.js b/test/spec/presets/collection.js
deleted file mode 100644
index 3fd9a9c561..0000000000
--- a/test/spec/presets/collection.js
+++ /dev/null
@@ -1,130 +0,0 @@
-describe('presetCollection', function() {
-    // Note: __TEST is added to these because the search uses localized
-    //   preset.name() keyed on id, which would use the names from en.json.
-    // Except for fallback presets which must have those names because of the logic in fallback()
-    var p = {
-        point: Rapid.presetPreset('point',
-            { name: 'Point', tags: {}, geometry: ['point'], matchScore: 0.1 }
-        ),
-        line: Rapid.presetPreset('line',
-            { name: 'Line', tags: {}, geometry: ['line'], matchScore: 0.1 }
-        ),
-        area: Rapid.presetPreset('area',
-            { name: 'Area', tags: { area: 'yes' }, geometry: ['area'], matchScore: 0.1 }
-        ),
-        grill: Rapid.presetPreset('__TEST/amenity/bbq',
-            { name: 'Grill', tags: { amenity: 'bbq' }, geometry: ['point'], terms: [] }
-        ),
-        sandpit: Rapid.presetPreset('__TEST/amenity/grit_bin',
-            { name: 'Sandpit', tags: { amenity: 'grit_bin' }, geometry: ['point'], terms: [] }
-        ),
-        residential: Rapid.presetPreset('__TEST/highway/residential',
-            { name: 'Residential Area', tags: { highway: 'residential' }, geometry: ['point', 'area'], terms: [] }
-        ),
-        grass1: Rapid.presetPreset('__TEST/landuse/grass1',
-            { name: 'Grass', tags: { landuse: 'grass' }, geometry: ['point', 'area'], terms: [] }
-        ),
-        grass2: Rapid.presetPreset('__TEST/landuse/grass2',
-            { name: 'Ğṝȁß', tags: { landuse: 'ğṝȁß' }, geometry: ['point', 'area'], terms: [] }
-        ),
-        park: Rapid.presetPreset('__TEST/leisure/park',
-            { name: 'Park', tags: { leisure: 'park' }, geometry: ['point', 'area'], terms: [ 'grass' ], matchScore: 0.5 }
-        ),
-        parking: Rapid.presetPreset('__TEST/amenity/parking',
-            { name: 'Parking', tags: { amenity: 'parking' }, geometry: ['point', 'area'], terms: [ 'cars' ] }
-        ),
-        soccer: Rapid.presetPreset('__TEST/leisure/pitch/soccer',
-            { name: 'Soccer Field', tags: { leisure: 'pitch', sport: 'soccer' }, geometry: ['point', 'area'], terms: ['fußball'] }
-        ),
-        football: Rapid.presetPreset('__TEST/leisure/pitch/american_football',
-            { name: 'Football Field', tags: { leisure: 'pitch', sport: 'american_football' }, geometry: ['point', 'area'], terms: ['gridiron'] }
-        )
-    };
-
-
-    var c = Rapid.presetCollection([
-        p.point, p.line, p.area, p.grill, p.sandpit, p.residential,
-        p.grass1, p.grass2, p.park, p.parking, p.soccer, p.football
-    ]);
-
-    describe('#item', function() {
-        it('fetches a preset by id', function() {
-            expect(c.item('__TEST/highway/residential')).to.equal(p.residential);
-        });
-    });
-
-    describe('#index', function() {
-        it('returns preset position in the collection', function() {
-            expect(c.index('point')).to.equal(0);
-        });
-        it('return -1 when given id for preset not in the collection', function() {
-            expect(c.index('foobar')).to.equal(-1);
-        });
-    });
-
-    describe('#matchGeometry', function() {
-        it('returns a new collection only containing presets matching a geometry', function() {
-            expect(c.matchGeometry('area').collection).to.include.members(
-                [p.area, p.residential, p.park, p.soccer, p.football]
-            );
-        });
-    });
-
-    describe('#search', function() {
-        it('matches leading name', function() {
-            var result = c.search('resid', 'area').collection;
-            expect(result.indexOf(p.residential)).to.eql(0);  // 1. 'Residential' (by name)
-        });
-
-        it('returns alternate matches in correct order', function() {
-            var result = c.search('gri', 'point').matchGeometry('point').collection;
-            expect(result.indexOf(p.grill), 'Grill').to.eql(0);            // 1. 'Grill' (leading name)
-            expect(result.indexOf(p.football), 'Football').to.eql(1);      // 2. 'Football' (leading term 'gridiron')
-            expect(result.indexOf(p.sandpit), 'Sandpit').to.eql(2);        // 3. 'Sandpit' (leading tag value 'grit_bin')
-            expect(result.indexOf(p.grass1), 'Grass').to.be.within(3,5);   // 4. 'Grass' (similar name)
-            expect(result.indexOf(p.grass2), 'Ğṝȁß').to.be.within(3,5);    // 5. 'Ğṝȁß' (similar name)
-            expect(result.indexOf(p.park), 'Park').to.be.within(3,5);      // 6. 'Park' (similar term 'grass')
-        });
-
-        it('sorts preset with matchScore penalty below others', function() {
-            var result = c.search('par', 'point').matchGeometry('point').collection;
-            expect(result.indexOf(p.parking), 'Parking').to.eql(0);   // 1. 'Parking' (default matchScore)
-            expect(result.indexOf(p.park), 'Park').to.eql(1);         // 2. 'Park' (low matchScore)
-        });
-
-        it('ignores matchScore penalty for exact name match', function() {
-            var result = c.search('park', 'point').matchGeometry('point').collection;
-            expect(result.indexOf(p.park), 'Park').to.eql(0);         // 1. 'Park' (low matchScore)
-            expect(result.indexOf(p.parking), 'Parking').to.eql(1);   // 2. 'Parking' (default matchScore)
-        });
-
-        it('considers diacritics on exact matches', function() {
-            var result = c.search('ğṝȁ', 'point').matchGeometry('point').collection;
-            expect(result.indexOf(p.grass2), 'Ğṝȁß').to.eql(0);    // 1. 'Ğṝȁß'  (leading name)
-            expect(result.indexOf(p.grass1), 'Grass').to.eql(1);   // 2. 'Grass' (similar name)
-        });
-
-        it('replaces diacritics on fuzzy matches', function() {
-            var result = c.search('graß', 'point').matchGeometry('point').collection;
-            expect(result.indexOf(p.grass1), 'Grass').to.be.within(0,1);   // 1. 'Grass' (similar name)
-            expect(result.indexOf(p.grass2), 'Ğṝȁß').to.be.within(0,1);    // 2. 'Ğṝȁß'  (similar name)
-        });
-
-        it('includes the appropriate fallback preset', function() {
-            expect(c.search('foo', 'point').collection, 'point').to.include(p.point);
-            expect(c.search('foo', 'line').collection, 'line').to.include(p.line);
-            expect(c.search('foo', 'area').collection, 'area').to.include(p.area);
-        });
-
-        it('excludes presets with searchable: false', function() {
-            var excluded = Rapid.presetPreset('excluded', {
-                name: 'excluded',
-                tags: { amenity: 'excluded' },
-                geometry: ['point'],
-                searchable: false
-            });
-            var collection = Rapid.presetCollection([excluded, p.point]);
-            expect(collection.search('excluded', 'point').collection).not.to.include(excluded);
-        });
-    });
-});
diff --git a/test/spec/presets/index.js b/test/spec/presets/index.js
deleted file mode 100644
index ca3e6edc57..0000000000
--- a/test/spec/presets/index.js
+++ /dev/null
@@ -1,465 +0,0 @@
-describe('presetIndex', function () {
-    var _savedPresets, _savedAreaKeys;
-
-    before(function() {
-        _savedPresets = Rapid.fileFetcher.cache().preset_presets;
-        _savedAreaKeys = Rapid.osmAreaKeys;
-    });
-
-    after(function() {
-        Rapid.fileFetcher.cache().preset_presets = _savedPresets;
-        Rapid.osmSetAreaKeys(_savedAreaKeys);
-    });
-
-
-    describe('#init', function () {
-        it('has a fallback point preset', function () {
-            var node = Rapid.osmNode({ id: 'n' });
-            var graph = new Rapid.Graph([node]);
-            var presets = Rapid.presetIndex();
-            expect(presets.match(node, graph).id).to.eql('point');
-        });
-        it('has a fallback line preset', function () {
-            var node = Rapid.osmNode({ id: 'n' });
-            var way = Rapid.osmWay({ id: 'w', nodes: ['n'] });
-            var graph = new Rapid.Graph([node, way]);
-            var presets = Rapid.presetIndex();
-            expect(presets.match(way, graph).id).to.eql('line');
-        });
-        it('has a fallback area preset', function () {
-            var node = Rapid.osmNode({ id: 'n' });
-            var way = Rapid.osmWay({ id: 'w', nodes: ['n'], tags: { area: 'yes' }});
-            var graph = new Rapid.Graph([node, way]);
-            var presets = Rapid.presetIndex();
-            expect(presets.match(way, graph).id).to.eql('area');
-        });
-        it('has a fallback relation preset', function () {
-            var relation = Rapid.osmRelation({ id: 'r' });
-            var graph = new Rapid.Graph([relation]);
-            var presets = Rapid.presetIndex();
-            expect(presets.match(relation, graph).id).to.eql('relation');
-        });
-    });
-
-
-    describe('#match', function () {
-        var testPresets = {
-            residential: { tags: { highway: 'residential' }, geometry: ['line'] },
-            park: { tags: { leisure: 'park' }, geometry: ['point', 'area'] }
-        };
-
-        it('returns a collection containing presets matching a geometry and tags', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                var way = Rapid.osmWay({ tags: { highway: 'residential' } });
-                var graph = new Rapid.Graph([way]);
-                expect(presets.match(way, graph).id).to.eql('residential');
-                done();
-            });
-        });
-
-        it('returns the appropriate fallback preset when no tags match', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            var point = Rapid.osmNode();
-            var line = Rapid.osmWay({ tags: { foo: 'bar' } });
-            var graph = new Rapid.Graph([point, line]);
-
-            presets.ensureLoaded().then(function() {
-                expect(presets.match(point, graph).id).to.eql('point');
-                expect(presets.match(line, graph).id).to.eql('line');
-                done();
-            });
-        });
-
-        it('matches vertices on a line as points', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            var point = Rapid.osmNode({ tags: { leisure: 'park' } });
-            var line = Rapid.osmWay({ nodes: [point.id], tags: { 'highway': 'residential' } });
-            var graph = new Rapid.Graph([point, line]);
-
-            presets.ensureLoaded().then(function() {
-                expect(presets.match(point, graph).id).to.eql('point');
-                done();
-            });
-        });
-
-        it('matches vertices on an addr:interpolation line as points', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            var point = Rapid.osmNode({ tags: { leisure: 'park' } });
-            var line = Rapid.osmWay({ nodes: [point.id], tags: { 'addr:interpolation': 'even' } });
-            var graph = new Rapid.Graph([point, line]);
-
-            presets.ensureLoaded().then(function() {
-                expect(presets.match(point, graph).id).to.eql('park');
-                done();
-            });
-        });
-    });
-
-
-    describe('#areaKeys', function () {
-        var testPresets = {
-            'amenity/fuel/shell': { tags: { 'amenity': 'fuel' }, geometry: ['point', 'area'], suggestion: true },
-            'highway/foo': { tags: { 'highway': 'foo' }, geometry: ['area'] },
-            'leisure/track': { tags: { 'leisure': 'track' }, geometry: ['line', 'area'] },
-            'natural': { tags: { 'natural': '*' }, geometry: ['point', 'vertex', 'area'] },
-            'natural/peak': { tags: { 'natural': 'peak' }, geometry: ['point', 'vertex'] },
-            'natural/tree_row': { tags: { 'natural': 'tree_row' }, geometry: ['line'] },
-            'natural/wood': { tags: { 'natural': 'wood' }, geometry: ['point', 'area'] }
-        };
-
-        it('includes keys for presets with area geometry', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.areaKeys()).to.include.keys('natural');
-                done();
-            });
-        });
-
-        it('discards key-values for presets with a line geometry', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.areaKeys().natural).to.include.keys('tree_row');
-                expect(presets.areaKeys().natural.tree_row).to.be.true;
-                done();
-            });
-        });
-
-        it('discards key-values for presets with both area and line geometry', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.areaKeys().leisure).to.include.keys('track');
-                done();
-            });
-        });
-
-        it('does not discard key-values for presets with neither area nor line geometry', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.areaKeys().natural).not.to.include.keys('peak');
-                done();
-            });
-        });
-
-        it('does not discard generic \'*\' key-values', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.areaKeys().natural).not.to.include.keys('natural');
-                done();
-            });
-        });
-
-        it('ignores keys like \'highway\' that are assumed to be lines', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.areaKeys()).not.to.include.keys('highway');
-                done();
-            });
-        });
-
-        it('ignores suggestion presets', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.areaKeys()).not.to.include.keys('amenity');
-                done();
-            });
-        });
-    });
-
-
-    describe('#addablePresetIDs', function () {
-        var testPresets = {
-            residential: { tags: { highway: 'residential' }, geometry: ['line'] },
-            park: { tags: { leisure: 'park' }, geometry: ['point', 'area'] },
-            bench: { tags: { amenity: 'bench' }, geometry: ['point', 'line'] }
-        };
-
-        it('addablePresetIDs is initially null', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                expect(presets.addablePresetIDs()).to.be.null;
-                done();
-            });
-        });
-
-        it('can set and get addablePresetIDs', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-
-                expect(presets.item('residential').addable()).to.be.true;
-                expect(presets.item('park').addable()).to.be.true;
-
-                var ids = new Set(['residential']);   // can only add preset with this ID
-                presets.addablePresetIDs(ids);
-
-                expect(presets.item('residential').addable()).to.be.true;
-                expect(presets.item('park').addable()).to.be.false;
-                expect(presets.addablePresetIDs()).to.eql(ids);
-
-                presets.addablePresetIDs(null);
-                expect(presets.item('residential').addable()).to.be.true;
-                expect(presets.item('park').addable()).to.be.true;
-
-                done();
-            });
-        });
-
-        it('ignores invalid IDs in addablePresetIDs', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-
-                expect(presets.item(null)).to.eql(undefined);
-                expect(presets.item(undefined)).to.eql(undefined);
-                expect(presets.item('')).to.eql(undefined);
-                expect(presets.item('garbage')).to.eql(undefined);
-                expect(presets.item('residential').addable()).to.be.true;
-                expect(presets.item('park').addable()).to.be.true;
-
-                var ids = new Set([null, undefined, '', 'garbage', 'residential']);   // can only add preset with these IDs
-                presets.addablePresetIDs(ids);
-
-                expect(presets.item(null)).to.eql(undefined);
-                expect(presets.item(undefined)).to.eql(undefined);
-                expect(presets.item('')).to.eql(undefined);
-                expect(presets.item('garbage')).to.eql(undefined);
-                expect(presets.item('residential').addable()).to.be.true;
-                expect(presets.item('park').addable()).to.be.false;
-                expect(presets.addablePresetIDs()).to.eql(ids);
-
-                presets.addablePresetIDs(null);
-                expect(presets.item(null)).to.eql(undefined);
-                expect(presets.item(undefined)).to.eql(undefined);
-                expect(presets.item('')).to.eql(undefined);
-                expect(presets.item('garbage')).to.eql(undefined);
-                expect(presets.item('residential').addable()).to.be.true;
-                expect(presets.item('park').addable()).to.be.true;
-
-                done();
-            });
-        });
-
-        it('addablePresetIDs are default presets', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            presets.ensureLoaded().then(function() {
-                var ids = new Set(['bench', 'residential']);   // can only add presets with these IDs
-                presets.addablePresetIDs(ids);
-
-                var areaDefaults = presets.defaults('area', 10).collection;
-                expect(areaDefaults.length).to.eql(0);
-
-                var pointDefaults = presets.defaults('point', 10).collection;
-                expect(pointDefaults.length).to.eql(1);
-                expect(pointDefaults[0].id).to.eql('bench');
-
-                var lineDefaults = presets.defaults('line', 10).collection;
-                expect(lineDefaults.length).to.eql(2);
-                expect(lineDefaults[0].id).to.eql('bench');
-                expect(lineDefaults[1].id).to.eql('residential');
-
-                done();
-            });
-        });
-    });
-
-
-    describe.skip('#build', function () {
-        it('builds presets from provided', function () {
-            var surfShop = Rapid.osmNode({ tags: { amenity: 'shop', 'shop:type': 'surf' } });
-            var graph = new Rapid.Graph([surfShop]);
-            var presets = Rapid.presetIndex();
-            var presetData = {
-                presets: {
-                    'amenity/shop/surf': {
-                        tags: { amenity: 'shop', 'shop:type': 'surf' },
-                        geometry: ['point', 'area']
-                    }
-                }
-            };
-
-            expect(presets.match(surfShop, graph)).to.eql(undefined); // no surfshop preset yet...
-            presets.build(presetData, true);
-            expect(presets.match(surfShop, graph).addTags).to.eql({ amenity: 'shop', 'shop:type': 'surf' });
-        });
-
-        it('configures presets\' initial visibility', function () {
-            var surfShop = Rapid.osmNode({ tags: { amenity: 'shop', 'shop:type': 'surf' } });
-            var firstStreetJetty = Rapid.osmNode({ tags: { man_made: 'jetty' } });
-            var entities = [surfShop, firstStreetJetty];
-            var graph = new Rapid.Graph(entities);
-            var presets = Rapid.presetIndex();
-            var presetData = {
-                presets: {
-                    'amenity/shop/surf': {
-                        tags: { amenity: 'shop', 'shop:type': 'surf' },
-                        geometry: ['point', 'area']
-                    },
-                    'man_made/jetty': {
-                        tags: { man_made: 'jetty' },
-                        geometry: ['point']
-                    }
-                }
-            };
-
-            presets.build(presetData, false);
-            entities.forEach(function (entity) {
-                var preset = presets.match(entity, graph);
-                expect(preset.addable()).to.be.false;
-            });
-        });
-    });
-
-
-    describe('expected matches', function () {
-        var testPresets = {
-            building: { name: 'Building', tags: { building: 'yes' }, geometry: ['area'] },
-            'type/multipolygon': {
-                name: 'Multipolygon',
-                geometry: ['area', 'relation'],
-                tags: { 'type': 'multipolygon' },
-                searchable: false,
-                matchScore: 0.1
-            },
-            address: {
-                name: 'Address',
-                geometry: ['point', 'vertex', 'area'],
-                tags: { 'addr:*': '*' },
-                matchScore: 0.15
-            },
-            'highway/pedestrian_area': {
-                name: 'Pedestrian Area',
-                geometry: ['area'],
-                tags: { highway: 'pedestrian', area: 'yes' }
-            }
-        };
-
-        it('prefers building to multipolygon', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            var relation = Rapid.osmRelation({ tags: { type: 'multipolygon', building: 'yes' } });
-            var graph = new Rapid.Graph([relation]);
-            presets.ensureLoaded().then(function() {
-                var match = presets.match(relation, graph);
-                expect(match.id).to.eql('building');
-                done();
-            });
-        });
-
-        it('prefers building to address', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            var way = Rapid.osmWay({ tags: { area: 'yes', building: 'yes', 'addr:housenumber': '1234' } });
-            var graph = new Rapid.Graph([way]);
-            presets.ensureLoaded().then(function() {
-                var match = presets.match(way, graph);
-                expect(match.id).to.eql('building');
-                done();
-            });
-        });
-
-        it('prefers pedestrian to area', function (done) {
-            Rapid.fileFetcher.cache().preset_presets = testPresets;
-            var presets = Rapid.presetIndex();
-            var way = Rapid.osmWay({ tags: { area: 'yes', highway: 'pedestrian' } });
-            var graph = new Rapid.Graph([way]);
-            presets.ensureLoaded().then(function() {
-                var match = presets.match(way, graph);
-                expect(match.id).to.eql('highway/pedestrian_area');
-                done();
-            });
-        });
-    });
-
-
-    describe.skip('#fromExternal', function () {
-        var _server;
-        var presetData = {
-            presets: {
-                '8bc64d6d': {
-                    'name': 'Surf Shop',
-                    'geometry': ['area', 'point'],
-                    'fields': ['2161a712'],
-                    'tags': { 'amenity': 'shop', 'shop:type': 'surf' },
-                    'matchScore': 0.99
-                }
-            },
-            'fields': {
-                '2161a712': {
-                    'key': 'building',
-                    'label': 'Building',
-                    'type': 'text'
-                }
-            }
-        };
-
-        beforeEach(function () {
-            _server = window.fakeFetch().create();
-        });
-
-        afterEach(function () {
-            _server.restore();
-        });
-
-        it('builds presets w/external sources set to addable', function () {
-            var surfShop = Rapid.osmNode({ tags: { amenity: 'shop', 'shop:type': 'surf' } });
-            var graph = new Rapid.Graph([surfShop]);
-            var url = 'https://fakemaprules.io/fake.json';
-
-            // no exernal presets yet
-            expect(Rapid.presetIndex().match(surfShop, graph).id).to.eql('point');
-
-            // reset graph...
-            graph = new Rapid.Graph([surfShop]);
-
-            // add the validations query param...
-            Rapid.presetIndex().fromExternal(url, function (externalPresets) {
-                expect(externalPresets.match(surfShop, graph).id).to.eql('8bc64d6d');
-            });
-
-            _server.respondWith('GET', /fake\.json/,
-                [200, { 'Content-Type': 'application/json' }, JSON.stringify(presetData)]
-            );
-            _server.respond();
-        });
-
-        it('makes only the external presets initially addable', function () {
-            var url = 'https://fakemaprules.io/fake.json';
-
-            Rapid.presetIndex().fromExternal(url, function(externalPresets) {
-                var external = externalPresets.collection.reduce(function(presets, preset) {
-                    if (!preset.hasOwnProperty('members') && preset.addable()) {
-                        presets.push(preset.id);
-                    }
-                    return presets;
-                }, []);
-
-                var morePresetKeys = Object.keys(presetData.presets);
-                expect(morePresetKeys.length).to.eql(external.length);
-
-                morePresetKeys.forEach(function(presetID) {
-                    expect(external.indexOf(presetID)).to.be.at.least(0);
-                });
-            });
-
-            _server.respondWith('GET', /fake\.json/,
-                [200, { 'Content-Type': 'application/json' }, JSON.stringify(presetData)]
-            );
-            _server.respond();
-        });
-    });
-
-});
diff --git a/test/spec/presets/preset.js b/test/spec/presets/preset.js
deleted file mode 100644
index c8ee2b9130..0000000000
--- a/test/spec/presets/preset.js
+++ /dev/null
@@ -1,231 +0,0 @@
-describe('presetPreset', function() {
-
-    describe('#fields', function() {
-        it('has no fields by default', function() {
-            var preset = Rapid.presetPreset('test', {});
-            expect(preset.fields()).to.eql([]);
-        });
-    });
-
-    describe('#moreFields', function() {
-        it('has no moreFields by default', function() {
-            var preset = Rapid.presetPreset('test', {});
-            expect(preset.moreFields()).to.eql([]);
-        });
-    });
-
-    describe('#matchGeometry', function() {
-        it('returns false if it doesn\'t match', function() {
-            var preset = Rapid.presetPreset('test', {geometry: ['line']});
-            expect(preset.matchGeometry('point')).to.equal(false);
-        });
-
-        it('returns true if it does match', function() {
-            var preset = Rapid.presetPreset('test', {geometry: ['point', 'line']});
-            expect(preset.matchGeometry('point')).to.equal(true);
-        });
-    });
-
-    describe('#matchAllGeometry', function() {
-        it('returns false if they don\'t all match', function() {
-            var preset = Rapid.presetPreset('test', {geometry: ['line']});
-            expect(preset.matchAllGeometry(['point','line'])).to.equal(false);
-        });
-
-        it('returns true if they do all match', function() {
-            var preset = Rapid.presetPreset('test', {geometry: ['point', 'line']});
-            expect(preset.matchAllGeometry(['point','line'])).to.equal(true);
-        });
-    });
-
-    describe('#matchScore', function() {
-        it('returns -1 if preset does not match tags', function() {
-            var preset = Rapid.presetPreset('test', {tags: {foo: 'bar'}});
-            var entity = Rapid.osmWay({tags: {highway: 'motorway'}});
-            expect(preset.matchScore(entity.tags)).to.equal(-1);
-        });
-
-        it('returns the value of the matchScore property when matched', function() {
-            var preset = Rapid.presetPreset('test', {tags: {highway: 'motorway'}, matchScore: 0.2});
-            var entity = Rapid.osmWay({tags: {highway: 'motorway'}});
-            expect(preset.matchScore(entity.tags)).to.equal(0.2);
-        });
-
-        it('defaults to the number of matched tags', function() {
-            var preset = Rapid.presetPreset('test', {tags: {highway: 'residential'}});
-            var entity = Rapid.osmWay({tags: {highway: 'residential'}});
-            expect(preset.matchScore(entity.tags)).to.equal(1);
-
-            preset = Rapid.presetPreset('test', {tags: {highway: 'service', service: 'alley'}});
-            entity = Rapid.osmWay({tags: {highway: 'service', service: 'alley'}});
-            expect(preset.matchScore(entity.tags)).to.equal(2);
-        });
-
-        it('counts * as a match for any value with score 0.5', function() {
-            var preset = Rapid.presetPreset('test', {tags: {building: '*'}});
-            var entity = Rapid.osmWay({tags: {building: 'yep'}});
-            expect(preset.matchScore(entity.tags)).to.equal(0.5);
-        });
-
-        it('boosts matchScore for additional matches in addTags', function() {
-            var presetSupercenter = Rapid.presetPreset('shop/supermarket/walmart_supercenter', {
-                tags: { 'brand:wikidata': 'Q483551', 'shop': 'supermarket' },
-                addTags: { 'name': 'Walmart Supercenter' }
-            });
-            var presetMarket = Rapid.presetPreset('shop/supermarket/walmart_market', {
-                tags: { 'brand:wikidata': 'Q483551', 'shop': 'supermarket' },
-                addTags: { 'name': 'Walmart Neighborhood Market' }
-            });
-
-            var supercenter = Rapid.osmWay({ tags: {
-                'brand:wikidata': 'Q483551',
-                'shop': 'supermarket',
-                'name': 'Walmart Supercenter'
-            }});
-            var market = Rapid.osmWay({ tags: {
-                'brand:wikidata': 'Q483551',
-                'shop': 'supermarket',
-                'name': 'Walmart Neighborhood Market'
-            }});
-
-            expect(presetSupercenter.matchScore(supercenter.tags))
-                .to.be.greaterThan(presetMarket.matchScore(supercenter.tags));
-
-            expect(presetMarket.matchScore(market.tags))
-                .to.be.greaterThan(presetSupercenter.matchScore(market.tags));
-        });
-    });
-
-    describe('isFallback', function() {
-        it('returns true if preset has no tags', function() {
-            var preset = Rapid.presetPreset('point', {tags: {}});
-            expect(preset.isFallback()).to.equal(true);
-        });
-
-        it('returns true if preset has a single \'area\' tag', function() {
-            var preset = Rapid.presetPreset('area', {tags: {area: 'yes'}});
-            expect(preset.isFallback()).to.equal(true);
-        });
-
-        it('returns false if preset has a single non-\'area\' tag', function() {
-            var preset = Rapid.presetPreset('building', {tags: {building: 'yes'}});
-            expect(preset.isFallback()).to.equal(false);
-        });
-
-        it('returns false if preset has multiple tags', function() {
-            var preset = Rapid.presetPreset('building', {tags: {area: 'yes', building: 'yes'}});
-            expect(preset.isFallback()).to.equal(false);
-        });
-    });
-
-    describe('#setTags', function() {
-        var _savedAreaKeys;
-
-        before(function () {
-            _savedAreaKeys = Rapid.osmAreaKeys;
-            Rapid.osmSetAreaKeys({ building: {}, natural: {} });
-        });
-
-        after(function () {
-            Rapid.osmSetAreaKeys(_savedAreaKeys);
-        });
-
-        it('adds match tags', function() {
-            var preset = Rapid.presetPreset('test', {tags: {highway: 'residential'}});
-            expect(preset.setTags({}, 'line')).to.eql({highway: 'residential'});
-        });
-
-        it('adds wildcard tags with value \'yes\'', function() {
-            var preset = Rapid.presetPreset('test', {tags: {natural: '*'}});
-            expect(preset.setTags({}, 'area')).to.eql({natural: 'yes'});
-        });
-
-        it('prefers to add tags of addTags property', function() {
-            var preset = Rapid.presetPreset('test', {tags: {building: '*'}, addTags: {building: 'ok'}});
-            expect(preset.setTags({}, 'area')).to.eql({building: 'ok'});
-        });
-
-        it('adds default tags of fields with matching geometry', function() {
-            var isAddable = true;
-            var field = Rapid.presetField('field', {key: 'building', geometry: 'area', default: 'yes'});
-            var preset = Rapid.presetPreset('test', {fields: ['field']}, isAddable, {field: field});
-            expect(preset.setTags({}, 'area')).to.eql({area: 'yes', building: 'yes'});
-        });
-
-        it('adds no default tags of fields with non-matching geometry', function() {
-            var isAddable = true;
-            var field = Rapid.presetField('field', {key: 'building', geometry: 'area', default: 'yes'});
-            var preset = Rapid.presetPreset('test', {fields: ['field']}, isAddable, {field: field});
-            expect(preset.setTags({}, 'point')).to.eql({});
-        });
-
-        describe('for a preset with no tag in areaKeys', function() {
-            var preset = Rapid.presetPreset('test', {geometry: ['line', 'area'], tags: {name: 'testname', highway: 'pedestrian'}});
-
-            it('doesn\'t add area=yes to non-areas', function() {
-                expect(preset.setTags({}, 'line')).to.eql({name: 'testname', highway: 'pedestrian'});
-            });
-
-            it('adds area=yes to areas', function() {
-                expect(preset.setTags({}, 'area')).to.eql({name: 'testname', highway: 'pedestrian', area: 'yes'});
-            });
-        });
-
-        describe('for a preset with a tag in areaKeys', function() {
-            it('doesn\'t add area=yes automatically', function() {
-                var preset = Rapid.presetPreset('test', {geometry: ['area'], tags: {name: 'testname', building: 'yes'}});
-                expect(preset.setTags({}, 'area')).to.eql({name: 'testname', building: 'yes'});
-            });
-
-            it('does add area=yes if asked to', function() {
-                var preset = Rapid.presetPreset('test', {geometry: ['area'], tags: {name: 'testname', area: 'yes'}});
-                expect(preset.setTags({}, 'area')).to.eql({name: 'testname', area: 'yes'});
-            });
-        });
-    });
-
-    describe('#unsetTags', function() {
-        it('removes tags that match preset tags', function() {
-            var preset = Rapid.presetPreset('test', {tags: {highway: 'residential'}});
-            expect(preset.unsetTags({highway: 'residential'}, 'area')).to.eql({});
-        });
-
-        it('removes tags that match field default tags', function() {
-            var isAddable = true;
-            var field = Rapid.presetField('field', {key: 'building', geometry: 'area', default: 'yes'});
-            var preset = Rapid.presetPreset('test', {fields: ['field']}, isAddable, {field: field});
-            expect(preset.unsetTags({building: 'yes'}, 'area')).to.eql({});
-        });
-
-        it('removes area=yes', function() {
-            var preset = Rapid.presetPreset('test', {tags: {highway: 'pedestrian'}});
-            expect(preset.unsetTags({highway: 'pedestrian', area: 'yes'}, 'area')).to.eql({});
-        });
-
-        it('preserves tags that do not match field default tags', function() {
-            var isAddable = true;
-            var field = Rapid.presetField('field', {key: 'building', geometry: 'area', default: 'yes'});
-            var preset = Rapid.presetPreset('test', {fields: ['field']}, isAddable, {field: field});
-            expect(preset.unsetTags({building: 'yep'}, 'area')).to.eql({ building: 'yep'});
-        });
-
-        it('preserves tags that are not listed in removeTags', function() {
-            var preset = Rapid.presetPreset('test', {tags: {a: 'b'}, removeTags: {}});
-            expect(preset.unsetTags({a: 'b'}, 'area')).to.eql({a: 'b'});
-        });
-
-        it('uses tags from addTags if removeTags is not defined', function() {
-            var preset = Rapid.presetPreset('test', {tags: {a: 'b'}, addTags: {remove: 'me'}});
-            expect(preset.unsetTags({a: 'b', remove: 'me'}, 'area')).to.eql({a: 'b'});
-        });
-    });
-
-    describe('#addable', function() {
-        it('sets/gets addability of preset', function() {
-            var preset = Rapid.presetPreset('test', {}, false);
-            expect(preset.addable()).to.be.false;
-            preset.addable(true);
-            expect(preset.addable()).to.be.true;
-        });
-    });
-});
diff --git a/test/spec/renderer/PixiRenderer.js b/test/spec/renderer/PixiRenderer.js
index d8c6055404..1223427212 100644
--- a/test/spec/renderer/PixiRenderer.js
+++ b/test/spec/renderer/PixiRenderer.js
@@ -59,7 +59,7 @@ describe('PixiRenderer', () => {
 
     const graph = context.graph();
     graph.rebase(graphEntities, [graph], false);
-    map = context.map();
+    map = context.mapSystem();
     content.call(map);
   });
 
diff --git a/test/spec/renderer/RendererImagerySource.js b/test/spec/renderer/RendererImagerySource.js
deleted file mode 100644
index 5c449829d2..0000000000
--- a/test/spec/renderer/RendererImagerySource.js
+++ /dev/null
@@ -1,103 +0,0 @@
-describe('RendererImagerySource', function() {
-    it('does not error with blank template', function() {
-        var source = new Rapid.RendererImagerySource({ template: '', id:'anyid' });
-        expect(source.url([0,1,2])).to.equal('');
-    });
-
-    it('supports tms replacement tokens', function() {
-        var source = new Rapid.RendererImagerySource({
-            id: 'anyid',
-            type: 'tms',
-            template: '{z}/{x}/{y}'
-        });
-        expect(source.url([0,1,2])).to.equal('2/0/1');
-    });
-
-    it('supports wms replacement tokens', function() {
-        var source = new Rapid.RendererImagerySource({
-            id:'anyid',
-            type: 'wms',
-            projection: 'EPSG:3857',
-            template: 'SRS={proj}&imageSR={wkid}&bboxSR={wkid}&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}'
-        });
-
-        var result = sdk.utilStringQs(source.url([0,1,2]));
-        expect(result.SRS).to.equal('EPSG:3857');
-        expect(result.imageSR).to.equal('3857');
-        expect(result.bboxSR).to.equal('3857');
-        expect(result.FORMAT).to.equal('image/jpeg');
-        expect(result.WIDTH).to.equal('256');
-        expect(result.HEIGHT).to.equal('256');
-
-        var bbox = result.BBOX.split(',');
-        expect(+bbox[0]).to.be.closeTo(-20037508.34, 1e-3);
-        expect(+bbox[1]).to.be.closeTo(0, 1e-3);
-        expect(+bbox[2]).to.be.closeTo(-10018754.17, 1e-3);
-        expect(+bbox[3]).to.be.closeTo(10018754.17, 1e-3);
-    });
-
-    it('supports subdomains', function() {
-        var source = new Rapid.RendererImagerySource({ id:'anyid', template: '{switch:a,b}/{z}/{x}/{y}'});
-        expect(source.url([0,1,2])).to.equal('b/2/0/1');
-    });
-
-    it('distributes requests between subdomains', function() {
-        var source = new Rapid.RendererImagerySource({ id:'anyid', template: '{switch:a,b}/{z}/{x}/{y}' });
-        expect(source.url([0,1,1])).to.equal('b/1/0/1');
-        expect(source.url([0,2,1])).to.equal('a/1/0/2');
-    });
-
-    it('correctly displays an overlay with no overzoom specified', function() {
-        var source = new Rapid.RendererImagerySource({ id:'anyid', zoomExtent: [6,16] });
-        expect(source.validZoom(10)).to.be.true;
-        expect(source.validZoom(3)).to.be.false;
-        expect(source.validZoom(17)).to.be.true;
-    });
-
-    it('correctly displays an overlay with an invalid overzoom', function() {
-        var source = new Rapid.RendererImagerySource({ id:'anyid', zoomExtent: [6,16], overzoom: 'gibberish'});
-        expect(source.validZoom(10)).to.be.true;
-        expect(source.validZoom(3)).to.be.false;
-        expect(source.validZoom(17)).to.be.true;
-    });
-
-    it('correctly displays an overlay with overzoom:true', function() {
-        var source = new Rapid.RendererImagerySource({ id:'anyid', zoomExtent: [6,16], overzoom: true});
-        expect(source.validZoom(10)).to.be.true;
-        expect(source.validZoom(3)).to.be.false;
-        expect(source.validZoom(17)).to.be.true;
-    });
-
-    it('correctly displays an overlay with overzoom:false', function() {
-        var source = new Rapid.RendererImagerySource({ id:'anyid', zoomExtent: [6,16], overzoom: false});
-        expect(source.validZoom(10)).to.be.true;
-        expect(source.validZoom(3)).to.be.false;
-        expect(source.validZoom(17)).to.be.false;
-    });
-});
-
-// describe('RendererImagerySourceCustom', function() {
-//     describe('#imageryUsed', function() {
-//         it('returns an imagery_used string', function() {
-//             var source = new Rapid.RendererImagerySourceCustom('http://example.com');
-//             expect(source.imageryUsed()).to.eql('Custom (http://example.com )');  // note ' )' space
-//         });
-//         it('sanitizes `access_token`', function() {
-//             var source = new Rapid.RendererImagerySourceCustom('http://example.com?access_token=MYTOKEN');
-//             expect(source.imageryUsed()).to.eql('Custom (http://example.com?access_token={apikey} )');
-//         });
-//         it('sanitizes `connectId`', function() {
-//             var source = new Rapid.RendererImagerySourceCustom('http://example.com?connectId=MYTOKEN');
-//             expect(source.imageryUsed()).to.eql('Custom (http://example.com?connectId={apikey} )');
-//         });
-//         it('sanitizes `token`', function() {
-//             var source = new Rapid.RendererImagerySourceCustom('http://example.com?token=MYTOKEN');
-//             expect(source.imageryUsed()).to.eql('Custom (http://example.com?token={apikey} )');
-//         });
-//         it('sanitizes wms path `token`', function() {
-//             var source = new Rapid.RendererImagerySourceCustom('http://example.com/wms/v1/token/MYTOKEN/1.0.0/layer');
-//             expect(source.imageryUsed()).to.eql('Custom (http://example.com/wms/v1/token/{apikey}/1.0.0/layer )');
-//         });
-//     });
-
-// });
diff --git a/test/spec/renderer/features.js b/test/spec/renderer/features.js
deleted file mode 100644
index acd7844907..0000000000
--- a/test/spec/renderer/features.js
+++ /dev/null
@@ -1,677 +0,0 @@
-describe('rendererFeatures', function() {
-    var dimensions = [1000, 1000];
-    var context, content, features, map;
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-        content = d3.select(document.createElement('div'))
-            .attr('class', 'main-map');
-        map = context.map();
-
-        map.render(content);
-        map.zoom(16);
-        features = Rapid.rendererFeatures(context);
-    });
-
-
-    afterEach(function() {
-        content.remove();
-    });
-
-    describe('#keys', function() {
-        it('returns feature keys', function() {
-            var keys = features.keys();
-            expect(keys).to.include(
-                'points', 'traffic_roads', 'service_roads', 'paths',
-                'buildings', 'landuse', 'boundaries', 'water', 'rail',
-                'power', 'past_future', 'others'
-            );
-        });
-    });
-
-    describe('#disable', function() {
-        it('disables features', function() {
-            features.disable('water');
-            expect(features.disabled()).to.include('water');
-            expect(features.enabled()).to.not.include('water');
-        });
-    });
-
-    describe('#enable', function() {
-        it('enables features', function() {
-            features.disable('water');
-            features.enable('water');
-            expect(features.disabled()).to.not.include('water');
-            expect(features.enabled()).to.include('water');
-        });
-    });
-
-    describe('#toggle', function() {
-        it('toggles features', function() {
-            features.toggle('water');
-            expect(features.disabled()).to.include('water');
-            expect(features.enabled()).to.not.include('water');
-
-            features.toggle('water');
-            expect(features.disabled()).to.not.include('water');
-            expect(features.enabled()).to.include('water');
-        });
-    });
-
-    describe('#gatherStats', function() {
-        it('counts features', function() {
-            var graph = new Rapid.Graph([
-                Rapid.osmNode({id: 'point_bar', tags: {amenity: 'bar'}, version: 1}),
-                Rapid.osmNode({id: 'point_dock', tags: {waterway: 'dock'}, version: 1}),
-                Rapid.osmNode({id: 'point_rail_station', tags: {railway: 'station'}, version: 1}),
-                Rapid.osmNode({id: 'point_generator', tags: {power: 'generator'}, version: 1}),
-                Rapid.osmNode({id: 'point_old_rail_station', tags: {railway: 'station', disused: 'yes'}, version: 1}),
-                Rapid.osmWay({id: 'motorway', tags: {highway: 'motorway'}, version: 1}),
-                Rapid.osmWay({id: 'building_yes', tags: {area: 'yes', amenity: 'school', building: 'yes'}, version: 1}),
-                Rapid.osmWay({id: 'boundary', tags: {boundary: 'administrative'}, version: 1}),
-                Rapid.osmWay({id: 'fence', tags: {barrier: 'fence'}, version: 1})
-            ]);
-            var all = Object.values(graph.base.entities);
-            var stats;
-
-            features.gatherStats(all, graph, dimensions);
-            stats = features.stats();
-
-            expect(stats.boundaries).to.eql(1);
-            expect(stats.buildings).to.eql(1);
-            expect(stats.landuse).to.eql(0);
-            expect(stats.traffic_roads).to.eql(1);
-            expect(stats.service_roads).to.eql(0);
-            expect(stats.others).to.eql(1);
-            expect(stats.past_future).to.eql(1);
-            expect(stats.paths).to.eql(0);
-            expect(stats.points).to.eql(5);
-            expect(stats.power).to.eql(1);
-            expect(stats.rail).to.eql(2);
-            expect(stats.water).to.eql(1);
-        });
-    });
-
-    describe('matching', function() {
-        var graph = new Rapid.Graph([
-            // Points
-            Rapid.osmNode({id: 'point_bar', tags: {amenity: 'bar'}, version: 1}),
-            Rapid.osmNode({id: 'point_dock', tags: {waterway: 'dock'}, version: 1}),
-            Rapid.osmNode({id: 'point_rail_station', tags: {railway: 'station'}, version: 1}),
-            Rapid.osmNode({id: 'point_generator', tags: {power: 'generator'}, version: 1}),
-            Rapid.osmNode({id: 'point_old_rail_station', tags: {railway: 'station', disused: 'yes'}, version: 1}),
-
-            // Traffic Roads
-            Rapid.osmWay({id: 'motorway', tags: {highway: 'motorway'}, version: 1}),
-            Rapid.osmWay({id: 'motorway_link', tags: {highway: 'motorway_link'}, version: 1}),
-            Rapid.osmWay({id: 'trunk', tags: {highway: 'trunk'}, version: 1}),
-            Rapid.osmWay({id: 'trunk_link', tags: {highway: 'trunk_link'}, version: 1}),
-            Rapid.osmWay({id: 'primary', tags: {highway: 'primary'}, version: 1}),
-            Rapid.osmWay({id: 'primary_link', tags: {highway: 'primary_link'}, version: 1}),
-            Rapid.osmWay({id: 'secondary', tags: {highway: 'secondary'}, version: 1}),
-            Rapid.osmWay({id: 'secondary_link', tags: {highway: 'secondary_link'}, version: 1}),
-            Rapid.osmWay({id: 'tertiary', tags: {highway: 'tertiary'}, version: 1}),
-            Rapid.osmWay({id: 'tertiary_link', tags: {highway: 'tertiary_link'}, version: 1}),
-            Rapid.osmWay({id: 'residential', tags: {highway: 'residential'}, version: 1}),
-            Rapid.osmWay({id: 'unclassified', tags: {highway: 'unclassified'}, version: 1}),
-            Rapid.osmWay({id: 'living_street', tags: {highway: 'living_street'}, version: 1}),
-
-            // Service Roads
-            Rapid.osmWay({id: 'service', tags: {highway: 'service'}, version: 1}),
-            Rapid.osmWay({id: 'road', tags: {highway: 'road'}, version: 1}),
-            Rapid.osmWay({id: 'track', tags: {highway: 'track'}, version: 1}),
-
-            // Paths
-            Rapid.osmWay({id: 'path', tags: {highway: 'path'}, version: 1}),
-            Rapid.osmWay({id: 'footway', tags: {highway: 'footway'}, version: 1}),
-            Rapid.osmWay({id: 'cycleway', tags: {highway: 'cycleway'}, version: 1}),
-            Rapid.osmWay({id: 'bridleway', tags: {highway: 'bridleway'}, version: 1}),
-            Rapid.osmWay({id: 'steps', tags: {highway: 'steps'}, version: 1}),
-            Rapid.osmWay({id: 'pedestrian', tags: {highway: 'pedestrian'}, version: 1}),
-
-            // Buildings
-            Rapid.osmWay({id: 'building_yes', tags: {area: 'yes', amenity: 'school', building: 'yes'}, version: 1}),
-            Rapid.osmWay({id: 'building_no', tags: {area: 'yes', amenity: 'school', building: 'no'}, version: 1}),
-            Rapid.osmWay({id: 'building_part', tags: { 'building:part': 'yes'}, version: 1}),
-            Rapid.osmWay({id: 'garage1', tags: {area: 'yes', amenity: 'parking', parking: 'multi-storey'}, version: 1}),
-            Rapid.osmWay({id: 'garage2', tags: {area: 'yes', amenity: 'parking', parking: 'sheds'}, version: 1}),
-            Rapid.osmWay({id: 'garage3', tags: {area: 'yes', amenity: 'parking', parking: 'carports'}, version: 1}),
-            Rapid.osmWay({id: 'garage4', tags: {area: 'yes', amenity: 'parking', parking: 'garage_boxes'}, version: 1}),
-
-            // Indoor
-            Rapid.osmWay({id: 'room', tags: {area: 'yes', indoor: 'room'}, version: 1}),
-            Rapid.osmWay({id: 'indoor_area', tags: {area: 'yes', indoor: 'area'}, version: 1}),
-            Rapid.osmWay({id: 'indoor_bar', tags: {area: 'yes', indoor: 'room', amenity: 'bar'}, version: 1}),
-            Rapid.osmWay({id: 'corridor', tags: {highway: 'corridor', indoor: 'yes'}, version: 1}),
-
-            // Pistes
-            Rapid.osmWay({id: 'downhill_piste', tags: {'piste:type': 'downhill'}, version: 1}),
-            Rapid.osmWay({id: 'piste_track_combo', tags: {'piste:type': 'alpine', highway: 'track'}, version: 1}),
-
-            // Aerialways
-            Rapid.osmWay({id: 'gondola', tags: {aerialway: 'gondola'}, version: 1}),
-            Rapid.osmWay({id: 'zip_line', tags: {aerialway: 'zip_line'}, version: 1}),
-            Rapid.osmWay({id: 'aerialway_platform', tags: {public_transport: 'platform', aerialway: 'yes'}, version: 1}),
-            Rapid.osmWay({id: 'old_aerialway_station', tags: {area: 'yes', aerialway: 'station'}, version: 1}),
-
-            // Landuse
-            Rapid.osmWay({id: 'forest', tags: {area: 'yes', landuse: 'forest'}, version: 1}),
-            Rapid.osmWay({id: 'scrub', tags: {area: 'yes', natural: 'scrub'}, version: 1}),
-            Rapid.osmWay({id: 'industrial', tags: {area: 'yes', landuse: 'industrial'}, version: 1}),
-            Rapid.osmWay({id: 'parkinglot', tags: {area: 'yes', amenity: 'parking', parking: 'surface'}, version: 1}),
-
-            // Landuse Multipolygon
-            Rapid.osmWay({id: 'outer', version: 1}),
-            Rapid.osmWay({id: 'inner1', version: 1}),
-            Rapid.osmWay({id: 'inner2', tags: {barrier: 'fence'}, version: 1}),
-            Rapid.osmWay({id: 'inner3', tags: {highway: 'residential'}, version: 1}),
-            Rapid.osmRelation({id: 'retail', tags: {landuse: 'retail', type: 'multipolygon'},
-                    members: [
-                        {id: 'outer', role: 'outer', type: 'way'},
-                        {id: 'inner1', role: 'inner', type: 'way'},
-                        {id: 'inner2', role: 'inner', type: 'way'},
-                        {id: 'inner3', role: 'inner', type: 'way'}
-                    ],
-                    version: 1
-                }),
-
-            // Boundaries
-            Rapid.osmWay({id: 'boundary', tags: {boundary: 'administrative'}, version: 1}),
-            Rapid.osmWay({id: 'boundary_road', tags: {boundary: 'administrative', highway: 'primary'}, version: 1}),
-
-            Rapid.osmWay({id: 'boundary_member', version: 1}),
-            Rapid.osmWay({id: 'boundary_member2', version: 1}),
-
-            // Boundary relations
-            Rapid.osmRelation({id: 'boundary_relation', tags: {type: 'boundary', boundary: 'administrative'},
-                    members: [
-                        {id: 'boundary_member'},
-                    ],
-                    version: 1
-                }),
-            Rapid.osmRelation({id: 'boundary_relation2', tags: {type: 'boundary', boundary: 'administrative'},
-                    members: [
-                        // ways can be members of multiple boundary relations
-                        {id: 'boundary_member'},
-                        {id: 'boundary_member2'}
-                    ],
-                    version: 1
-                }),
-
-            // Water
-            Rapid.osmWay({id: 'water', tags: {area: 'yes', natural: 'water'}, version: 1}),
-            Rapid.osmWay({id: 'coastline', tags: {natural: 'coastline'}, version: 1}),
-            Rapid.osmWay({id: 'bay', tags: {area: 'yes', natural: 'bay'}, version: 1}),
-            Rapid.osmWay({id: 'pond', tags: {area: 'yes', landuse: 'pond'}, version: 1}),
-            Rapid.osmWay({id: 'basin', tags: {area: 'yes', landuse: 'basin'}, version: 1}),
-            Rapid.osmWay({id: 'reservoir', tags: {area: 'yes', landuse: 'reservoir'}, version: 1}),
-            Rapid.osmWay({id: 'salt_pond', tags: {area: 'yes', landuse: 'salt_pond'}, version: 1}),
-            Rapid.osmWay({id: 'river', tags: {waterway: 'river'}, version: 1}),
-
-            // Rail
-            Rapid.osmWay({id: 'railway', tags: {railway: 'rail'}, version: 1}),
-            Rapid.osmWay({id: 'rail_landuse', tags: {area: 'yes', landuse: 'railway'}, version: 1}),
-            Rapid.osmWay({id: 'rail_disused', tags: {railway: 'disused'}, version: 1}),
-            Rapid.osmWay({id: 'rail_streetcar', tags: {railway: 'tram', highway: 'residential'}, version: 1}),
-            Rapid.osmWay({id: 'rail_trail', tags: {railway: 'disused', highway: 'cycleway'}, version: 1}),
-
-            // Power
-            Rapid.osmWay({id: 'power_line', tags: {power: 'line'}, version: 1}),
-
-            // Past/Future
-            Rapid.osmWay({id: 'motorway_construction', tags: {highway: 'construction', construction: 'motorway'}, version: 1}),
-            Rapid.osmWay({id: 'cycleway_proposed', tags: {highway: 'proposed', proposed: 'cycleway'}, version: 1}),
-            Rapid.osmWay({id: 'landuse_construction', tags: {area: 'yes', landuse: 'construction'}, version: 1}),
-
-            // Others
-            Rapid.osmWay({id: 'fence', tags: {barrier: 'fence'}, version: 1}),
-            Rapid.osmWay({id: 'pipeline', tags: {man_made: 'pipeline'}, version: 1}),
-
-            // Site relation
-            Rapid.osmRelation({id: 'site', tags: {type: 'site'},
-                    members: [
-                        {id: 'fence', role: 'perimeter'},
-                        {id: 'building_yes'}
-                    ],
-                    version: 1
-                })
-
-        ]);
-        var all = Object.values(graph.base.entities);
-
-
-        function doMatch(rule, ids) {
-            ids.forEach(function(id) {
-                var entity = graph.entity(id);
-                var geometry = entity.geometry(graph);
-                expect(features.getMatches(entity, graph, geometry), 'doMatch: ' + id)
-                    .to.have.property(rule);
-            });
-        }
-
-        function dontMatch(rule, ids) {
-            ids.forEach(function(id) {
-                var entity = graph.entity(id);
-                var geometry = entity.geometry(graph);
-                expect(features.getMatches(entity, graph, geometry), 'dontMatch: ' + id)
-                    .not.to.have.property(rule);
-            });
-        }
-
-
-        it('matches points', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('points', [
-                'point_bar', 'point_dock', 'point_rail_station',
-                'point_generator', 'point_old_rail_station'
-            ]);
-
-            dontMatch('points', [
-                'motorway', 'service', 'path', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches traffic roads', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('traffic_roads', [
-                'motorway', 'motorway_link', 'trunk', 'trunk_link',
-                'primary', 'primary_link', 'secondary', 'secondary_link',
-                'tertiary', 'tertiary_link', 'residential', 'living_street',
-                'unclassified', 'boundary_road', 'inner3'
-            ]);
-
-            dontMatch('traffic_roads', [
-                'point_bar', 'service', 'road', 'track', 'path', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches service roads', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('service_roads', [
-                'service', 'road', 'track', 'piste_track_combo'
-            ]);
-
-            dontMatch('service_roads', [
-                'point_bar', 'motorway', 'unclassified', 'living_street',
-                'path', 'building_yes', 'forest', 'boundary', 'boundary_member', 'water',
-                'railway', 'power_line', 'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches paths', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('paths', [
-                'path', 'footway', 'cycleway', 'bridleway',
-                'steps', 'pedestrian'
-            ]);
-
-            dontMatch('paths', [
-                'point_bar', 'motorway', 'service', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence', 'corridor'
-            ]);
-        });
-
-
-        it('matches buildings', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('buildings', [
-                'building_yes',
-                'garage1', 'garage2', 'garage3', 'garage4'
-            ]);
-
-            dontMatch('buildings', [
-                'building_no', 'point_bar', 'motorway', 'service', 'path',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches building_parts', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('building_parts', [
-                'building_part'
-            ]);
-
-            dontMatch('building_parts', [
-                'building_yes',
-                'garage1', 'garage2', 'garage3', 'garage4',
-                'building_no', 'point_bar', 'motorway', 'service', 'path',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches indoor', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('indoor', [
-                'room', 'indoor_area', 'indoor_bar', 'corridor'
-            ]);
-
-            dontMatch('indoor', [
-                'downhill_piste', 'piste_track_combo',
-                'building_part', 'garage1', 'garage2', 'garage3', 'garage4',
-                'building_no', 'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence',
-                'inner3', 'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
-                'rail_landuse', 'landuse_construction', 'retail',
-                'outer', 'inner1', 'inner2'
-            ]);
-        });
-
-
-        it('matches pistes', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('pistes', [
-                'downhill_piste', 'piste_track_combo'
-            ]);
-
-            dontMatch('pistes', [
-                'room', 'indoor_area', 'indoor_bar', 'corridor',
-                'building_part', 'garage1', 'garage2', 'garage3', 'garage4',
-                'building_no', 'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence',
-                'inner3', 'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
-                'rail_landuse', 'landuse_construction', 'retail',
-                'outer', 'inner1', 'inner2'
-            ]);
-        });
-
-
-        it('matches aerialways', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('aerialways', [
-                'gondola', 'zip_line'
-            ]);
-
-            dontMatch('aerialways', [
-                'aerialway_platform', 'old_aerialway_station',
-
-                'downhill_piste', 'piste_track_combo',
-                'room', 'indoor_area', 'indoor_bar', 'corridor',
-                'building_part', 'garage1', 'garage2', 'garage3', 'garage4',
-                'building_no', 'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence',
-                'inner3', 'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
-                'rail_landuse', 'landuse_construction', 'retail',
-                'outer', 'inner1', 'inner2'
-            ]);
-        });
-
-
-        it('matches landuse', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('landuse', [
-                'forest', 'scrub', 'industrial', 'parkinglot', 'building_no',
-                'rail_landuse', 'landuse_construction', 'retail',
-                'outer', 'inner1', 'inner2'  // non-interesting members of landuse multipolygon
-            ]);
-
-            dontMatch('landuse', [
-                'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence',
-                'inner3'   // member of landuse multipolygon, but tagged as highway
-            ]);
-        });
-
-
-        it('matches boundaries', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('boundaries', [
-                'boundary',
-                // match ways that are part of boundary relations - #5601
-                'boundary_member', 'boundary_member2',
-                // relations
-                'boundary_relation', 'boundary_relation2'
-            ]);
-
-            dontMatch('boundaries', [
-                'boundary_road',   // because boundary also used as highway - #4973
-                'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'forest', 'water', 'railway', 'power_line',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches water', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('water', [
-                'point_dock', 'water', 'coastline', 'bay', 'pond',
-                'basin', 'reservoir', 'salt_pond', 'river'
-            ]);
-
-            dontMatch('water', [
-                'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'railway', 'power_line',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches rail', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('rail', [
-                'point_rail_station', 'point_old_rail_station',
-                'railway', 'rail_landuse', 'rail_disused'
-            ]);
-
-            dontMatch('rail', [
-                'rail_streetcar', 'rail_trail',  // because rail also used as highway
-                'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'water', 'power_line',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches power', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('power', [
-                'point_generator', 'power_line'
-            ]);
-
-            dontMatch('power', [
-                'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway',
-                'motorway_construction', 'fence'
-            ]);
-        });
-
-
-        it('matches past/future', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('past_future', [
-                'point_old_rail_station', 'rail_disused',
-                'motorway_construction', 'cycleway_proposed', 'landuse_construction'
-            ]);
-
-            dontMatch('past_future', [
-                'rail_trail',  // because rail also used as highway
-                'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line', 'fence'
-            ]);
-        });
-
-
-        it('matches others', function () {
-            features.gatherStats(all, graph, dimensions);
-
-            doMatch('others', [
-                'fence', 'pipeline'
-            ]);
-
-            dontMatch('others', [
-                'point_bar', 'motorway', 'service', 'path', 'building_yes',
-                'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line',
-                'motorway_construction', 'retail', 'outer', 'inner1', 'inner2', 'inner3'
-            ]);
-        });
-    });
-
-
-    describe('hiding', function() {
-        it('hides child vertices on a hidden way', function() {
-            var a = Rapid.osmNode({id: 'a', version: 1});
-            var b = Rapid.osmNode({id: 'b', version: 1});
-            var w = Rapid.osmWay({id: 'w', nodes: [a.id, b.id], tags: {highway: 'path'}, version: 1});
-            var graph = new Rapid.Graph([a, b, w]);
-            var geometry = a.geometry(graph);
-            var all = Object.values(graph.base.entities);
-
-            features.disable('paths');
-            features.gatherStats(all, graph, dimensions);
-
-            expect(features.isHiddenChild(a, graph, geometry)).to.be.true;
-            expect(features.isHiddenChild(b, graph, geometry)).to.be.true;
-            expect(features.isHidden(a, graph, geometry)).to.be.true;
-            expect(features.isHidden(b, graph, geometry)).to.be.true;
-        });
-
-        it('hides uninteresting (e.g. untagged or "other") member ways on a hidden multipolygon relation', function() {
-            var outer = Rapid.osmWay({id: 'outer', tags: {area: 'yes', natural: 'wood'}, version: 1});
-            var inner1 = Rapid.osmWay({id: 'inner1', tags: {barrier: 'fence'}, version: 1});
-            var inner2 = Rapid.osmWay({id: 'inner2', version: 1});
-            var inner3 = Rapid.osmWay({id: 'inner3', tags: {highway: 'residential'}, version: 1});
-            var r = Rapid.osmRelation({
-                id: 'r',
-                tags: {type: 'multipolygon'},
-                members: [
-                    {id: outer.id, role: 'outer', type: 'way'},
-                    {id: inner1.id, role: 'inner', type: 'way'},
-                    {id: inner2.id, role: 'inner', type: 'way'},
-                    {id: inner3.id, role: 'inner', type: 'way'}
-                ],
-                version: 1
-            });
-            var graph = new Rapid.Graph([outer, inner1, inner2, inner3, r]);
-            var all = Object.values(graph.base.entities);
-
-            features.disable('landuse');
-            features.gatherStats(all, graph, dimensions);
-
-            expect(features.isHidden(outer, graph, outer.geometry(graph))).to.be.true;     // #2548
-            expect(features.isHidden(inner1, graph, inner1.geometry(graph))).to.be.true;   // #2548
-            expect(features.isHidden(inner2, graph, inner2.geometry(graph))).to.be.true;   // #2548
-            expect(features.isHidden(inner3, graph, inner3.geometry(graph))).to.be.false;  // #2887
-        });
-
-        it('hides only versioned entities', function() {
-            var a = Rapid.osmNode({id: 'a', version: 1});
-            var b = Rapid.osmNode({id: 'b'});
-            var graph = new Rapid.Graph([a, b]);
-            var ageo = a.geometry(graph);
-            var bgeo = b.geometry(graph);
-            var all = Object.values(graph.base.entities);
-
-            features.disable('points');
-            features.gatherStats(all, graph, dimensions);
-
-            expect(features.isHidden(a, graph, ageo)).to.be.true;
-            expect(features.isHidden(b, graph, bgeo)).to.be.false;
-        });
-
-        it('#forceVisible', function() {
-            var a = Rapid.osmNode({id: 'a', version: 1});
-            var graph = new Rapid.Graph([a]);
-            var ageo = a.geometry(graph);
-            var all = Object.values(graph.base.entities);
-
-            features.disable('points');
-            features.gatherStats(all, graph, dimensions);
-            features.forceVisible(['a']);
-
-            expect(features.isHidden(a, graph, ageo)).to.be.false;
-        });
-
-        it('auto-hides features', function() {
-            var graph = new Rapid.Graph([]);
-            var maxPoints = 200;
-            var all, hidden, autoHidden, i, msg;
-
-            for (i = 0; i < maxPoints; i++) {
-                graph.rebase([Rapid.osmNode({version: 1})], [graph]);
-            }
-
-            all = Object.values(graph.base.entities);
-            features.gatherStats(all, graph, dimensions);
-            hidden = features.hidden();
-            autoHidden = features.autoHidden();
-            msg = i + ' points';
-
-            expect(hidden, msg).to.not.include('points');
-            expect(autoHidden, msg).to.not.include('points');
-
-            graph.rebase([Rapid.osmNode({version: 1})], [graph]);
-
-            all = Object.values(graph.base.entities);
-            features.gatherStats(all, graph, dimensions);
-            hidden = features.hidden();
-            autoHidden = features.autoHidden();
-            msg = ++i + ' points';
-
-            expect(hidden, msg).to.include('points');
-            expect(autoHidden, msg).to.include('points');
-        });
-
-        it('doubles auto-hide threshold when doubling viewport size', function() {
-            var graph = new Rapid.Graph([]);
-            var maxPoints = 400;
-            var dimensions = [2000, 1000];
-            var all, hidden, autoHidden, i, msg;
-
-            for (i = 0; i < maxPoints; i++) {
-                graph.rebase([Rapid.osmNode({version: 1})], [graph]);
-            }
-
-            all = Object.values(graph.base.entities);
-            features.gatherStats(all, graph, dimensions);
-            hidden = features.hidden();
-            autoHidden = features.autoHidden();
-            msg = i + ' points';
-
-            expect(hidden, msg).to.not.include('points');
-            expect(autoHidden, msg).to.not.include('points');
-
-            graph.rebase([Rapid.osmNode({version: 1})], [graph]);
-
-            all = Object.values(graph.base.entities);
-            features.gatherStats(all, graph, dimensions);
-            hidden = features.hidden();
-            autoHidden = features.autoHidden();
-            msg = ++i + ' points';
-
-            expect(hidden, msg).to.include('points');
-            expect(autoHidden, msg).to.include('points');
-        });
-    });
-
-});
diff --git a/test/spec/renderer/map.js b/test/spec/renderer/map.js
deleted file mode 100644
index 0d3a9c02c3..0000000000
--- a/test/spec/renderer/map.js
+++ /dev/null
@@ -1,272 +0,0 @@
-describe('Map', function() {
-    var content, context, map;
-
-    beforeEach(function() {
-        content = d3.select('body').append('div');
-        context = Rapid.coreContext().assetPath('../dist/').init().container(content);
-        map = context.map();
-        map.render(content);
-    });
-
-    afterEach(function() {
-        content.remove();
-    });
-
-    describe('#zoom', function() {
-        it('gets and sets zoom level', function() {
-            expect(map.zoom(4)).to.equal(map);
-            expect(map.zoom()).to.equal(4);
-        });
-
-        it('dispatches move event when zoom changes', function() {
-            var spy = sinon.spy();
-            map.zoom(4);
-            map.on('move', spy);
-            map.zoom(5);
-            expect(spy).to.have.been.called;
-        });
-
-        it('dispatches no move event when zoom does not change', function() {
-            var spy = sinon.spy();
-            map.zoom(4);
-            map.on('move', spy);
-            map.zoom(4);
-            expect(spy).not.to.have.been.called;
-        });
-
-        it('respects minzoom', function() {
-            map.zoom(1);
-            expect(map.zoom()).to.equal(2);
-        });
-    });
-
-    describe('#zoomIn', function() {
-        it('increments zoom', function(done) {
-            expect(map.zoom(4)).to.equal(map);
-            map.zoomIn();
-            window.setTimeout(function() {
-                d3.timerFlush();
-                expect(map.zoom()).to.be.closeTo(5, 1e-6);
-                done();
-            }, 375);
-        });
-    });
-
-    describe('#zoomOut', function() {
-        it('decrements zoom', function(done) {
-            expect(map.zoom(4)).to.equal(map);
-            map.zoomOut();
-            window.setTimeout(function() {
-                d3.timerFlush();
-                expect(map.zoom()).to.be.closeTo(3, 1e-6);
-                done();
-            }, 375);
-        });
-    });
-
-    describe('#center', function() {
-        it('gets and sets center', function() {
-            expect(map.center([0, 0])).to.equal(map);
-            expect(map.center()[0]).to.be.closeTo(0, 1e-6);
-            expect(map.center()[1]).to.be.closeTo(0, 1e-6);
-            expect(map.center([10, 15])).to.equal(map);
-            expect(map.center()[0]).to.be.closeTo(10, 1e-6);
-            expect(map.center()[1]).to.be.closeTo(15, 1e-6);
-        });
-
-        it('dispatches move event when center changes', function() {
-            var spy = sinon.spy();
-            map.center([0, 0]);
-            map.on('move', spy);
-            map.center([1, 1]);
-            expect(spy).to.have.been.called;
-        });
-
-        it('dispatches no move event when center does not change', function() {
-            var spy = sinon.spy();
-            map.center([0, 0]);
-            map.on('move', spy);
-            map.center([0, 0]);
-            expect(spy).not.to.have.been.called;
-        });
-    });
-
-    describe('#centerEase', function() {
-        it('sets center', function(done) {
-            expect(map.center([10, 10])).to.equal(map);
-            expect(map.centerEase([20, 20], 250)).to.equal(map);
-            window.setTimeout(function() {
-                d3.timerFlush();
-                expect(map.center()[0]).to.be.closeTo(20, 1e-6);
-                expect(map.center()[1]).to.be.closeTo(20, 1e-6);
-                done();
-            }, 275);
-        });
-    });
-
-    describe('#centerZoom', function() {
-        it('gets and sets center and zoom', function() {
-            expect(map.centerZoom([20, 25], 4)).to.equal(map);
-            expect(map.center()[0]).to.be.closeTo(20, 1e-6);
-            expect(map.center()[1]).to.be.closeTo(25, 1e-6);
-            expect(map.zoom()).to.be.equal(4);
-        });
-    });
-
-    describe('#extent', function() {
-        it('gets and sets extent', function () {
-            map.dimensions = [100,100];
-            map.center([0, 0]);
-            var extent;
-
-            // get
-            extent = new sdk.Extent(map.extent());
-            expect(extent.min[0]).to.be.closeTo(-17.5, 0.1);
-            expect(extent.min[1]).to.be.closeTo(-17.3, 0.1);
-            expect(extent.max[0]).to.be.closeTo(17.5, 0.1);
-            expect(extent.max[1]).to.be.closeTo(17.3, 0.1);
-
-            // set
-            map.extent( new sdk.Extent([10, 1], [30, 1]) );
-
-            // get
-            extent = new sdk.Extent(map.extent());
-            expect(extent.min[0]).to.be.closeTo(10, 0.1);
-            expect(extent.min[1]).to.be.closeTo(-9, 0.1);
-            expect(extent.max[0]).to.be.closeTo(30, 0.1);
-            expect(extent.max[1]).to.be.closeTo(11, 0.1);
-
-            // set
-            map.extent( new sdk.Extent([-1, -40], [1, -20]) );
-
-            // get
-            extent = new sdk.Extent(map.extent());
-            expect(extent.min[0]).to.be.closeTo(-11.6, 0.1);
-            expect(extent.min[1]).to.be.closeTo(-39.5, 0.1);
-            expect(extent.max[0]).to.be.closeTo(11.6, 0.1);
-            expect(extent.max[1]).to.be.closeTo(-19.4, 0.1);
-        });
-    });
-
-    describe('surface', function () {
-        it('is a CANVAS element', function() {
-           expect(map.surface.node().tagName).to.equal('CANVAS');
-        });
-    });
-
-    describe('cursors', function() {
-        var mode, behavior, point, vertex, line, area, midpoint;
-
-        beforeEach(function() {
-            mode = d3.select('body').append('div');
-            behavior = mode.append('div');
-
-            point    = behavior.append('div').attr('class', 'node point');
-            vertex   = behavior.append('div').attr('class', 'node vertex');
-            line     = behavior.append('div').attr('class', 'way line');
-            area     = behavior.append('div').attr('class', 'way area');
-            midpoint = behavior.append('div').attr('class', 'midpoint');
-        });
-
-        afterEach(function() {
-            mode.remove();
-        });
-
-        function cursor(selection) {
-            return window.getComputedStyle(selection.node()).cursor;
-        }
-
-        specify('points use select-point cursor in browse and select modes', function() {
-            mode.attr('class', 'ideditor mode-browse');
-            expect(cursor(point)).to.match(/cursor-select-point/);
-            mode.attr('class', 'ideditor mode-select');
-            expect(cursor(point)).to.match(/cursor-select-point/);
-        });
-
-        specify('vertices use select-vertex cursor in browse and select modes', function() {
-            mode.attr('class', 'ideditor mode-browse');
-            expect(cursor(vertex)).to.match(/cursor-select-vertex/);
-            mode.attr('class', 'ideditor mode-select');
-            expect(cursor(vertex)).to.match(/cursor-select-vertex/);
-        });
-
-        specify('lines use select-line cursor in browse and select modes', function() {
-            mode.attr('class', 'ideditor mode-browse');
-            expect(cursor(line)).to.match(/cursor-select-line/);
-            mode.attr('class', 'ideditor mode-select');
-            expect(cursor(line)).to.match(/cursor-select-line/);
-        });
-
-        specify('areas use select-area cursor in browse and select modes', function() {
-            mode.attr('class', 'ideditor mode-browse');
-            expect(cursor(area)).to.match(/cursor-select-area/);
-            mode.attr('class', 'ideditor mode-select');
-            expect(cursor(area)).to.match(/cursor-select-area/);
-        });
-
-        specify('midpoints use select-split cursor in browse and select modes', function() {
-            mode.attr('class', 'ideditor mode-browse');
-            expect(cursor(midpoint)).to.match(/cursor-select-split/);
-            mode.attr('class', 'ideditor mode-select');
-            expect(cursor(midpoint)).to.match(/cursor-select-split/);
-        });
-
-        specify('features use select-add cursor for adding to a selection', function() {
-            mode.attr('class', 'ideditor mode-select');
-            behavior.attr('class', 'behavior-multiselect');
-            expect(cursor(point)).to.match(/cursor-select-add/);
-            expect(cursor(vertex)).to.match(/cursor-select-add/);
-            expect(cursor(line)).to.match(/cursor-select-add/);
-            expect(cursor(area)).to.match(/cursor-select-add/);
-        });
-
-        specify('features use select-remove cursor for removing from a selection', function() {
-            mode.attr('class', 'ideditor mode-select');
-            behavior.attr('class', 'behavior-multiselect');
-            point.classed('selected', true);
-            vertex.classed('selected', true);
-            line.classed('selected', true);
-            area.classed('selected', true);
-            expect(cursor(point)).to.match(/cursor-select-remove/);
-            expect(cursor(vertex)).to.match(/cursor-select-remove/);
-            expect(cursor(line)).to.match(/cursor-select-remove/);
-            expect(cursor(area)).to.match(/cursor-select-remove/);
-        });
-
-        specify('targeted ways use draw-connect-line cursor in draw modes', function() {
-            behavior.attr('class', 'behavior-hover');
-            line.classed('target', true);
-            area.classed('target', true);
-            mode.attr('class', 'ideditor mode-draw-line');
-            expect(cursor(line)).to.match(/cursor-draw-connect-line/);
-            expect(cursor(area)).to.match(/cursor-draw-connect-line/);
-            mode.attr('class', 'ideditor mode-draw-area');
-            expect(cursor(line)).to.match(/cursor-draw-connect-line/);
-            expect(cursor(area)).to.match(/cursor-draw-connect-line/);
-            mode.attr('class', 'ideditor mode-add-line');
-            expect(cursor(line)).to.match(/cursor-draw-connect-line/);
-            expect(cursor(area)).to.match(/cursor-draw-connect-line/);
-            mode.attr('class', 'ideditor mode-add-area');
-            expect(cursor(line)).to.match(/cursor-draw-connect-line/);
-            expect(cursor(area)).to.match(/cursor-draw-connect-line/);
-            mode.attr('class', 'ideditor mode-drag-node');
-            expect(cursor(line)).to.match(/cursor-draw-connect-line/);
-            expect(cursor(area)).to.match(/cursor-draw-connect-line/);
-        });
-
-        specify('targeted vertices use draw-connect-vertex cursor in draw modes', function() {
-            behavior.attr('class', 'behavior-hover');
-            vertex.classed('target', true);
-            mode.attr('class', 'ideditor mode-draw-line');
-            expect(cursor(vertex)).to.match(/cursor-draw-connect-vertex/);
-            mode.attr('class', 'ideditor mode-draw-area');
-            expect(cursor(vertex)).to.match(/cursor-draw-connect-vertex/);
-            mode.attr('class', 'ideditor mode-add-line');
-            expect(cursor(vertex)).to.match(/cursor-draw-connect-vertex/);
-            mode.attr('class', 'ideditor mode-add-area');
-            expect(cursor(vertex)).to.match(/cursor-draw-connect-vertex/);
-            mode.attr('class', 'ideditor mode-drag-node');
-            expect(cursor(vertex)).to.match(/cursor-draw-connect-vertex/);
-        });
-    });
-});
diff --git a/test/spec/services/kartaview.js b/test/spec/services/KartaviewService.test.js
similarity index 76%
rename from test/spec/services/kartaview.js
rename to test/spec/services/KartaviewService.test.js
index 60ff05933c..a334648014 100644
--- a/test/spec/services/kartaview.js
+++ b/test/spec/services/KartaviewService.test.js
@@ -1,60 +1,49 @@
-describe('serviceKartaview', () => {
-  const dimensions = [64, 64];
-  let context, kartaview;
+describe('KartaviewService', () => {
+  let _kartaview, _projection;
 
-  before(() => {
-    Rapid.services.kartaview = Rapid.serviceKartaview;
-    fetchMock.reset();
-  });
+  class MockContext {
+    constructor()    { }
+    container()      { return null; }
+    deferredRedraw() { }
+  }
 
-  after(() => {
-    delete Rapid.services.kartaview;
-  });
 
   beforeEach(() => {
-    context = Rapid.coreContext()
-      .assetPath('../dist/')
-      .init();
-    context.projection
+    fetchMock.reset();
+
+    _projection = new sdk.Projection()
       .scale(sdk.geoZoomToScale(14))
       .translate([-116508, 0])  // 10,0
-      .dimensions([[0,0], dimensions]);
+      .dimensions([[0,0], [64, 64]]);
 
-    kartaview = Rapid.services.kartaview;
-    kartaview.reset();
-    fetchMock.reset();
-  });
-
-  afterEach(() => {
-    fetchMock.reset();
+    _kartaview = new Rapid.KartaviewService(new MockContext());
+    _kartaview.init();
   });
 
 
   describe('#init', () => {
-    it('Initializes cache one time', () => {
-      const cache = kartaview.cache();
+    it('initializes cache', () => {
+      const cache = _kartaview._cache;
       expect(cache).to.have.property('images');
       expect(cache).to.have.property('sequences');
-
-      kartaview.init();
-      const cache2 = kartaview.cache();
-      expect(cache).to.equal(cache2);
+      expect(cache.images).to.be.an.instanceof(Map);
+      expect(cache.sequences).to.be.an.instanceof(Map);
     });
   });
 
   describe('#reset', () => {
-    it('resets cache and image', () => {
-      kartaview.cache().foo = 'bar';
-      kartaview.selectImage(context, {id: 'baz'});
+    it('resets cache and selected image', () => {
+      _kartaview._cache.images.set('foo', { id: 'foo' });
+      _kartaview._selectedImage = 'foo';
 
-      kartaview.reset();
-      expect(kartaview.cache()).to.not.have.property('foo');
-      expect(kartaview.getSelectedImage()).to.be.null;
+      _kartaview.reset();
+      expect(_kartaview._cache.images.has('foo')).to.be.false;
+      expect(_kartaview._selectedImage).to.be.null;
     });
   });
 
   describe('#loadImages', () => {
-    it('fires loadedImages when images are loaded', done => {
+    it('fires loadedData when images are loaded', done => {
       const response = {
         status: { apiCode: '600', httpCode: 200, httpMessage: 'Success' },
         currentPageItems:[{
@@ -103,12 +92,12 @@ describe('serviceKartaview', () => {
         headers: { 'Content-Type': 'application/json' }
       });
 
-      kartaview.on('loadedImages', () => {
+      _kartaview.on('loadedData', () => {
         expect(fetchMock.calls().length).to.eql(1);  // 1 nearby-photos
         done();
       });
 
-      kartaview.loadImages(context.projection);
+      _kartaview.loadImages(_projection);
     });
 
 
@@ -162,15 +151,15 @@ describe('serviceKartaview', () => {
         headers: { 'Content-Type': 'application/json' }
       });
 
-      context.projection.translate([0, 0]);
-      kartaview.on('loadedImages', spy);
-      kartaview.loadImages(context.projection);
+      _projection.translate([0, 0]);
+      _kartaview.on('loadedData', spy);
+      _kartaview.loadImages(_projection);
 
       window.setTimeout(() => {
         expect(spy).to.have.been.not.called;
         expect(fetchMock.calls().length).to.eql(0);   // no tile requests of any kind
         done();
-      }, 200);
+      }, 50);
     });
   });
 
@@ -183,8 +172,8 @@ describe('serviceKartaview', () => {
         { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { id: '2', loc: [10,1], ca: 90, sequenceID: '100', sequenceIndex: 2 } }
       ];
 
-      kartaview.cache().rtree.load(data);
-      const result = kartaview.images(context.projection);
+      _kartaview._cache.rtree.load(data);
+      const result = _kartaview.images(_projection);
 
       expect(result).to.deep.eql([
         { id: '0', loc: [10,0], ca: 90, sequenceID: '100', sequenceIndex: 0 },
@@ -202,14 +191,14 @@ describe('serviceKartaview', () => {
         { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { id: '2', loc: [10,1], ca: 90, sequenceID: '100', sequenceIndex: 2 } }
       ];
 
-      kartaview.cache().rtree.load(data);
-      kartaview.cache().sequences = new Map().set('100', {
+      _kartaview._cache.rtree.load(data);
+      _kartaview._cache.sequences = new Map().set('100', {
         rotation: 0,
         images: [ data[0].data, data[1].data, data[2].data ],
         v: 1
       });
 
-      const result = kartaview.sequences(context.projection);
+      const result = _kartaview.sequences(_projection);
       expect(result).to.deep.eql([{
         type: 'LineString',
         coordinates: [[10,0], [10,0], [10,1]],
@@ -226,9 +215,9 @@ describe('serviceKartaview', () => {
   describe('#selectedImage', () => {
     it('sets and gets selected image', () => {
       const imagedata = { id: 'foo' };
-      kartaview.cache().images = new Map().set('foo', imagedata);
-      kartaview.selectImage(context, 'foo');
-      expect(kartaview.getSelectedImage()).to.eql(imagedata);
+      _kartaview._cache.images.set('foo', imagedata);
+      _kartaview.selectImage('foo');
+      expect(_kartaview.getSelectedImage()).to.eql(imagedata);
     });
   });
 
diff --git a/test/spec/services/mapillary.js b/test/spec/services/MapillaryService.test.js
similarity index 66%
rename from test/spec/services/mapillary.js
rename to test/spec/services/MapillaryService.test.js
index 2b1a4b9c3f..ff7a8319d2 100644
--- a/test/spec/services/mapillary.js
+++ b/test/spec/services/MapillaryService.test.js
@@ -1,61 +1,44 @@
-describe('serviceMapillary', () => {
-  const dimensions = [64, 64];
-  let context, mapillary;
+describe('MapillaryService', () => {
+  let _mapillary, _projection;
 
-
-  before(() => {
-    Rapid.services.mapillary = Rapid.serviceMapillary;
-  });
-
-  after(() => {
-    delete Rapid.services.mapillary;
-  });
+  class MockContext {
+    constructor() { }
+    deferredRedraw() { }
+  }
 
   beforeEach(() => {
-    context = Rapid.coreContext()
-      .assetPath('../dist/')
-      .init();
-    context.projection
+    fetchMock.reset();
+
+    _projection = new sdk.Projection()
       .scale(sdk.geoZoomToScale(14))
       .translate([-116508, 0])  // 10,0
-      .dimensions([[0,0], dimensions]);
-
-    // // Just for the image filtering tests, hard code these methods
-    // // So we don't bring the pixi layers' existence into the mix.
-    // context.photos().showsPanoramic = () => true;
-    // context.photos().showsFlat = () => true;
+      .dimensions([[0,0], [64, 64]]);
 
-    mapillary = Rapid.services.mapillary;
-    mapillary.reset();
+    _mapillary = new Rapid.MapillaryService(new MockContext());
+    _mapillary.init();
   });
 
-  afterEach(() => {});
-
 
   describe('#init', () => {
-    it('Initializes cache one time', () => {
-      const cache = mapillary.cache();
+    it('initializes cache', () => {
+      const cache = _mapillary._mlyCache;
       expect(cache).to.have.property('images');
       expect(cache).to.have.property('image_detections');
       expect(cache).to.have.property('points');
       expect(cache).to.have.property('signs');
       expect(cache).to.have.property('sequences');
-
-      mapillary.init();
-      const cache2 = mapillary.cache();
-      expect(cache).to.equal(cache2);
     });
   });
 
 
   describe('#reset', () => {
-    it('resets cache and image', () => {
-      mapillary.cache().foo = 'bar';
-      mapillary.selectImage(context, { id: 'baz', loc: [10,0] });
+    it('resets cache and selected image', () => {
+      _mapillary._mlyCache.images.forImageID.foo = { id: 'foo' };
+      _mapillary._mlyActiveImage = 'foo';
 
-      mapillary.reset();
-      expect(mapillary.cache()).to.not.have.property('foo');
-      expect(mapillary.getActiveImage()).to.be.null;
+      _mapillary.reset();
+      expect(_mapillary._mlyCache.images.forImageID).to.not.have.property('foo');
+      expect(_mapillary._mlyActiveImage).to.be.null;
     });
   });
 
@@ -68,8 +51,8 @@ describe('serviceMapillary', () => {
         { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { id: '2', loc: [10,1], ca: 90 } }
       ];
 
-      mapillary.cache().images.rtree.load(data);
-      const result = mapillary.images(context.projection);
+      _mapillary._mlyCache.images.rtree.load(data);
+      const result = _mapillary.images(_projection);
 
       expect(result).to.deep.eql([
         { id: '0', loc: [10,0], ca: 90 },
@@ -87,8 +70,8 @@ describe('serviceMapillary', () => {
         { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { id: '2', loc: [10,1] } }
       ];
 
-      mapillary.cache().signs.rtree.load(data);
-      const result = mapillary.signs(context.projection);
+      _mapillary._mlyCache.signs.rtree.load(data);
+      const result = _mapillary.signs(_projection);
 
       expect(result).to.deep.eql([
         { id: '0', loc: [10,0] },
@@ -106,8 +89,8 @@ describe('serviceMapillary', () => {
         { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { id: '2', loc: [10,1] } }
       ];
 
-      mapillary.cache().points.rtree.load(data);
-      const result = mapillary.mapFeatures(context.projection);
+      _mapillary._mlyCache.points.rtree.load(data);
+      const result = _mapillary.mapFeatures(_projection);
 
       expect(result).to.deep.eql([
         { id: '0', loc: [10,0] },
@@ -125,7 +108,7 @@ describe('serviceMapillary', () => {
         { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { id: '2', loc: [10,1], ca: 90, sequenceID: '-' } }
       ];
 
-      mapillary.cache().images.rtree.load(data);
+      _mapillary._mlyCache.images.rtree.load(data);
 
       const gj = {
         type: 'Feature',
@@ -143,9 +126,9 @@ describe('serviceMapillary', () => {
         }
       };
 
-      mapillary.cache().sequences = new Map().set('-', [gj]);
+      _mapillary._mlyCache.sequences = new Map().set('-', [gj]);
 
-      const res = mapillary.sequences(context.projection);
+      const res = _mapillary.sequences(_projection);
       expect(res).to.deep.eql([[gj]]);
     });
   });
@@ -154,8 +137,8 @@ describe('serviceMapillary', () => {
   describe('#setActiveImage', () => {
     it('gets and sets the selected image', () => {
       const image = { id: 'baz', originalLngLat: { lng: 10, lat: 0 }};
-      mapillary.setActiveImage(image);
-      expect(mapillary.getActiveImage().id).to.eql(image.id);
+      _mapillary.setActiveImage(image);
+      expect(_mapillary.getActiveImage().id).to.eql(image.id);
     });
   });
 
diff --git a/test/spec/services/NominatimService.test.js b/test/spec/services/NominatimService.test.js
new file mode 100644
index 0000000000..fd92699ee4
--- /dev/null
+++ b/test/spec/services/NominatimService.test.js
@@ -0,0 +1,143 @@
+describe('NominatimService', () => {
+  let nominatim;
+
+  class MockLocalizationSystem {
+    constructor() {}
+    localeCodes() { return ['en']; }
+  }
+
+  class MockContext {
+    constructor()        { this._localizationSystem = new MockLocalizationSystem(this); }
+    localizationSystem() { return this._localizationSystem; }
+  }
+
+
+  beforeEach(() => {
+    fetchMock.reset();
+    fetchMock.mock(/reverse\?.*lat=48&lon=16/, {
+      body: '{"address":{"country_code":"at"}}',
+      status: 200,
+      headers: { 'Content-Type': 'application/json' }
+    });
+
+    fetchMock.mock(/reverse\?.*lat=49&lon=17/, {
+      body: '{"address":{"country_code":"cz"}}',
+      status: 200,
+      headers: { 'Content-Type': 'application/json' }
+    });
+
+    fetchMock.mock(/reverse\?.*lat=1000&lon=1000/, {
+      body: '{"error":"Unable to geocode"}',
+      status: 200,
+      headers: { 'Content-Type': 'application/json' }
+    });
+
+    nominatim = new Rapid.NominatimService(new MockContext());
+    nominatim.init();
+  });
+
+
+  function parseQueryString(url) {
+    return sdk.utilStringQs(url.substring(url.indexOf('?')));
+  }
+
+
+  describe('#countryCode', () => {
+    it('calls the given callback with the results of the country code query', done => {
+      const callback = sinon.spy();
+      nominatim.countryCode([16, 48], callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          { zoom: '13', format: 'json', addressdetails: '1', lat: '48', lon: '16' }
+        );
+        expect(callback).to.have.been.calledWithExactly(null, 'at');
+        done();
+      }, 50);
+    });
+  });
+
+
+  describe('#reverse', () => {
+    it('should not cache distant result', done => {
+      let callback = sinon.spy();
+      nominatim.reverse([16, 48], callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          { zoom: '13', format: 'json', addressdetails: '1', lat: '48', lon: '16' }
+        );
+        expect(callback).to.have.been.calledWithExactly(null, { address: { country_code:'at' }});
+
+        fetchMock.resetHistory();
+        callback = sinon.spy();
+        nominatim.reverse([17, 49], callback);
+
+        window.setTimeout(() => {
+          expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+            { zoom: '13', format: 'json', addressdetails: '1', lat: '49', lon: '17' }
+          );
+          expect(callback).to.have.been.calledWithExactly(null, { address: { country_code:'cz' }});
+          done();
+        }, 50);
+      }, 50);
+    });
+
+    it('should cache nearby result', done => {
+      let callback = sinon.spy();
+      nominatim.reverse([16, 48], callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          { zoom: '13', format: 'json', addressdetails: '1', lat: '48', lon: '16' }
+        );
+        expect(callback).to.have.been.calledWithExactly(null, { address: { country_code:'at' }});
+
+        fetchMock.resetHistory();
+
+        callback = sinon.spy();
+        nominatim.reverse([16.000001, 48.000001], callback);
+
+        window.setTimeout(() => {
+          expect(callback).to.have.been.calledWithExactly(null, { address: { country_code:'at' }});
+          done();
+        }, 50);
+      }, 50);
+    });
+
+
+    it('handles "unable to geocode" result as an error', done => {
+      const callback = sinon.spy();
+      nominatim.reverse([1000, 1000], callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          { zoom: '13', format: 'json', addressdetails: '1', lat: '1000', lon: '1000' }
+        );
+        expect(callback).to.have.been.calledWithExactly('Unable to geocode');
+        done();
+      }, 50);
+    });
+  });
+
+
+  describe('#search', () => {
+    it('calls the given callback with the results of the search query', done => {
+      const callback = sinon.spy();
+      fetchMock.mock(/search/, {
+        body: '[{"place_id":"158484588","osm_type":"relation","osm_id":"188022","boundingbox":["39.867005","40.1379593","-75.2802976","-74.9558313"],"lat":"39.9523993","lon":"-75.1635898","display_name":"Philadelphia, Philadelphia County, Pennsylvania, United States of America","class":"place","type":"city","importance":0.83238050437778}]',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      nominatim.search('philadelphia', callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql({ format: 'json', limit: '10' });
+        expect(callback).to.have.been.calledOnce;
+        done();
+      }, 50);
+    });
+  });
+
+});
diff --git a/test/spec/services/OsmService.test.js b/test/spec/services/OsmService.test.js
new file mode 100644
index 0000000000..099083ceef
--- /dev/null
+++ b/test/spec/services/OsmService.test.js
@@ -0,0 +1,823 @@
+describe('OsmService', () => {
+  let _osm, spy;
+  let serverXHR;
+
+  class MockContext {
+    constructor()     { this._locationSystem = new Rapid.LocationSystem(this); }
+    locationSystem()  { return this._locationSystem; }
+    deferredRedraw()  { }
+  }
+
+  beforeEach(() => {
+    spy = sinon.spy();
+    serverXHR = sinon.fakeServer.create();      // authenticated calls use XHR via osm-auth
+    fetchMock.reset();
+
+    const capabilitiesXML =
+`<?xml version="1.0" encoding="UTF-8"?>
+<osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
+ <api>
+   <version minimum="0.6" maximum="0.6"/>
+   <area maximum="0.25"/>
+   <note_area maximum="25"/>
+   <tracepoints per_page="5000"/>
+   <waynodes maximum="2000"/>
+   <changesets maximum_elements="10000"/>
+   <timeout seconds="300"/>
+   <status database="online" api="online" gpx="online"/>
+ </api>
+ <policy>
+   <imagery>
+      <blacklist regex="\.foo\.com"/>
+      <blacklist regex="\.bar\.org"/>
+   </imagery>
+ </policy>
+</osm>`;
+
+    fetchMock.mock(/api\/capabilities/, {
+      body: capabilitiesXML,
+      status: 200,
+      headers: { 'Content-Type': 'text/xml' }
+    });
+
+    _osm = new Rapid.OsmService(new MockContext());
+    _osm.init();
+    _osm.switch({ url: 'https://www.openstreetmap.org' });
+  });
+
+  afterEach(() => {
+    _osm.throttledReloadApiStatus?.cancel();
+  });
+
+
+  function login() {
+    _osm.switch({
+      url: 'https://www.openstreetmap.org',
+      client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
+      client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE',
+      access_token: 'foo'  // preauth
+    });
+  }
+
+  function logout() {
+    _osm.logout();
+  }
+
+
+  describe('#connectionID', () => {
+    it('changes the connectionID every time service is reset', () => {
+      const cid1 = _osm.connectionID;
+      _osm.reset();
+      const cid2 = _osm.connectionID;
+      expect(cid2).to.be.above(cid1);
+    });
+
+    it('changes the connectionID every time service is switched', () => {
+      const cid1 = _osm.connectionID;
+      _osm.switch({ url: 'https://api06.dev.openstreetmap.org' });
+      const cid2 = _osm.connectionID;
+      expect(cid2).to.be.above(cid1);
+    });
+  });
+
+  describe('#changesetURL', () => {
+    it('provides a changeset url', () => {
+      expect(_osm.changesetURL(2)).to.eql('https://www.openstreetmap.org/changeset/2');
+    });
+
+    it('allows secure _osms', () => {
+      _osm.switch({ url: 'https://www.openstreetmap.org' });
+      expect(_osm.changesetURL(2)).to.eql('https://www.openstreetmap.org/changeset/2');
+    });
+  });
+
+  describe('#changesetsURL', () => {
+    it('provides a local changesets url', () => {
+      const center = [-74.65, 40.65];
+      const zoom = 17;
+      expect(_osm.changesetsURL(center, zoom)).to.eql('https://www.openstreetmap.org/history#map=17/40.65000/-74.65000');
+    });
+  });
+
+  describe('#entityURL', () => {
+    it('provides an entity url for a node', () => {
+      const e = Rapid.osmNode({ id: 'n1' });
+      expect(_osm.entityURL(e)).to.eql('https://www.openstreetmap.org/node/1');
+    });
+
+    it('provides an entity url for a way', () => {
+      const e = Rapid.osmWay({ id: 'w1' });
+      expect(_osm.entityURL(e)).to.eql('https://www.openstreetmap.org/way/1');
+    });
+
+    it('provides an entity url for a relation', () => {
+      const e = Rapid.osmRelation({ id: 'r1' });
+      expect(_osm.entityURL(e)).to.eql('https://www.openstreetmap.org/relation/1');
+    });
+  });
+
+  describe('#historyURL', () => {
+    it('provides a history url for a node', () => {
+      const e = Rapid.osmNode({ id: 'n1' });
+      expect(_osm.historyURL(e)).to.eql('https://www.openstreetmap.org/node/1/history');
+    });
+
+    it('provides a history url for a way', () => {
+      const e = Rapid.osmWay({ id: 'w1' });
+      expect(_osm.historyURL(e)).to.eql('https://www.openstreetmap.org/way/1/history');
+    });
+
+    it('provides a history url for a relation', () => {
+      const e = Rapid.osmRelation({ id: 'r1' });
+      expect(_osm.historyURL(e)).to.eql('https://www.openstreetmap.org/relation/1/history');
+    });
+  });
+
+  describe('#userURL', () => {
+    it('provides a user url', () => {
+      expect(_osm.userURL('bob')).to.eql('https://www.openstreetmap.org/user/bob');
+    });
+  });
+
+
+  describe('#reset', () => {
+    it('resets cache', () => {
+      _osm._tileCache.loaded['0,0,0'] = true;
+
+      _osm.reset();
+      expect(_osm._tileCache.loaded).to.not.have.property('0,0,0');
+    });
+  });
+
+
+  describe('#switch', () => {
+    it('changes the URL', () => {
+      _osm.switch({ url: 'https://example.com' });
+      expect(_osm.changesetURL(1)).to.equal('https://example.com/changeset/1');
+    });
+
+    it('emits a change event', () => {
+      _osm.on('authchange', spy);
+      _osm.switch({ url: 'https://example.com' });
+      expect(spy).to.have.been.calledOnce;
+    });
+  });
+
+  describe('#loadFromAPI', () => {
+    const path = '/api/0.6/map.json?bbox=-74.542,40.655,-74.541,40.656';
+    const response =
+`{
+  "version":"0.6",
+  "bounds":{"minlat":40.6550000,"minlon":-74.5420000,"maxlat":40.6560000,"maxlon":-74.5410000},
+  "elements":[
+    {"type":"node","id":"105340439","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6555,"lon":-74.5415},
+    {"type":"node","id":"105340442","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6556,"lon":-74.5416},
+    {"type":"way","id":"40376199","visible":true,"version":1,"changeset":2403012,"timestamp":"2009-09-07T16:01:13Z","user":"NJDataUploads","uid":148169,"nodes":[105340439,105340442],"tags":{"highway":"residential","name":"Potomac Drive"}}
+  ]
+}`;
+
+    it('returns an object', done => {
+      fetchMock.mock(`https://www.openstreetmap.org${path}`, {
+        body: response,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      _osm.loadFromAPI(path, (err, result) => {
+        expect(err).to.not.be.ok;
+        expect(typeof result).to.eql('object');
+        done();
+      });
+    });
+
+
+    it('retries an authenticated call unauthenticated if 400 Bad Request', done => {
+      fetchMock.mock(`https://www.openstreetmap.org${path}`, {
+        body: response,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+      serverXHR.respondWith('GET', `https://www.openstreetmap.org${path}`,
+        [400, { 'Content-Type': 'text/plain' }, 'Bad Request']);
+
+      login();
+
+      _osm.loadFromAPI(path, (err, xml) => {
+        expect(err).to.be.not.ok;
+        expect(typeof xml).to.eql('object');
+        expect(_osm.authenticated()).to.be.not.ok;
+        expect(fetchMock.called()).to.be.true;
+        done();
+      });
+
+      serverXHR.respond();
+    });
+
+
+    it('retries an authenticated call unauthenticated if 401 Unauthorized', done => {
+      fetchMock.mock(`https://www.openstreetmap.org${path}`, {
+        body: response,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+      serverXHR.respondWith('GET', `https://www.openstreetmap.org${path}`,
+        [401, { 'Content-Type': 'text/plain' }, 'Unauthorized']);
+
+      login();
+      _osm.loadFromAPI(path, (err, xml) => {
+        expect(err).to.be.not.ok;
+        expect(typeof xml).to.eql('object');
+        expect(_osm.authenticated()).to.be.not.ok;
+        expect(fetchMock.called()).to.be.true;
+        done();
+      });
+
+      serverXHR.respond();
+    });
+
+
+    it('retries an authenticated call unauthenticated if 403 Forbidden', done => {
+      fetchMock.mock(`https://www.openstreetmap.org${path}`, {
+        body: response,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+      serverXHR.respondWith('GET', `https://www.openstreetmap.org${path}`,
+        [403, { 'Content-Type': 'text/plain' }, 'Forbidden']);
+
+      login();
+      _osm.loadFromAPI(path, (err, xml) => {
+        expect(err).to.be.not.ok;
+        expect(typeof xml).to.eql('object');
+        expect(_osm.authenticated()).to.be.not.ok;
+        expect(fetchMock.called()).to.be.true;
+        done();
+      });
+
+      serverXHR.respond();
+    });
+
+
+    it('emits authchange event if 509 Bandwidth Limit Exceeded', done => {
+      fetchMock.mock(`https://www.openstreetmap.org${path}`, {
+        body: 'Bandwidth Limit Exceeded',
+        status: 509,
+        headers: { 'Content-Type': 'text/plain' }
+      });
+
+      logout();
+      _osm.on('authchange', spy);
+      _osm.loadFromAPI(path, err => {
+        expect(err).to.have.property('status', 509);
+        expect(spy).to.have.been.calledOnce;
+        done();
+      });
+    });
+
+    it('emits authchange event if 429 Too Many Requests', done => {
+      fetchMock.mock(`https://www.openstreetmap.org${path}`, {
+        body: '429 Too Many Requests',
+        status: 429,
+        headers: { 'Content-Type': 'text/plain' }
+      });
+
+      logout();
+      _osm.on('authchange', spy);
+      _osm.loadFromAPI(path, err => {
+        expect(err).to.have.property('status', 429);
+        expect(spy).to.have.been.calledOnce;
+        done();
+      });
+    });
+  });
+
+
+  describe('#loadFromAPIWithErrors', () => {
+    const path = '/api/0.6/map.json?bbox=-74.542,40.655,-74.541,40.656';
+    const response =
+`{
+  "version":"0.6",
+  "bounds":{"minlat":40.6550000,"minlon":-74.5420000,"maxlat":40.6560000,"maxlon":-74.5410000},
+  "elements":[
+    {"type":"node","id":"105340439","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6555,"lon":-74.5415},
+    {"type":"node","id":"105340442","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6556,"lon":-74.5416},
+    {"type":"error", "message":"something went wrong loading postgres"},
+    {"type":"way","id":"40376199","visible":true,"version":1,"changeset":2403012,"timestamp":"2009-09-07T16:01:13Z","user":"NJDataUploads","uid":148169,"nodes":[105340439,105340442],"tags":{"highway":"residential","name":"Potomac Drive"}}
+  ]
+}`;
+
+    it('returns a partial JSON error', done => {
+      fetchMock.mock(`https://www.openstreetmap.org${path}`, {
+        body: response,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      });
+
+      _osm.loadFromAPI(path, err => {
+        expect(err.message).to.eql('Partial JSON');
+        done();
+      });
+    });
+  });
+
+
+  describe('#loadTiles', () => {
+    const projection = new sdk.Projection()
+      .scale(sdk.geoZoomToScale(20))
+      .translate([55212042.434589595, 33248879.510193843])  // -74.0444216, 40.6694299
+      .dimensions([[0,0], [64,64]]);
+
+    const tileResponse =
+`{
+  "version":"0.6",
+  "bounds":{"minlat":40.6681396,"minlon":-74.0478516,"maxlat":40.6723060,"maxlon":-74.0423584},
+  "elements":[
+    {"type":"node","id":"368395606","visible":true,"version":3,"changeset":28924294,"timestamp":"2015-02-18T04:25:04Z","user":"peace2","uid":119748,"lat":40.6694299,"lon":-74.0444216,"tags":{"addr:state":"NJ","ele":"0","gnis:county_name":"Hudson","gnis:feature_id":"881377","gnis:feature_type":"Bay","name":"Upper Bay","natural":"bay"}}
+  ]
+}`;
+
+    it('calls callback when data tiles are loaded', done => {
+      fetchMock.mock(/map.json\?bbox/, {
+        body: tileResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const spy = sinon.spy();
+      _osm.loadTiles(projection, spy);
+
+      window.setTimeout(() => {
+        // was: calledOnce, now called multiple times as we fetch margin tiles
+        expect(spy).to.have.been.called;
+        done();
+      }, 50);
+    });
+
+
+    it('#isDataLoaded', done => {
+      fetchMock.mock(/map.json\?bbox/, {
+        body: tileResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      // resetting the cache
+      const caches = _osm.caches('get');
+      caches.tile.toLoad = {};
+      caches.tile.loaded = {};
+      caches.tile.inflight = {};
+      caches.tile.seen = {};
+      caches.tile.rtree.clear();
+
+      expect(_osm.isDataLoaded([-74.0444216, 40.6694299])).to.be.false;
+
+      _osm.loadTiles(projection);
+
+      window.setTimeout(() => {
+        expect(fetchMock.called()).to.be.true;
+        expect(_osm.isDataLoaded([-74.0444216, 40.6694299])).to.be.true;
+        done();
+      }, 50);
+    });
+  });
+
+
+  describe('#loadEntity', () => {
+    const nodeResponse =
+`{
+  "version":"0.6",
+  "elements":[
+    {"type":"node","id":1,"visible":true,"version":1,"changeset":28924294,"timestamp":"2009-03-07T03:26:33Z","user":"peace2","uid":119748,"lat":0,"lon":0}
+  ]
+}`;
+
+    const wayResponse =
+`{
+  "version":"0.6",
+  "elements":[
+    {"type":"node","id":1,"visible":true,"version":1,"changeset":2817006,"timestamp":"2009-10-11T18:03:23Z","user":"peace2","uid":119748,"lat":0,"lon":0},
+    {"type":"way","id":1,"visible":true,"version":1,"changeset":522559,"timestamp":"2008-01-03T05:24:43Z","user":"peace2","uid":119748,"nodes":[1]}
+  ]
+}`;
+
+    it('loads a node', done => {
+      fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1.json', {
+        body: nodeResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const id = 'n1';
+      _osm.loadEntity(id, (err, result) => {
+        const entity = result.data.find(e => e.id === id);
+        expect(entity).to.be.an.instanceof(Rapid.osmNode);
+        done();
+      });
+    });
+
+
+    it('loads a way', done => {
+      fetchMock.mock('https://www.openstreetmap.org/api/0.6/way/1/full.json', {
+        body: wayResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const id = 'w1';
+      _osm.loadEntity(id, (err, result) => {
+        const entity = result.data.find(e => e.id === id);
+        expect(entity).to.be.an.instanceof(Rapid.osmWay);
+        done();
+      });
+    });
+
+
+    it('does not ignore repeat requests', done => {
+      fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1.json', {
+        body: wayResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const id = 'n1';
+      _osm.loadEntity(id, (err1, result1) => {
+        const entity1 = result1.data.find(e1 => e1.id === id);
+        expect(entity1).to.be.an.instanceof(Rapid.osmNode);
+
+        _osm.loadEntity(id, (err2, result2) => {
+          const entity2 = result2.data.find(e2 => e2.id === id);
+          expect(entity2).to.be.an.instanceof(Rapid.osmNode);
+          done();
+        });
+      });
+    });
+  });
+
+
+  describe('#loadEntityVersion', () => {
+    const nodeResponse =
+`{
+  "version":"0.6",
+  "elements":[
+    {"type":"node","id":1,"visible":true,"version":1,"changeset":28924294,"timestamp":"2009-03-07T03:26:33Z","user":"peace2","uid":119748,"lat":0,"lon":0}
+  ]
+}`;
+    const wayResponse =
+`{
+  "version":"0.6",
+  "elements":[
+    {"type":"node","id":1,"visible":true,"version":1,"changeset":2817006,"timestamp":"2009-10-11T18:03:23Z","user":"peace2","uid":119748,"lat":0,"lon":0},
+    {"type":"way","id":1,"visible":true,"version":1,"changeset":522559,"timestamp":"2008-01-03T05:24:43Z","user":"peace2","uid":119748,"nodes":[1]}
+  ]
+}`;
+
+    it('loads a node', done => {
+      fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1/1.json', {
+        body: nodeResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const id = 'n1';
+      _osm.loadEntityVersion(id, 1, (err, result) => {
+        const entity = result.data.find(e => e.id === id);
+        expect(entity).to.be.an.instanceof(Rapid.osmNode);
+        done();
+      });
+    });
+
+
+    it('loads a way', done => {
+      fetchMock.mock('https://www.openstreetmap.org/api/0.6/way/1/1.json', {
+        body: wayResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const id = 'w1';
+      _osm.loadEntityVersion(id, 1, (err, result) => {
+        const entity = result.data.find(e => e.id === id);
+        expect(entity).to.be.an.instanceof(Rapid.osmWay);
+        done();
+      });
+    });
+
+
+    it('does not ignore repeat requests', done => {
+      fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1/1.json', {
+        body: nodeResponse,
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const id = 'n1';
+      _osm.loadEntityVersion(id, 1, (err1, result1) => {
+        const entity1 = result1.data.find(e1 => e1.id === id);
+        expect(entity1).to.be.an.instanceof(Rapid.osmNode);
+
+        _osm.loadEntityVersion(id, 1, (err2, result2) => {
+          const entity2 = result2.data.find(e2 => e2.id === id);
+          expect(entity2).to.be.an.instanceof(Rapid.osmNode);
+          done();
+        });
+      });
+    });
+
+  });
+
+
+  describe('#userChangesets', () => {
+    let userDetailsFn;
+
+    beforeEach(() => {
+      userDetailsFn = _osm.userDetails;
+      _osm.userDetails = (callback) => {
+        callback(undefined, { id: 1, displayName: 'Steve' });
+      };
+    });
+
+    afterEach(() => {
+      _osm.userDetails = userDetailsFn;
+    });
+
+
+    it('loads user changesets', done => {
+      const changesetsXML =
+`<?xml version="1.0" encoding="UTF-8"?>
+<osm>
+<changeset id="36777543" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">
+  <tag k="comment" v="Caprice Court has been extended"/>
+  <tag k="created_by" v="Rapid 2.0.0"/>
+</changeset>
+</osm>`;
+
+      login();
+      _osm.userChangesets((err, changesets) => {
+        expect(changesets).to.deep.equal([{
+          tags: {
+            comment: 'Caprice Court has been extended',
+            created_by: 'Rapid 2.0.0'
+          }
+        }]);
+        _osm.logout();
+        done();
+      });
+
+      serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
+        [200, { 'Content-Type': 'text/xml' }, changesetsXML]);
+      serverXHR.respond();
+    });
+
+
+    it('excludes changesets without comment tag', done => {
+      const changesetsXML =
+`<?xml version="1.0" encoding="UTF-8"?>
+<osm>
+<changeset id="36777543" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">
+  <tag k="comment" v="Caprice Court has been extended"/>
+  <tag k="created_by" v="Rapid 2.0.0"/>
+</changeset>
+<changeset id="36777544" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">
+  <tag k="created_by" v="Rapid 2.0.0"/>
+</changeset>
+</osm>`;
+
+      login();
+      _osm.userChangesets((err, changesets) => {
+        expect(changesets).to.deep.equal([{
+          tags: {
+            comment: 'Caprice Court has been extended',
+            created_by: 'Rapid 2.0.0'
+          }
+        }]);
+        _osm.logout();
+        done();
+      });
+
+      serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
+        [200, { 'Content-Type': 'text/xml' }, changesetsXML]);
+      serverXHR.respond();
+    });
+
+
+    it('excludes changesets with empty comment', done => {
+      const changesetsXML =
+`<?xml version="1.0" encoding="UTF-8"?>
+<osm>
+<changeset id="36777543" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">
+  <tag k="comment" v="Caprice Court has been extended"/>
+  <tag k="created_by" v="Rapid 2.0.0"/>
+</changeset>
+<changeset id="36777544" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">
+  <tag k="comment" v=""/>
+  <tag k="created_by" v="Rapid 2.0.0"/>
+</changeset>
+</osm>`;
+
+      login();
+      _osm.userChangesets((err, changesets) => {
+        expect(changesets).to.deep.equal([{
+          tags: {
+            comment: 'Caprice Court has been extended',
+            created_by: 'Rapid 2.0.0'
+          }
+        }]);
+        _osm.logout();
+        done();
+      });
+
+      serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
+        [200, { 'Content-Type': 'text/xml' }, changesetsXML]);
+      serverXHR.respond();
+    });
+  });
+
+
+  describe('#caches', () => {
+    it('loads reset caches', () => {
+      const caches = _osm.caches();
+      expect(caches.tile).to.have.all.keys(['toLoad','loaded','inflight','seen','rtree']);
+      expect(caches.note).to.have.all.keys(['toLoad','loaded','inflight','inflightPost','note','closed','rtree']);
+      expect(caches.user).to.have.all.keys(['toLoad','user']);
+    });
+
+    describe('sets/gets caches', () => {
+      it('sets/gets a tile', () => {
+        const obj = {
+          tile: { loaded: { '1,2,16': true, '3,4,16': true } }
+        };
+        _osm.caches(obj);
+        expect(_osm.caches().tile.loaded['1,2,16']).to.eql(true);
+        expect(Object.keys(_osm.caches().tile.loaded).length).to.eql(2);
+      });
+
+      it('sets/gets a note', () => {
+        const note = Rapid.osmNote({ id: 1, loc: [0, 0] });
+        const note2 = Rapid.osmNote({ id: 2, loc: [0, 0] });
+        const obj = {
+          note: { note: { 1: note, 2: note2 } }
+        };
+        _osm.caches(obj);
+        expect(_osm.caches().note.note[note.id]).to.eql(note);
+        expect(Object.keys(_osm.caches().note.note).length).to.eql(2);
+      });
+
+      it('sets/gets a user', () => {
+        const user = { id: 1, display_name: 'Name' };
+        const user2 = { id: 2, display_name: 'Name' };
+        const obj = {
+          user: { user: { 1: user, 2: user2 } }
+        };
+        _osm.caches(obj);
+        expect(_osm.caches().user.user[user.id]).to.eql(user);
+        expect(Object.keys(_osm.caches().user.user).length).to.eql(2);
+      });
+    });
+  });
+
+
+  describe('#loadNotes', () => {
+    const projection = new sdk.Projection()
+      .scale(sdk.geoZoomToScale(14))
+      .translate([-116508, 0])  // 10,0
+      .dimensions([[0,0], [64,64]]);
+
+    const notesXML =
+`<?xml version="1.0" encoding="UTF-8"?>
+<osm>
+<note lon="10" lat="0">
+  <id>1</id>
+  <url>https://www.openstreetmap.org/api/0.6/notes/1</url>
+  <comment_url>https://www.openstreetmap.org/api/0.6/notes/1/comment</comment_url>
+  <close_url>https://www.openstreetmap.org/api/0.6/notes/1/close</close_url>
+  <date_created>2019-01-01 00:00:00 UTC</date_created>
+  <status>open</status>
+  <comments>
+    <comment>
+      <date>2019-01-01 00:00:00 UTC</date>
+      <uid>1</uid>
+      <user>Steve</user>
+      <user_url>https://www.openstreetmap.org/user/Steve</user_url>
+      <action>opened</action>
+      <text>This is a note</text>
+      <html>&lt;p&gt;This is a note&lt;/p&gt;</html>
+    </comment>
+  </comments>
+</note>
+</osm>`;
+
+    it('fires loadedNotes when notes are loaded', done => {
+      fetchMock.mock(/notes\?/, {
+        body: notesXML,
+        status: 200,
+        headers: { 'Content-Type': 'text/xml' }
+      });
+
+      _osm.on('loadedNotes', spy);
+      _osm.loadNotes(projection, {});
+
+      window.setTimeout(() => {
+        // was: calledOnce, now called multiple times as we fetch margin tiles
+        expect(spy).to.have.been.called;
+        done();
+      }, 50);
+    });
+  });
+
+
+  describe('#notes', () => {
+    const projection = new sdk.Projection()
+      .scale(sdk.geoZoomToScale(14))
+      .translate([-116508, 0])  // 10,0
+      .dimensions([[0,0], [64,64]]);
+
+    it('returns notes in the visible map area', () => {
+      const notes = [
+        { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0] } },
+        { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0] } },
+        { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1] } }
+      ];
+
+      _osm.caches('get').note.rtree.load(notes);
+      const res = _osm.notes(projection);
+
+      expect(res).to.deep.eql([
+        { key: '0', loc: [10,0] },
+        { key: '1', loc: [10,0] }
+      ]);
+    });
+  });
+
+
+  describe('#getNote', () => {
+    it('returns a note', () => {
+      const note = Rapid.osmNote({ id: 1, loc: [0, 0] });
+      const obj = {
+        note: { note: { 1: note } }
+      };
+      _osm.caches(obj);
+      const result = _osm.getNote(1);
+      expect(result).to.deep.equal(note);
+    });
+  });
+
+  describe('#removeNote', () => {
+    it('removes a note that is new', () => {
+      const note = Rapid.osmNote({ id: -1, loc: [0, 0] });
+      _osm.replaceNote(note);
+      _osm.removeNote(note);
+      const result = _osm.getNote(-1);
+      expect(result).to.eql(undefined);
+    });
+  });
+
+
+  describe('#replaceNote', () => {
+    it('returns a new note', () => {
+      const note = Rapid.osmNote({ id: 2, loc: [0, 0] });
+      const result = _osm.replaceNote(note);
+      expect(result.id).to.eql(2);
+      expect(_osm.caches().note.note[2]).to.eql(note);
+      const rtree = _osm.caches().note.rtree;
+      const result_rtree = rtree.search({ 'minX': -1, 'minY': -1, 'maxX': 1, 'maxY': 1 });
+      expect(result_rtree.length).to.eql(1);
+      expect(result_rtree[0].data).to.eql(note);
+    });
+
+    it('replaces a note', () => {
+      const note = Rapid.osmNote({ id: 2, loc: [0, 0] });
+      _osm.replaceNote(note);
+      note.status = 'closed';
+      const result = _osm.replaceNote(note);
+      expect(result.status).to.eql('closed');
+
+      const rtree = _osm.caches().note.rtree;
+      const result_rtree = rtree.search({ 'minX': -1, 'minY': -1, 'maxX': 1, 'maxY': 1 });
+      expect(result_rtree.length).to.eql(1);
+      expect(result_rtree[0].data.status).to.eql('closed');
+    });
+  });
+
+
+  describe('API capabilities', () => {
+    describe('#status', () => {
+      it('gets API status', done => {
+        _osm.status((err, result) => {
+          expect(result).to.eql('online');
+          done();
+        });
+      });
+    });
+
+    describe('#imageryBlocklists', () => {
+      it('updates imagery blocklists', done => {
+        _osm.status(() => {
+          const blocklists = _osm.imageryBlocklists;
+          expect(blocklists).to.deep.equal([new RegExp('\.foo\.com'), new RegExp('\.bar\.org')]);
+          done();
+        });
+      });
+    });
+
+  });
+});
diff --git a/test/spec/services/osm_wikibase.js b/test/spec/services/OsmWikibaseService.test.js
similarity index 92%
rename from test/spec/services/osm_wikibase.js
rename to test/spec/services/OsmWikibaseService.test.js
index 95691c48a6..09665a7bec 100644
--- a/test/spec/services/osm_wikibase.js
+++ b/test/spec/services/OsmWikibaseService.test.js
@@ -1,21 +1,11 @@
-describe('serviceOsmWikibase', function () {
-  var wikibase;
+describe('OsmWikibaseService', () => {
+  let wikibase;
 
-  before(function () {
-    Rapid.services.osmWikibase = Rapid.serviceOsmWikibase;
-  });
-
-  after(function () {
-    delete Rapid.services.osmWikibase;
-  });
 
-  beforeEach(function () {
-    wikibase = Rapid.services.osmWikibase;
-    wikibase.init();
-  });
-
-  afterEach(function () {
+  beforeEach(() => {
     fetchMock.reset();
+    wikibase = new Rapid.OsmWikibaseService();
+    wikibase.init();
   });
 
 
@@ -256,14 +246,14 @@ describe('serviceOsmWikibase', function () {
   }
 
 
-  var localeData = {
+  const localeData = {
     id: 'Q7792',
     sitelinks: {wiki: {site: 'wiki', title: 'Locale:fr'}}
   };
 
-  describe('#getEntity', function () {
-    it('calls the given callback with the results of the getEntity data item query', function (done) {
-      var callback = sinon.spy();
+  describe('#getEntity', () => {
+    it('calls the given callback with the results of the getEntity data item query', done => {
+      const callback = sinon.spy();
       fetchMock.mock(/action=wbgetentities/, {
         body: JSON.stringify({
           entities: {
@@ -279,8 +269,8 @@ describe('serviceOsmWikibase', function () {
 
       wikibase.getEntity({ key: 'amenity', value: 'parking', langCodes: ['fr'] }, callback);
 
-      window.setTimeout(function () {
-        expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
           {
             action: 'wbgetentities',
             sites: 'wiki',
@@ -301,7 +291,7 @@ describe('serviceOsmWikibase', function () {
   });
 
 
-  it('creates correct sitelinks', function () {
+  it('creates correct sitelinks', () => {
     expect(wikibase.toSitelink('amenity')).to.eql('Key:amenity');
     expect(wikibase.toSitelink('amenity_')).to.eql('Key:amenity');
     expect(wikibase.toSitelink('_amenity_')).to.eql('Key: amenity');
@@ -311,7 +301,7 @@ describe('serviceOsmWikibase', function () {
     expect(wikibase.toSitelink('amenity or_not', '_park ing_')).to.eql('Tag:amenity or not= park ing');
   });
 
-  it('gets correct value from entity', function () {
+  it('gets correct value from entity', () => {
     wikibase.addLocale('de', 'Q6994');
     wikibase.addLocale('fr', 'Q7792');
     expect(wikibase.claimToValue(tagData(), 'P4', 'en')).to.eql('Primary image.jpg');
@@ -320,7 +310,7 @@ describe('serviceOsmWikibase', function () {
     expect(wikibase.claimToValue(keyData(), 'P6', 'de')).to.eql('Q14');
   });
 
-  it('gets monolingual value from entity as an object', function () {
+  it('gets monolingual value from entity as an object', () => {
     expect(wikibase.monolingualClaimToValueObj(tagData(), 'P31')).to.eql({
       cs: 'Cs:Key:bridge:movable',
       de: 'DE:Key:bridge:movable',
diff --git a/test/spec/services/streetside.js b/test/spec/services/StreetsideService.test.js
similarity index 72%
rename from test/spec/services/streetside.js
rename to test/spec/services/StreetsideService.test.js
index 94871813e4..5233483049 100644
--- a/test/spec/services/streetside.js
+++ b/test/spec/services/StreetsideService.test.js
@@ -1,64 +1,60 @@
-describe('serviceStreetside', () => {
-  const dimensions = [64, 64];
-  let context, streetside;
+describe('StreetsideService', () => {
+  let _streetside, _projection;
 
-  before(() => {
-    Rapid.services.streetside = Rapid.serviceStreetside;
-  });
-
-  after(() => {
-    delete Rapid.services.streetside;
-  });
+  class MockContext {
+    constructor() { }
+    deferredRedraw() { }
+  }
 
   beforeEach(() => {
-    context = Rapid.coreContext()
-      .assetPath('../dist/')
-      .init();
-    context.projection
+    fetchMock.reset();
+
+    _projection = new sdk.Projection()
       .scale(sdk.geoZoomToScale(14))
       .translate([-116508, 0])  // 10,0
-      .dimensions([[0,0], dimensions]);
+      .dimensions([[0,0], [64, 64]]);
 
-    streetside = Rapid.services.streetside;
-    streetside.reset();
+    _streetside = new Rapid.StreetsideService(new MockContext());
+    _streetside.init();
   });
 
+
   afterEach(() => {
     window.JSONP_FIX = undefined;
   });
 
 
   describe('#init', () => {
-    it('Initializes cache one time', () => {
-      const cache = streetside.cache();
+    it('initializes cache', () => {
+      const cache = _streetside._cache;
       expect(cache).to.have.property('bubbles');
       expect(cache).to.have.property('sequences');
-
-      streetside.init();
-      const cache2 = streetside.cache();
-      expect(cache).to.equal(cache2);
+      expect(cache.bubbles).to.be.an.instanceof(Map);
+      expect(cache.sequences).to.be.an.instanceof(Map);
     });
   });
 
   describe('#reset', () => {
     it('resets cache', () => {
-      streetside.cache().foo = 'bar';
-      streetside.reset();
-      expect(streetside.cache()).to.not.have.property('foo');
+      _streetside._cache.bubbles.set('foo', { id: 'foo' });
+
+      _streetside.reset();
+      expect(_streetside._cache.bubbles.has('foo')).to.be.false;
     });
   });
 
+
   describe('#loadBubbles', () => {
-    it('fires loadedImages when bubbles are loaded', done => {
+    it('fires loadedData when bubbles are loaded', done => {
       // adjust projection so that only one tile is fetched
       // (JSONP hack will return the same data for every fetch)
-      context.projection
+      _projection
         .scale(sdk.geoZoomToScale(18))
         .translate([-1863988.9381333336, 762.8270222954452])  // 10.002,0.002
-        .dimensions([[0,0], dimensions]);
+        .dimensions([[0,0], [64,64]]);
 
       const spy = sinon.spy();
-      streetside.on('loadedImages', spy);
+      _streetside.on('loadedData', spy);
 
       window.JSONP_DELAY = 0;
       window.JSONP_FIX = [{
@@ -78,22 +74,22 @@ describe('serviceStreetside', () => {
         }
       ];
 
-      streetside.loadBubbles(context.projection, 0);  // 0 = don't fetch margin tiles
+      _streetside.loadBubbles(_projection, 0);  // 0 = don't fetch margin tiles
 
       window.setTimeout(() => {
         expect(spy).to.have.been.calledOnce;
         done();
-      }, 200);
+      }, 50);
     });
 
     it('does not load bubbles around null island', done => {
-      context.projection
+      _projection
         .scale(sdk.geoZoomToScale(18))
         .translate([0, 0])
-        .dimensions([[0,0], dimensions]);
+        .dimensions([[0,0], [64,64]]);
 
       const spy = sinon.spy();
-      streetside.on('loadedImages', spy);
+      _streetside.on('loadedData', spy);
 
       window.JSONP_DELAY = 0;
       window.JSONP_FIX = [{
@@ -113,12 +109,12 @@ describe('serviceStreetside', () => {
         }
       ];
 
-      streetside.loadBubbles(context.projection, 0);  // 0 = don't fetch margin tiles
+      _streetside.loadBubbles(_projection, 0);  // 0 = don't fetch margin tiles
 
       window.setTimeout(() => {
         expect(spy).to.have.been.not.called;
         done();
-      }, 200);
+      }, 50);
     });
   });
 
@@ -131,9 +127,9 @@ describe('serviceStreetside', () => {
         { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { id: 3, loc: [10, 1], ca: 90, pr: 2, ne: undefined, isPano: true, sequenceID: 1 } }
       ];
 
-      streetside.cache().rtree.load(data);
+      _streetside._cache.rtree.load(data);
 
-      const result = streetside.bubbles(context.projection);
+      const result = _streetside.bubbles(_projection);
       expect(result).to.deep.eql([
         { id: 1, loc: [10, 0], ca: 90, pr: undefined, ne: 2, isPano: true, sequenceID: 1 },
         { id: 2, loc: [10, 0], ca: 90, pr: 1, ne: 3, isPano: true, sequenceID: 1 }
@@ -160,10 +156,10 @@ describe('serviceStreetside', () => {
         }
       };
 
-      streetside.cache().rtree.load(data);
-      streetside.cache().sequences.set(1, sequence);
+      _streetside._cache.rtree.load(data);
+      _streetside._cache.sequences.set(1, sequence);
 
-      const result = streetside.sequences(context.projection);
+      const result = _streetside.sequences(_projection);
       expect(result).to.deep.eql([sequence.geojson]);
     });
   });
diff --git a/test/spec/services/TaginfoService.test.js b/test/spec/services/TaginfoService.test.js
new file mode 100644
index 0000000000..bc27f9bc8f
--- /dev/null
+++ b/test/spec/services/TaginfoService.test.js
@@ -0,0 +1,392 @@
+describe('TaginfoService', () => {
+  let taginfo;
+
+  class MockLocalizationSystem {
+    constructor() {}
+    languageCode() { return 'en'; }
+  }
+
+  class MockContext {
+    constructor()        { this._localizationSystem = new MockLocalizationSystem(this); }
+    localizationSystem() { return this._localizationSystem; }
+  }
+
+
+  beforeEach(() => {
+    fetchMock.reset();
+    fetchMock.mock(new RegExp('\/keys\/all.*sortname=values_all'), {
+      body: '{"data":[{"count_all":56136034,"key":"name","count_all_fraction":0.0132}]}',
+      status: 200,
+      headers: { 'Content-Type': 'application/json' }
+    });
+
+    taginfo = new Rapid.TaginfoService(new MockContext());
+    taginfo.init();   // init will try to fetch the common values
+    fetchMock.reset();
+  });
+
+
+  function parseQueryString(url) {
+    return sdk.utilStringQs(url.substring(url.indexOf('?')));
+  }
+
+
+  describe('#keys', () => {
+    it('calls the given callback with the results of the keys query', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"count_all":5190337,"key":"amenity","count_all_fraction":1.0}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.keys({ query: 'amen' }, callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          {query: 'amen', page: '1', rp: '10', sortname: 'count_all', sortorder: 'desc', lang: 'en'}
+        );
+        expect(callback).to.have.been.calledWith(null, [{'title':'amenity', 'value':'amenity'}] );
+        done();
+      }, 50);
+    });
+
+    it('includes popular keys', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"count_all":5190337,"count_nodes":500000,"key":"amenity","count_all_fraction":1.0, "count_nodes_fraction":1.0},'
+          + '{"count_all":1,"key":"amenityother","count_all_fraction":0.0, "count_nodes":100}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.keys({ query: 'amen' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, [{'title':'amenity', 'value':'amenity'}] );
+        done();
+      }, 50);
+    });
+
+    it('includes popular keys with an entity type filter', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"count_all":5190337,"count_nodes":500000,"key":"amenity","count_all_fraction":1.0, "count_nodes_fraction":1.0},'
+          + '{"count_all":1,"key":"amenityother","count_all_fraction":0.0, "count_nodes":100}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.keys({ query: 'amen', filter: 'nodes' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, [{'title':'amenity', 'value':'amenity'}] );
+        done();
+      }, 50);
+    });
+
+    it('includes unpopular keys with a wiki page', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"count_all":5190337,"key":"amenity","count_all_fraction":1.0, "count_nodes_fraction":1.0},'
+          + '{"count_all":1,"key":"amenityother","count_all_fraction":0.0, "count_nodes_fraction":0.0, "in_wiki": true}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.keys({ query: 'amen' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, [
+          {'title':'amenity', 'value':'amenity'},
+          {'title':'amenityother', 'value':'amenityother'}
+        ]);
+        done();
+      }, 50);
+    });
+
+    it('sorts keys with \':\' below keys without \':\'', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"key":"ref:bag","count_all":9790586,"count_all_fraction":0.0028},' +
+          '{"key":"ref","count_all":7933528,"count_all_fraction":0.0023}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.keys({ query: 'ref' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(
+          null, [{'title':'ref', 'value':'ref'},{'title':'ref:bag', 'value':'ref:bag'}]
+        );
+        done();
+      }, 50);
+    });
+  });
+
+  describe('#multikeys', () => {
+    it('calls the given callback with the results of the multikeys query', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"count_all":69593,"key":"recycling:glass","count_all_fraction":0.0}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.multikeys({ query: 'recycling:' }, callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          {query: 'recycling:', page: '1', rp: '25', sortname: 'count_all', sortorder: 'desc', lang: 'en'}
+        );
+        expect(callback).to.have.been.calledWith(
+          null, [{'title':'recycling:glass', 'value':'recycling:glass'}]
+        );
+        done();
+      }, 50);
+    });
+
+    it('excludes multikeys with extra colons', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"count_all":4426,"key":"service:bicycle:retail","count_all_fraction":0.0},' +
+          '{"count_all":22,"key":"service:bicycle:retail:ebikes","count_all_fraction":0.0}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.multikeys({ query: 'service:bicycle:' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(
+          null, [{'title':'service:bicycle:retail', 'value':'service:bicycle:retail'}]
+        );
+        done();
+      }, 50);
+    });
+
+    it('excludes multikeys with wrong prefix', done => {
+      fetchMock.mock(/\/keys\/all/, {
+        body: '{"data":[{"count_all":4426,"key":"service:bicycle:retail","count_all_fraction":0.0},' +
+          '{"count_all":22,"key":"disused:service:bicycle","count_all_fraction":0.0}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.multikeys({ query: 'service:bicycle:' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(
+          null, [{'title':'service:bicycle:retail', 'value':'service:bicycle:retail'}]
+        );
+        done();
+      }, 50);
+    });
+  });
+
+  describe('#values', () => {
+    it('calls the given callback with the results of the values query', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"parking","description":"A place for parking cars", "fraction":0.1}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'amenity', query: 'par' }, callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          {key: 'amenity', query: 'par', page: '1', rp: '25', sortname: 'count_all', sortorder: 'desc', lang: 'en'}
+        );
+        expect(callback).to.have.been.calledWith(
+          null, [{'value':'parking','title':'A place for parking cars'}]
+        );
+        done();
+      }, 50);
+    });
+
+    it('includes popular values', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"parking","description":"A place for parking cars", "fraction":1.0},' +
+          '{"value":"party","description":"A place for partying", "fraction":0.0}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'amenity', query: 'par' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(
+          null, [{'value':'parking','title':'A place for parking cars'}]
+        );
+        done();
+      }, 50);
+    });
+
+    it('does not get values for extremely unpopular keys', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"Rue Pasteur","description":"", "fraction":0.0001},' +
+          '{"value":"Via Trieste","description":"", "fraction":0.0001}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'name', query: 'ste' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, []);
+        done();
+      }, 50);
+    });
+
+    it('excludes values with capital letters and some punctuation', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"parking","description":"A place for parking cars", "fraction":0.2},'
+          + '{"value":"PArking","description":"A common misspelling", "fraction":0.2},'
+          + '{"value":"parking;partying","description":"A place for parking cars *and* partying", "fraction":0.2},'
+          + '{"value":"parking, partying","description":"A place for parking cars *and* partying", "fraction":0.2},'
+          + '{"value":"*","description":"", "fraction":0.2}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'amenity', query: 'par' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(
+          null, [{'value':'parking','title':'A place for parking cars'}]
+        );
+        done();
+      }, 50);
+    });
+
+    it('includes network values with capital letters and some punctuation', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"US:TX:FM","description":"Farm to Market Roads in the U.S. state of Texas.", "fraction":0.34},'
+          + '{"value":"US:KY","description":"Primary and secondary state highways in the U.S. state of Kentucky.", "fraction":0.31},'
+          + '{"value":"US:US","description":"U.S. routes in the United States.", "fraction":0.19},'
+          + '{"value":"US:I","description":"Interstate highways in the United States.", "fraction":0.11},'
+          + '{"value":"US:MD","description":"State highways in the U.S. state of Maryland.", "fraction":0.06}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'network', query: 'us' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, [
+          {'value':'US:TX:FM','title':'Farm to Market Roads in the U.S. state of Texas.'},
+          {'value':'US:KY','title':'Primary and secondary state highways in the U.S. state of Kentucky.'},
+          {'value':'US:US','title':'U.S. routes in the United States.'},
+          {'value':'US:I','title':'Interstate highways in the United States.'},
+          {'value':'US:MD','title':'State highways in the U.S. state of Maryland.'}
+        ]);
+        done();
+      }, 50);
+    });
+
+    it('includes biological genus values with capital letters', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"Quercus","description":"Oak", "fraction":0.5}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'genus', query: 'qu' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, [{'value':'Quercus','title':'Oak'}] );
+        done();
+      }, 50);
+    });
+
+    it('includes biological taxon values with capital letters', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"Quercus robur","description":"Oak", "fraction":0.5}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'taxon', query: 'qu' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, [{'value':'Quercus robur','title':'Oak'}] );
+        done();
+      }, 50);
+    });
+
+    it('includes biological species values with capital letters', done => {
+      fetchMock.mock(/\/key\/values/, {
+        body: '{"data":[{"value":"Quercus robur","description":"Oak", "fraction":0.5}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.values({ key: 'species', query: 'qu' }, callback);
+
+      window.setTimeout(() => {
+        expect(callback).to.have.been.calledWith(null, [{'value':'Quercus robur','title':'Oak'}] );
+        done();
+      }, 50);
+    });
+  });
+
+  describe('#roles', () => {
+    it('calls the given callback with the results of the roles query', done => {
+      fetchMock.mock(/\/relation\/roles/, {
+        body: '{"data":[{"role":"stop","count_relation_members_fraction":0.1757},' +
+          '{"role":"south","count_relation_members_fraction":0.0035}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.roles({ rtype: 'route', query: 's', geometry: 'relation' }, callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          {rtype: 'route', query: 's', page: '1', rp: '25', sortname: 'count_relation_members', sortorder: 'desc', lang: 'en'}
+        );
+        expect(callback).to.have.been.calledWith(null, [
+          {'value': 'stop', 'title': 'stop'},
+          {'value': 'south', 'title': 'south'}
+        ]);
+        done();
+      }, 50);
+    });
+  });
+
+  describe('#docs', () => {
+    it('calls the given callback with the results of the docs query', done => {
+      fetchMock.mock(/\/tag\/wiki_page/, {
+        body: '{"data":[{"on_way":false,"lang":"en","on_area":true,"image":"File:Car park2.jpg"}]}',
+        status: 200,
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      const callback = sinon.spy();
+      taginfo.docs({ key: 'amenity', value: 'parking' }, callback);
+
+      window.setTimeout(() => {
+        expect(parseQueryString(fetchMock.lastUrl())).to.eql(
+          {key: 'amenity', value: 'parking'}
+        );
+        expect(callback).to.have.been.calledWith(
+          null, [{'on_way':false,'lang':'en','on_area':true,'image':'File:Car park2.jpg'}]
+        );
+        done();
+      }, 50);
+    });
+  });
+
+});
diff --git a/test/spec/services/maprules.js b/test/spec/services/maprules.js
deleted file mode 100644
index 14e78a3fe8..0000000000
--- a/test/spec/services/maprules.js
+++ /dev/null
@@ -1,571 +0,0 @@
-describe('maprules', function() {
-    var _ruleChecks, _savedAreaKeys, validationRules;
-
-    before(function() {
-        _savedAreaKeys = Rapid.osmAreaKeys;
-        Rapid.osmSetAreaKeys({ building: {}, amenity: {} });
-
-        Rapid.services.maprules = Rapid.serviceMapRules;
-        Rapid.serviceMapRules.init();
-        _ruleChecks = Rapid.serviceMapRules.ruleChecks();
-    });
-
-    after(function() {
-        Rapid.osmSetAreaKeys(_savedAreaKeys);
-        delete Rapid.services.maprules;
-    });
-
-    describe('#filterRuleChecks', function() {
-        it('returns shortlist of mapcss checks relevant to provided selector', function() {
-            var selector = {
-                geometry: 'closedway',
-                equals: {amenity: 'marketplace'},
-                absence: 'name',
-                error: '\'Marketplace\' preset must be coupled with name'
-            };
-            var filteredChecks = Rapid.serviceMapRules.filterRuleChecks(selector);
-            var equalsCheck = filteredChecks[0];
-            var absenceCheck = filteredChecks[1];
-            var entityTags = { amenity: 'marketplace' };
-
-            expect(filteredChecks.length).eql(2);
-            expect(equalsCheck(entityTags)).to.be.true;
-            expect(absenceCheck(entityTags)).to.be.true;
-        });
-    });
-
-    describe('#buildTagMap', function() {
-        it('builds a map of tag keys/values found in mapcss selector', function() {
-            [
-                {
-                    t: {
-                        equals: {
-                            man_made: 'tower',
-                            'tower:type': 'communication'
-                        }
-                    },
-                    r: {
-                        man_made: ['tower'],
-                        'tower:type': ['communication']
-                    }
-                },
-                {
-                    t: {
-                        equals: {
-                            building: 'yes',
-                            amenity: 'school'
-                        },
-                        positiveRegex: {
-                            opening_hours: [
-                                '24/7',
-                                'sunrise_sundown'
-                            ]
-                        },
-                        negativeRegex: {
-                            source: [
-                                'missing_maps',
-                                'american_red_cross'
-                            ]
-                        },
-                        greaterThanEqual: { floors: 2 },
-                        lessThanEqual: { floors: 4 }
-
-                    },
-                    r: {
-                        building: ['yes'],
-                        amenity: ['school'],
-                        opening_hours: ['24/7', 'sunrise_sundown'],
-                        source: ['missing_maps', 'american_red_cross'],
-                        floors: [4, 2]
-                    }
-                },
-                {
-                    t: {
-                        equals: { highway: 'yes' },
-                        greaterThan: { lanes: 1 },
-                        lessThan: { lanes: 4 }
-                    },
-                    r: {
-                        highway: ['yes'],
-                        lanes: [4, 1]
-                    }
-                }
-            ].forEach(function(test) {
-                expect(Rapid.serviceMapRules.buildTagMap(test.t)).to.eql(test.r);
-            });
-        });
-    });
-
-    describe('#inferGeometry', function() {
-        it('infers geometry using selector keys', function() {
-
-            var amenityDerivedArea = {
-                geometry: 'closedway',
-                presence: 'amenity',
-                positiveRegex: { amenity: ['^school$', '^healthcare$'] },
-                error: 'amenity cannot be healthcare or school!'
-            };
-
-            var areaDerivedArea = {
-                geometry: 'closedway',
-                equals: { area: 'yes' },
-            };
-
-            var badAreaDerivedLine = {
-                geometry: 'closedway',
-                equals: { 'area': 'no' }
-            };
-
-            var roundHouseRailwayDerivedArea = {
-                geometry: 'closedway',
-                equals: { 'railway': 'roundhouse' }
-            };
-
-            var justClosedWayDerivedLine = {
-                geometry: 'closedway'
-            };
-
-            var tagMap, geom;
-            tagMap = Rapid.serviceMapRules.buildTagMap(amenityDerivedArea);
-            geom = Rapid.serviceMapRules.inferGeometry(tagMap);
-            expect(geom).to.be.eql('area');
-
-            tagMap = Rapid.serviceMapRules.buildTagMap(areaDerivedArea);
-            geom = Rapid.serviceMapRules.inferGeometry(tagMap);
-            expect(geom).to.be.eql('area');
-
-            tagMap = Rapid.serviceMapRules.buildTagMap(badAreaDerivedLine);
-            geom = Rapid.serviceMapRules.inferGeometry(tagMap);
-            expect(geom).to.be.eql('line');
-
-            tagMap = Rapid.serviceMapRules.buildTagMap(roundHouseRailwayDerivedArea);
-            geom = Rapid.serviceMapRules.inferGeometry(tagMap);
-            expect(geom).to.be.eql('area');
-
-            tagMap = Rapid.serviceMapRules.buildTagMap(justClosedWayDerivedLine);
-            geom = Rapid.serviceMapRules.inferGeometry(tagMap);
-            expect(geom).to.be.eql('line');
-        });
-    });
-
-    describe('#addRule', function() {
-        it('builds a rule from provided selector and adds it to _validationRules', function () {
-            var selector = {
-                geometry:'node',
-                equals: {amenity:'marketplace'},
-                absence:'name',
-                warning:'\'Marketplace\' preset must be coupled with name'
-            };
-            expect(Rapid.serviceMapRules.validationRules()).to.be.empty;
-            Rapid.serviceMapRules.addRule(selector);
-            expect(Rapid.serviceMapRules.validationRules().length).to.eql(1);
-        });
-    });
-    describe('#clearRules', function() {
-        it('clears _validationRules array', function() {
-            expect(Rapid.serviceMapRules.validationRules().length).to.eql(1);
-            Rapid.serviceMapRules.clearRules();
-            expect(Rapid.serviceMapRules.validationRules()).to.be.empty;
-        });
-    });
-
-    describe('#validationRules', function() {
-        it('returns _validationRules array', function() {
-            var selector = {
-                geometry: 'closedway',
-                equals: {amenity: 'marketplace'},
-                absence: 'name',
-                error: '\'Marketplace\' preset must be coupled with name'
-            };
-            Rapid.serviceMapRules.addRule(selector);
-            var rules = Rapid.serviceMapRules.validationRules();
-            expect(rules).instanceof(Array);
-            expect(rules.length).to.eql(1);
-        });
-    });
-
-    describe('_ruleChecks', function () {
-        describe('#equals', function() {
-            it('is true when two tag maps intersect', function() {
-                var a = { amenity: 'school' };
-                var b = { amenity: 'school' };
-                expect(_ruleChecks.equals(a)(b)).to.be.true;
-            });
-            it('is false when two tag maps intersect', function() {
-                var a = { man_made: 'water_tap' };
-                var b = { amenity: 'school' };
-                expect(_ruleChecks.equals(a)(b)).to.be.false;
-            });
-        });
-        describe('#notEquals', function() {
-            it('is true when two tag maps do not intersect', function() {
-                var a = { man_made: 'water_tap' };
-                var b = { amenity: 'school' };
-                expect(_ruleChecks.notEquals(a)(b)).to.be.true;
-            });
-            it('is not true when two tag maps intersect', function() {
-                var a = { amenity: 'school' };
-                var b = { amenity: 'school', opening_hours: '9-5' };
-                expect(_ruleChecks.notEquals(a)(b)).to.be.false;
-            });
-        });
-        describe('absence', function() {
-            it('is true when tag map keys does not include key in question', function() {
-                var key = 'amenity';
-                var map = { building: 'yes' };
-                expect(_ruleChecks.absence(key)(map)).to.be.true;
-            });
-            it('is false when tag map keys does include key in question', function() {
-                var key = 'amenity';
-                var map = { amenity: 'school' };
-                expect(_ruleChecks.absence(key)(map)).to.be.false;
-            });
-        });
-        describe('presence', function() {
-            it('is true when tag map keys includes key in question', function() {
-                var key = 'amenity';
-                var map = { amenity: 'school'};
-                expect(_ruleChecks.presence(key)(map)).to.be.true;
-            });
-            it('is false when tag map keys do not include key in question', function() {
-                var key = 'amenity';
-                var map = { building: 'yes'};
-                expect(_ruleChecks.presence(key)(map)).to.be.false;
-            });
-        });
-        describe('greaterThan', function() {
-            it('is true when a tag value is greater than the selector value', function() {
-                var selectorTags = { lanes: 5 };
-                var tags = { lanes : 6 };
-                expect(_ruleChecks.greaterThan(selectorTags)(tags)).to.be.true;
-            });
-            it('is false when a tag value is less than or equal to the selector value', function() {
-                var selectorTags = { lanes: 5 };
-                [4, 5].forEach(function(val) {
-                    expect(_ruleChecks.greaterThan(selectorTags)({ lanes: val })).to.be.false;
-                });
-            });
-        });
-        describe('greaterThanEqual', function() {
-            it('is true when a tag value is greater than or equal to the selector value', function() {
-                var selectorTags = { lanes: 5 };
-                [5, 6].forEach(function(val) {
-                    expect(_ruleChecks.greaterThanEqual(selectorTags)({ lanes: val })).to.be.true;
-                });
-            });
-            it('is false when a tag value is less than the selector value', function () {
-                var selectorTags = { lanes: 5 };
-                var tags = { lanes: 4 };
-                expect(_ruleChecks.greaterThanEqual(selectorTags)(tags)).to.be.false;
-            });
-        });
-        describe('lessThan', function() {
-            it('is true when a tag value is less than the selector value', function() {
-                var selectorTags = { lanes: 5 };
-                var tags = { lanes: 4 };
-                expect(_ruleChecks.lessThan(selectorTags)(tags)).to.be.true;
-            });
-            it('is false when a tag value is greater than or equal to the selector value', function() {
-                var selectorTags = { lanes: 5 };
-                [6, 7].forEach(function(val) {
-					expect(_ruleChecks.lessThan(selectorTags)({ lanes: val })).to.be.false;
-				});
-            });
-        });
-        describe('lessThanEqual', function() {
-            it('is true when a tag value  is less than or equal to the selector value', function() {
-                var selectorTags = { lanes: 5 };
-                [4, 5].forEach(function(val) {
-                    expect(_ruleChecks.lessThanEqual(selectorTags)({ lanes: val })).to.be.true;
-                });
-            });
-            it('is false when a tag value is greater than the selector value', function() {
-               var selectorTags = { lanes: 5 };
-               var tags = { lanes: 6 };
-               expect(_ruleChecks.lessThanEqual(selectorTags)(tags)).to.be.false;
-            });
-        });
-        describe('positiveRegex', function() {
-            var positiveRegex = { amenity: ['^hospital$','^clinic$']};
-            it('is true when tag value matches positiveRegex', function() {
-                var tags = { amenity: 'hospital' };
-                expect(_ruleChecks.positiveRegex(positiveRegex)(tags)).to.be.true;
-            });
-            it('is false when tag value does not match negative regex', function() {
-                var tags = { amenity: 'school' };
-                expect(_ruleChecks.positiveRegex(positiveRegex)(tags)).to.be.false;
-            });
-        });
-        describe('negativeRegex', function() {
-            var negativeRegex = { bicycle: [ 'use_path', 'designated' ] };
-            it('is true when tag value does not match negativeRegex', function() {
-                var tags = { bicycle: 'yes' };
-                expect(_ruleChecks.negativeRegex(negativeRegex)(tags)).to.be.true;
-            });
-            it('is false when tag value matches negativeRegex', function() {
-                var tags = { bicycle: 'designated' };
-                expect(_ruleChecks.negativeRegex(negativeRegex)(tags)).to.be.false;
-            });
-        });
-    });
-    describe('rule', function() {
-        var selectors;
-        before(function() {
-            selectors = [
-                {
-                    geometry:'node',
-                    equals: {amenity:'marketplace'},
-                    absence:'name',
-                    error:'\'Marketplace\' preset must be coupled with name'
-                },
-                {
-                    geometry: 'closedway',
-                    notEquals: { building: 'yes', amenity: 'clinic' },
-                    error: '\'Clinic\' preset must be coupled with building=yes'
-                },
-                {
-                    geometry:'node',
-                    equals: {man_made: 'tower', 'tower:type': 'communication'},
-                    presence: 'height',
-                    error:'\'Communication Tower\' preset must not be coupled with height'
-                },
-                {
-                    geometry: 'node',
-                    equals: { man_made: 'tower' },
-                    lessThanEqual: { height: 6 },
-                    error: '\'Tower\' preset height must be greater than 6'
-                },
-                {
-                    geometry: 'node',
-                    equals: { man_made: 'tower' },
-                    greaterThanEqual: { height: 9 },
-                    error: '\'Tower\' preset height must be less than 9'
-                },
-                {
-                    geometry: 'node',
-                    equals: { man_made: 'tower' },
-                    lessThan: { height: 6 },
-                    error: '\'Tower\' preset height must be greater than or equal to 6'
-                },
-                {
-                    geometry: 'node',
-                    equals: { man_made: 'tower' },
-                    greaterThan: { height: 9 },
-                    error: '\'Tower\' preset height must be greater less than or equal to 9'
-                },
-                {
-                    geometry: 'closedway',
-                    equals: { amenity: 'clinic' },
-                    negativeRegex: { emergency: ['yes', 'no'] },
-                    error: '\'Clinic\' preset\'s emergency tag must be equal to \'yes\' or \'no\''
-                },
-                {
-                    geometry: 'way',
-                    equals: { highway: 'residential' },
-                    positiveRegex: { structure: ['bridge', 'tunnel'] },
-                    error: '\'suburban road\' structure tag cannot be \'bridge\' or \'tunnel\''
-                }
-            ];
-
-            Rapid.serviceMapRules.clearRules();
-            selectors.forEach(function(selector) { Rapid.serviceMapRules.addRule(selector); });
-            validationRules = Rapid.serviceMapRules.validationRules();
-        });
-        describe('#matches', function() {
-            var selectors, entities;
-            before(function() {
-                selectors = [
-                    {
-                        geometry:'node',
-                        equals: {amenity:'marketplace'},
-                        absence:'name',
-                        error:'\'Marketplace\' preset must be coupled with name'
-                    },
-                    {
-                        geometry: 'closedway',
-                        notEquals: { building: 'yes', amenity: 'clinic' },
-                        error: '\'Clinic\' preset must be coupled with building=yes'
-                    },
-                    {
-                        geometry:'node',
-                        equals: {man_made: 'tower', 'tower:type': 'communication'},
-                        presence: 'height',
-                        error:'\'Communication Tower\' preset must not be coupled with height'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        lessThanEqual: { height: 6 },
-                        error: '\'Tower\' preset height must be greater than 6'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        greaterThanEqual: { height: 9 },
-                        error: '\'Tower\' preset height must be less than 9'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        lessThan: { height: 6 },
-                        error: '\'Tower\' preset height must be greater than or equal to 6'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        greaterThan: { height: 9 },
-                        error: '\'Tower\' preset height must be greater less than or equal to 9'
-                    },
-                    {
-                        geometry: 'closedway',
-                        equals: { amenity: 'clinic' },
-                        negativeRegex: { emergency: ['yes', 'no'] },
-                        error: '\'Clinic\' preset\'s emergency tag must be equal to \'yes\' or \'no\''
-                    },
-                    {
-                        geometry: 'way',
-                        equals: { highway: 'residential' },
-                        positiveRegex: { structure: ['bridge', 'tunnel'] },
-                        error: '\'suburban road\' structure tag cannot be \'bridge\' or \'tunnel\''
-                    }
-                ];
-                entities = [
-                    Rapid.osmEntity({ type: 'node', tags: { amenity: 'marketplace' }}),
-                    Rapid.osmWay({ tags: { building: 'house', amenity: 'clinic' }, nodes: [ 'a', 'b', 'c', 'a' ]}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', 'tower:type': 'communication', height: 5 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 6 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 9 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 5 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 10 }}),
-                    Rapid.osmWay({ tags: { amenity: 'clinic', emergency: 'definitely' }, nodes: [ 'd', 'e', 'f', 'd' ]}),
-                    Rapid.osmWay({ tags: { highway: 'residential', structure: 'bridge' }}),
-                ];
-
-                Rapid.serviceMapRules.clearRules();
-                selectors.forEach(function(selector) { Rapid.serviceMapRules.addRule(selector); });
-                validationRules = Rapid.serviceMapRules.validationRules();
-            });
-            it('is true when each rule check is \'true\'', function() {
-                validationRules.forEach(function(rule, i) {
-                    expect(rule.matches(entities[i])).to.be.true;
-                });
-            });
-            it('is true when at least one rule check is \'false\'', function() {
-                var selector = {
-                    geometry: 'way',
-                    equals: { highway: 'residential' },
-                    positiveRegex: { structure: ['embarkment', 'bridge'] },
-                    error: '\'suburban road\' structure tag cannot be \'bridge\' or \'tunnel\''
-                };
-                var entity = Rapid.osmWay({ tags: { highway: 'residential', structure: 'tunnel' }});
-                Rapid.serviceMapRules.clearRules();
-                Rapid.serviceMapRules.addRule(selector);
-                var rule = Rapid.serviceMapRules.validationRules()[0];
-
-                expect(rule.matches(entity)).to.be.false;
-            });
-        });
-        describe('#findIssues', function() {
-            var selectors, entities, _graph;
-
-            before(function() {
-                selectors = [
-                    {
-                        geometry:'node',
-                        equals: {amenity:'marketplace'},
-                        absence:'name',
-                        error:'\'Marketplace\' preset must be coupled with name'
-                    },
-                    {
-                        geometry: 'closedway',
-                        notEquals: { building: 'yes', amenity: 'clinic' },
-                        error: '\'Clinic\' preset must be coupled with building=yes'
-                    },
-                    {
-                        geometry:'node',
-                        equals: {man_made: 'tower', 'tower:type': 'communication'},
-                        presence: 'height',
-                        error:'\'Communication Tower\' preset must not be coupled with height'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        lessThanEqual: { height: 6 },
-                        error: '\'Tower\' preset height must be greater than 6'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        greaterThanEqual: { height: 9 },
-                        error: '\'Tower\' preset height must be less than 9'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        lessThan: { height: 6 },
-                        error: '\'Tower\' preset height must be greater than or equal to 6'
-                    },
-                    {
-                        geometry: 'node',
-                        equals: { man_made: 'tower' },
-                        greaterThan: { height: 9 },
-                        error: '\'Tower\' preset height must be greater less than or equal to 9'
-                    },
-                    {
-                        geometry: 'closedway',
-                        equals: { amenity: 'clinic' },
-                        negativeRegex: { emergency: ['yes', 'no'] },
-                        error: '\'Clinic\' preset\'s emergency tag must be equal to \'yes\' or \'no\''
-                    },
-                    {
-                        geometry: 'way',
-                        equals: { highway: 'residential' },
-                        positiveRegex: { structure: ['bridge', 'tunnel'] },
-                        error: '\'suburban road\' structure tag cannot be \'bridge\' or \'tunnel\''
-                    }
-                ];
-                entities = [
-                    Rapid.osmEntity({ type: 'node', tags: { amenity: 'marketplace' }}),
-                    Rapid.osmWay({ tags: { building: 'house', amenity: 'clinic' }, nodes: [ 'a', 'b', 'c', 'a' ]}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', 'tower:type': 'communication', height: 5 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 6 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 9 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 5 }}),
-                    Rapid.osmEntity({ type: 'node', tags: { man_made: 'tower', height: 10 }}),
-                    Rapid.osmWay({ tags: { amenity: 'clinic', emergency: 'definitely' }, nodes: [ 'd', 'e', 'f', 'd' ]}),
-                    Rapid.osmWay({ tags: { highway: 'residential', structure: 'bridge' }}),
-                ];
-
-                var wayNodes = [
-                    Rapid.osmNode({ id: 'a' }),
-                    Rapid.osmNode({ id: 'b' }),
-                    Rapid.osmNode({ id: 'c' }),
-                    Rapid.osmNode({ id: 'd' }),
-                    Rapid.osmNode({ id: 'e' }),
-                    Rapid.osmNode({ id: 'f' }),
-                ];
-                _graph = new Rapid.Graph(entities.concat(wayNodes));
-                Rapid.serviceMapRules.clearRules();
-                selectors.forEach(function(selector) { Rapid.serviceMapRules.addRule(selector); });
-                validationRules = Rapid.serviceMapRules.validationRules();
-            });
-            it('finds issues', function() {
-                validationRules.forEach(function(rule, i) {
-                    var issues = [];
-                    var entity = entities[i];
-                    var selector = selectors[i];
-
-                    rule.findIssues(entity, _graph, issues);
-
-                    var issue = issues[0];
-                    var type = Object.keys(selector).indexOf('error') ? 'error' : 'warning';
-
-                    expect(issues.length).to.eql(1);
-                    expect(issue.entityIds).to.eql([entity.id]);
-                    expect(issue.message(context)).to.eql(selector[type]);
-                    expect(type).to.eql(issue.severity);
-                });
-            });
-        });
-    });
-});
diff --git a/test/spec/services/nominatim.js b/test/spec/services/nominatim.js
deleted file mode 100644
index fffc50ebaa..0000000000
--- a/test/spec/services/nominatim.js
+++ /dev/null
@@ -1,155 +0,0 @@
-describe('serviceNominatim', function() {
-    var nominatim;
-
-    before(function() {
-        Rapid.services.geocoder = Rapid.serviceNominatim;
-        fetchMock.reset();
-    });
-
-    after(function() {
-        delete Rapid.services.geocoder;
-    });
-
-    beforeEach(function() {
-        nominatim = Rapid.services.geocoder;
-        nominatim.reset();
-    });
-
-    afterEach(function() {
-        fetchMock.reset();
-    });
-
-    function parseQueryString(url) {
-        return sdk.utilStringQs(url.substring(url.indexOf('?')));
-    }
-
-    describe('#countryCode', function() {
-        it('calls the given callback with the results of the country code query', function(done) {
-            var callback = sinon.spy();
-            fetchMock.mock(new RegExp('https://nominatim.openstreetmap.org/reverse'), {
-                body: '{"address":{"country_code":"at"}}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            nominatim.countryCode([16, 48], callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {zoom: '13', format: 'json', addressdetails: '1', lat: '48', lon: '16'}
-                );
-                expect(callback).to.have.been.calledWithExactly(null, 'at');
-                done();
-            }, 50);
-        });
-    });
-
-    describe('#reverse', function() {
-        it('should not cache distant result', function(done) {
-            var callback = sinon.spy();
-            fetchMock.mock(new RegExp('https://nominatim.openstreetmap.org/reverse'), {
-                body: '{"address":{"country_code":"at"}}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            nominatim.reverse([16, 48], callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {zoom: '13', format: 'json', addressdetails: '1', lat: '48', lon: '16'}
-                );
-                expect(callback).to.have.been.calledWithExactly(null, {address: {country_code:'at'}});
-
-                fetchMock.reset();
-                fetchMock.mock(new RegExp('https://nominatim.openstreetmap.org/reverse'), {
-                    body: '{"address":{"country_code":"cz"}}',
-                    status: 200,
-                    headers: { 'Content-Type': 'application/json' }
-                });
-
-                callback = sinon.spy();
-                nominatim.reverse([17, 49], callback);
-
-                window.setTimeout(function() {
-                    expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                        {zoom: '13', format: 'json', addressdetails: '1', lat: '49', lon: '17'}
-                    );
-                    expect(fetchMock.calls()[0][1].headers).to.eql({'Accept-Language': 'en'});
-                    expect(callback).to.have.been.calledWithExactly(null, {address: {country_code:'cz'}});
-                    done();
-                }, 50);
-            }, 50);
-        });
-
-        it('should cache nearby result', function(done) {
-            var callback = sinon.spy();
-            fetchMock.mock(new RegExp('https://nominatim.openstreetmap.org/reverse'), {
-                body: '{"address":{"country_code":"at"}}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            nominatim.reverse([16, 48], callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {zoom: '13', format: 'json', addressdetails: '1', lat: '48', lon: '16'}
-                );
-                expect(callback).to.have.been.calledWithExactly(null, {address: {country_code:'at'}});
-
-                fetchMock.resetHistory();
-
-                callback = sinon.spy();
-                nominatim.reverse([16.000001, 48.000001], callback);
-
-                window.setTimeout(function() {
-                    expect(callback).to.have.been.calledWithExactly(null, {address: {country_code:'at'}});
-                    done();
-                }, 50);
-            }, 50);
-        });
-
-        it('calls the given callback with an error', function(done) {
-            var callback = sinon.spy();
-            fetchMock.mock(new RegExp('https://nominatim.openstreetmap.org/reverse'), {
-                body: '{"error":"Unable to geocode"}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            nominatim.reverse([1000, 1000], callback);
-
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {zoom: '13', format: 'json', addressdetails: '1', lat: '1000', lon: '1000'}
-                );
-                expect(callback).to.have.been.calledWithExactly('Unable to geocode');
-                done();
-            }, 50);
-        });
-    });
-
-
-    describe('#search', function() {
-        it('calls the given callback with the results of the search query', function(done) {
-            var callback = sinon.spy();
-            fetchMock.mock(new RegExp('https://nominatim.openstreetmap.org/search'), {
-                body: '[{"place_id":"158484588","osm_type":"relation","osm_id":"188022","boundingbox":["39.867005","40.1379593","-75.2802976","-74.9558313"],"lat":"39.9523993","lon":"-75.1635898","display_name":"Philadelphia, Philadelphia County, Pennsylvania, United States of America","class":"place","type":"city","importance":0.83238050437778}]',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            nominatim.search('philadelphia', callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql({format: 'json', limit: '10'});
-                expect(fetchMock.calls()[0][1].headers).to.eql({'Accept-Language': 'en'});
-                expect(callback).to.have.been.calledOnce;
-                done();
-            }, 50);
-        });
-    });
-
-});
diff --git a/test/spec/services/osm.js b/test/spec/services/osm.js
deleted file mode 100644
index b50b84ac83..0000000000
--- a/test/spec/services/osm.js
+++ /dev/null
@@ -1,834 +0,0 @@
-describe('serviceOsm', function () {
-    var context, connection, spy;
-    var serverXHR;
-
-    function login() {
-        connection.switch({
-            url: 'https://www.openstreetmap.org',
-            client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
-            client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE',
-            access_token: 'foo'  // preauth
-        });
-    }
-
-    function logout() {
-        connection.logout();
-    }
-
-    before(function() {
-        Rapid.services.osm = Rapid.serviceOsm;
-    });
-
-    after(function() {
-        delete Rapid.services.osm;
-    });
-
-    beforeEach(function () {
-        serverXHR = sinon.fakeServer.create();      // authenticated calls use XHR via osm-auth
-        context = Rapid.coreContext().assetPath('../dist/').init();
-        connection = context.connection();
-        connection.switch({ url: 'https://www.openstreetmap.org' });
-        connection.reset();
-        spy = sinon.spy();
-    });
-
-    afterEach(function() {
-        fetchMock.reset();
-        serverXHR.restore();
-    });
-
-
-    it('is instantiated', function () {
-        expect(connection).to.be.ok;
-    });
-
-
-    describe('#getConnectionId', function() {
-        it('changes the connection id every time connection is reset', function() {
-            var cid1 = connection.getConnectionId();
-            connection.reset();
-            var cid2 = connection.getConnectionId();
-            expect(cid2).to.be.above(cid1);
-        });
-
-        it('changes the connection id every time connection is switched', function () {
-            var cid1 = connection.getConnectionId();
-            connection.switch({ url: 'https://api06.dev.openstreetmap.org' });
-            var cid2 = connection.getConnectionId();
-            expect(cid2).to.be.above(cid1);
-        });
-    });
-
-    describe('#changesetURL', function() {
-        it('provides a changeset url', function() {
-            expect(connection.changesetURL(2)).to.eql('https://www.openstreetmap.org/changeset/2');
-        });
-
-        it('allows secure connections', function() {
-            connection.switch({ url: 'https://www.openstreetmap.org' });
-            expect(connection.changesetURL(2)).to.eql('https://www.openstreetmap.org/changeset/2');
-        });
-    });
-
-    describe('#changesetsURL', function() {
-        it('provides a local changesets url', function() {
-            var center = [-74.65, 40.65];
-            var zoom = 17;
-            expect(connection.changesetsURL(center, zoom)).to.eql('https://www.openstreetmap.org/history#map=17/40.65000/-74.65000');
-        });
-    });
-
-    describe('#entityURL', function() {
-        it('provides an entity url for a node', function() {
-            var e = Rapid.osmNode({id: 'n1'});
-            expect(connection.entityURL(e)).to.eql('https://www.openstreetmap.org/node/1');
-        });
-
-        it('provides an entity url for a way', function() {
-            var e = Rapid.osmWay({id: 'w1'});
-            expect(connection.entityURL(e)).to.eql('https://www.openstreetmap.org/way/1');
-        });
-
-        it('provides an entity url for a relation', function() {
-            var e = Rapid.osmRelation({id: 'r1'});
-            expect(connection.entityURL(e)).to.eql('https://www.openstreetmap.org/relation/1');
-        });
-    });
-
-    describe('#historyURL', function() {
-        it('provides a history url for a node', function() {
-            var e = Rapid.osmNode({id: 'n1'});
-            expect(connection.historyURL(e)).to.eql('https://www.openstreetmap.org/node/1/history');
-        });
-
-        it('provides a history url for a way', function() {
-            var e = Rapid.osmWay({id: 'w1'});
-            expect(connection.historyURL(e)).to.eql('https://www.openstreetmap.org/way/1/history');
-        });
-
-        it('provides a history url for a relation', function() {
-            var e = Rapid.osmRelation({id: 'r1'});
-            expect(connection.historyURL(e)).to.eql('https://www.openstreetmap.org/relation/1/history');
-        });
-    });
-
-    describe('#userURL', function() {
-        it('provides a user url', function() {
-            expect(connection.userURL('bob')).to.eql('https://www.openstreetmap.org/user/bob');
-        });
-    });
-
-    describe('#reset', function() {
-        it('resets the connection', function() {
-            expect(connection.reset()).to.eql(connection);
-        });
-    });
-
-    describe('#switch', function() {
-        it('changes the URL', function() {
-            connection.switch({ url: 'https://example.com' });
-            expect(connection.changesetURL(1)).to.equal('https://example.com/changeset/1');
-        });
-
-        it('emits a change event', function() {
-            connection.on('change', spy);
-            connection.switch({ url: 'https://example.com' });
-            expect(spy).to.have.been.calledOnce;
-        });
-    });
-
-    describe('#loadFromAPI', function () {
-        var path = '/api/0.6/map.json?bbox=-74.542,40.655,-74.541,40.656';
-        var response =
-            '{' +
-            '    "version":"0.6",' +
-            '    "bounds":{"minlat":40.6550000,"minlon":-74.5420000,"maxlat":40.6560000,"maxlon":-74.5410000},' +
-            '    "elements":[' +
-            '        {"type":"node","id":"105340439","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6555,"lon":-74.5415},' +
-            '        {"type":"node","id":"105340442","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6556,"lon":-74.5416},' +
-            '        {"type":"way","id":"40376199","visible":true,"version":1,"changeset":2403012,"timestamp":"2009-09-07T16:01:13Z","user":"NJDataUploads","uid":148169,"nodes":[105340439,105340442],"tags":{"highway":"residential","name":"Potomac Drive"}}' +
-            '    ]' +
-            '}';
-
-        it('returns an object', function(done) {
-            fetchMock.mock('https://www.openstreetmap.org' + path, {
-                body: response,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            connection.loadFromAPI(path, function (err, payload) {
-                expect(err).to.not.be.ok;
-                expect(typeof payload).to.eql('object');
-                done();
-            });
-        });
-
-        it('retries an authenticated call unauthenticated if 400 Bad Request', function (done) {
-            fetchMock.mock('https://www.openstreetmap.org' + path, {
-                body: response,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-            serverXHR.respondWith('GET', 'https://www.openstreetmap.org' + path,
-                [400, { 'Content-Type': 'text/plain' }, 'Bad Request']);
-
-            login();
-
-            connection.loadFromAPI(path, function (err, xml) {
-                expect(err).to.be.not.ok;
-                expect(typeof xml).to.eql('object');
-                expect(connection.authenticated()).to.be.not.ok;
-                expect(fetchMock.called()).to.be.true;
-
-                done();
-            });
-
-            serverXHR.respond();
-        });
-
-        it('retries an authenticated call unauthenticated if 401 Unauthorized', function (done) {
-            fetchMock.mock('https://www.openstreetmap.org' + path, {
-                body: response,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-            serverXHR.respondWith('GET', 'https://www.openstreetmap.org' + path,
-                [401, { 'Content-Type': 'text/plain' }, 'Unauthorized']);
-
-            login();
-            connection.loadFromAPI(path, function (err, xml) {
-                expect(err).to.be.not.ok;
-                expect(typeof xml).to.eql('object');
-                expect(connection.authenticated()).to.be.not.ok;
-                expect(fetchMock.called()).to.be.true;
-
-                done();
-            });
-
-            serverXHR.respond();
-        });
-
-        it('retries an authenticated call unauthenticated if 403 Forbidden', function (done) {
-            fetchMock.mock('https://www.openstreetmap.org' + path, {
-                body: response,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-            serverXHR.respondWith('GET', 'https://www.openstreetmap.org' + path,
-                [403, { 'Content-Type': 'text/plain' }, 'Forbidden']);
-
-            login();
-            connection.loadFromAPI(path, function (err, xml) {
-                expect(err).to.be.not.ok;
-                expect(typeof xml).to.eql('object');
-                expect(connection.authenticated()).to.be.not.ok;
-                expect(fetchMock.called()).to.be.true;
-
-                done();
-            });
-
-            serverXHR.respond();
-        });
-
-
-        it('dispatches change event if 509 Bandwidth Limit Exceeded', function (done) {
-            fetchMock.mock('https://www.openstreetmap.org' + path, {
-                body: 'Bandwidth Limit Exceeded',
-                status: 509,
-                headers: { 'Content-Type': 'text/plain' }
-            });
-
-            logout();
-            connection.on('change', spy);
-            connection.loadFromAPI(path, function (err) {
-                expect(err).to.have.property('status', 509);
-                expect(spy).to.have.been.calledOnce;
-                done();
-            });
-        });
-
-        it('dispatches change event if 429 Too Many Requests', function (done) {
-            fetchMock.mock('https://www.openstreetmap.org' + path, {
-                body: '429 Too Many Requests',
-                status: 429,
-                headers: { 'Content-Type': 'text/plain' }
-            });
-
-            logout();
-            connection.on('change', spy);
-            connection.loadFromAPI(path, function (err) {
-                expect(err).to.have.property('status', 429);
-                expect(spy).to.have.been.calledOnce;
-                done();
-            });
-        });
-    });
-
-
-    describe('#loadFromAPIWithErrors', function () {
-      var path = '/api/0.6/map.json?bbox=-74.542,40.655,-74.541,40.656';
-      var response =
-        '{' +
-        '    "version":"0.6",' +
-        '    "bounds":{"minlat":40.6550000,"minlon":-74.5420000,"maxlat":40.6560000,"maxlon":-74.5410000},' +
-        '    "elements":[' +
-        '        {"type":"node","id":"105340439","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6555,"lon":-74.5415},' +
-        '        {"type":"node","id":"105340442","visible":true,"version":2,"changeset":2880013,"timestamp":"2009-10-18T07:47:39Z","user":"woodpeck_fixbot","uid":147510,"lat":40.6556,"lon":-74.5416},' +
-        '        {"type":"error", "message":"something went wrong loading postgres"},' +
-        '        {"type":"way","id":"40376199","visible":true,"version":1,"changeset":2403012,"timestamp":"2009-09-07T16:01:13Z","user":"NJDataUploads","uid":148169,"nodes":[105340439,105340442],"tags":{"highway":"residential","name":"Potomac Drive"}}' +
-        '    ]' +
-        '}';
-
-      it('returns a partial JSON error', function (done) {
-        fetchMock.mock('https://www.openstreetmap.org' + path, {
-          body: response,
-          status: 200,
-          headers: { 'Content-Type': 'application/json' },
-        });
-
-        connection.loadFromAPI(path, function (err) {
-          expect(err.message).to.eql('Partial JSON');
-          done();
-        });
-      });
-    });
-
-    describe('#loadTiles', function() {
-        var tileResponse =
-            '{' +
-            '    "version":"0.6",' +
-            '    "bounds":{"minlat":40.6681396,"minlon":-74.0478516,"maxlat":40.6723060,"maxlon":-74.0423584},' +
-            '    "elements":[' +
-            '        {"type":"node","id":"368395606","visible":true,"version":3,"changeset":28924294,"timestamp":"2015-02-18T04:25:04Z","user":"peace2","uid":119748,"lat":40.6694299,"lon":-74.0444216,"tags":{"addr:state":"NJ","ele":"0","gnis:county_name":"Hudson","gnis:feature_id":"881377","gnis:feature_type":"Bay","name":"Upper Bay","natural":"bay"}}' +
-            '    ]' +
-            '}';
-
-        beforeEach(function() {
-            var dimensions = [64, 64];
-            context.projection
-                .scale(sdk.geoZoomToScale(20))
-                .translate([55212042.434589595, 33248879.510193843])  // -74.0444216, 40.6694299
-                .dimensions([[0,0], dimensions]);
-        });
-
-        it('calls callback when data tiles are loaded', function(done) {
-            fetchMock.mock(/map.json\?bbox/, {
-                body: tileResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var spy = sinon.spy();
-            connection.loadTiles(context.projection, spy);
-
-            window.setTimeout(function() {
-                // was: calledOnce, now called multiple times as we fetch margin tiles
-                expect(spy).to.have.been.called;
-                done();
-            }, 500);
-        });
-
-        it('#isDataLoaded', function(done) {
-            fetchMock.mock(/map.json\?bbox/, {
-                body: tileResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            // resetting the cache
-            const caches = connection.caches('get');
-            caches.tile.toLoad = {};
-            caches.tile.loaded = {};
-            caches.tile.inflight = {};
-            caches.tile.seen = {};
-            caches.tile.rtree.clear();
-
-            expect(connection.isDataLoaded([-74.0444216, 40.6694299])).to.be.false;
-
-            connection.loadTiles(context.projection);
-
-            window.setTimeout(function() {
-                expect(fetchMock.called()).to.be.true;
-                expect(connection.isDataLoaded([-74.0444216, 40.6694299])).to.be.true;
-                done();
-            }, 500);
-        });
-    });
-
-    describe('#loadEntity', function () {
-        var nodeResponse =
-            '{' +
-            '    "version":"0.6",' +
-            '    "elements":[' +
-            '        {"type":"node","id":1,"visible":true,"version":1,"changeset":28924294,"timestamp":"2009-03-07T03:26:33Z","user":"peace2","uid":119748,"lat":0,"lon":0}' +
-            '    ]' +
-            '}';
-
-        var wayResponse =
-            '{' +
-            '    "version":"0.6",' +
-            '    "elements":[' +
-            '        {"type":"node","id":1,"visible":true,"version":1,"changeset":2817006,"timestamp":"2009-10-11T18:03:23Z","user":"peace2","uid":119748,"lat":0,"lon":0},' +
-            '        {"type":"way","id":1,"visible":true,"version":1,"changeset":522559,"timestamp":"2008-01-03T05:24:43Z","user":"peace2","uid":119748,"nodes":[1]}' +
-            '    ]' +
-            '}';
-
-        it('loads a node', function(done) {
-            fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1.json', {
-                body: nodeResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var id = 'n1';
-            connection.loadEntity(id, function(err, result) {
-                var entity = result.data.find(function(e) { return e.id === id; });
-                expect(entity).to.be.an.instanceOf(Rapid.osmNode);
-                done();
-            });
-        });
-
-        it('loads a way', function(done) {
-            fetchMock.mock('https://www.openstreetmap.org/api/0.6/way/1/full.json', {
-                body: wayResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var id = 'w1';
-            connection.loadEntity(id, function(err, result) {
-                var entity = result.data.find(function(e) { return e.id === id; });
-                expect(entity).to.be.an.instanceOf(Rapid.osmWay);
-                done();
-            });
-        });
-
-        it('does not ignore repeat requests', function(done) {
-            fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1.json', {
-                body: wayResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var id = 'n1';
-            connection.loadEntity(id, function(err1, result1) {
-                var entity1 = result1.data.find(function(e1) { return e1.id === id; });
-                expect(entity1).to.be.an.instanceOf(Rapid.osmNode);
-
-                connection.loadEntity(id, function(err2, result2) {
-                    var entity2 = result2.data.find(function(e2) { return e2.id === id; });
-                    expect(entity2).to.be.an.instanceOf(Rapid.osmNode);
-                    done();
-                });
-            });
-        });
-    });
-
-
-    describe('#loadEntityVersion', function () {
-        var nodeResponse =
-            '{' +
-            '    "version":"0.6",' +
-            '    "elements":[' +
-            '        {"type":"node","id":1,"visible":true,"version":1,"changeset":28924294,"timestamp":"2009-03-07T03:26:33Z","user":"peace2","uid":119748,"lat":0,"lon":0}' +
-            '    ]' +
-            '}';
-        var wayResponse =
-            '{' +
-            '    "version":"0.6",' +
-            '    "elements":[' +
-            '        {"type":"node","id":1,"visible":true,"version":1,"changeset":2817006,"timestamp":"2009-10-11T18:03:23Z","user":"peace2","uid":119748,"lat":0,"lon":0},' +
-            '        {"type":"way","id":1,"visible":true,"version":1,"changeset":522559,"timestamp":"2008-01-03T05:24:43Z","user":"peace2","uid":119748,"nodes":[1]}' +
-            '    ]' +
-            '}';
-
-        it('loads a node', function(done) {
-            fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1/1.json', {
-                body: nodeResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var id = 'n1';
-            connection.loadEntityVersion(id, 1, function(err, result) {
-                var entity = result.data.find(function(e) { return e.id === id; });
-                expect(entity).to.be.an.instanceOf(Rapid.osmNode);
-                done();
-            });
-        });
-
-        it('loads a way', function(done) {
-            fetchMock.mock('https://www.openstreetmap.org/api/0.6/way/1/1.json', {
-                body: wayResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var id = 'w1';
-            connection.loadEntityVersion(id, 1, function(err, result) {
-                var entity = result.data.find(function(e) { return e.id === id; });
-                expect(entity).to.be.an.instanceOf(Rapid.osmWay);
-                done();
-            });
-        });
-
-        it('does not ignore repeat requests', function(done) {
-            fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1/1.json', {
-                body: nodeResponse,
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var id = 'n1';
-            connection.loadEntityVersion(id, 1, function(err1, result1) {
-                var entity1 = result1.data.find(function(e1) { return e1.id === id; });
-                expect(entity1).to.be.an.instanceOf(Rapid.osmNode);
-
-                connection.loadEntityVersion(id, 1, function(err2, result2) {
-                    var entity2 = result2.data.find(function(e2) { return e2.id === id; });
-                    expect(entity2).to.be.an.instanceOf(Rapid.osmNode);
-                    done();
-                });
-            });
-        });
-    });
-
-
-    describe('#loadMultiple', function () {
-        it('loads nodes');
-        it('loads ways');
-        it('does not ignore repeat requests');
-    });
-
-
-    describe('#userChangesets', function() {
-        var userDetailsFn;
-
-        beforeEach(function() {
-            userDetailsFn = connection.userDetails;
-            connection.userDetails = function (callback) {
-                callback(undefined, { id: 1, displayName: 'Steve' });
-            };
-        });
-
-        afterEach(function() {
-            connection.userDetails = userDetailsFn;
-        });
-
-
-        it('loads user changesets', function(done) {
-            var changesetsXML = '<?xml version="1.0" encoding="UTF-8"?>' +
-                '<osm>' +
-                '<changeset id="36777543" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">' +
-                '  <tag k="comment" v="Caprice Court has been extended"/>' +
-                '  <tag k="created_by" v="Rapid 2.0.0"/>' +
-                '</changeset>' +
-                '</osm>';
-
-            login();
-            connection.userChangesets(function(err, changesets) {
-                expect(changesets).to.deep.equal([{
-                    tags: {
-                        comment: 'Caprice Court has been extended',
-                        created_by: 'Rapid 2.0.0'
-                    }
-                }]);
-                connection.logout();
-                done();
-            });
-
-            serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
-                [200, { 'Content-Type': 'text/xml' }, changesetsXML]);
-            serverXHR.respond();
-        });
-
-        it('excludes changesets without comment tag', function(done) {
-            var changesetsXML = '<?xml version="1.0" encoding="UTF-8"?>' +
-                '<osm>' +
-                '<changeset id="36777543" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">' +
-                '  <tag k="comment" v="Caprice Court has been extended"/>' +
-                '  <tag k="created_by" v="Rapid 2.0.0"/>' +
-                '</changeset>' +
-                '<changeset id="36777544" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">' +
-                '  <tag k="created_by" v="Rapid 2.0.0"/>' +
-                '</changeset>' +
-                '</osm>';
-
-            login();
-            connection.userChangesets(function(err, changesets) {
-                expect(changesets).to.deep.equal([{
-                    tags: {
-                        comment: 'Caprice Court has been extended',
-                        created_by: 'Rapid 2.0.0'
-                    }
-                }]);
-                connection.logout();
-                done();
-            });
-
-            serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
-                [200, { 'Content-Type': 'text/xml' }, changesetsXML]);
-            serverXHR.respond();
-        });
-
-        it('excludes changesets with empty comment', function(done) {
-            var changesetsXML = '<?xml version="1.0" encoding="UTF-8"?>' +
-                '<osm>' +
-                '<changeset id="36777543" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">' +
-                '  <tag k="comment" v="Caprice Court has been extended"/>' +
-                '  <tag k="created_by" v="Rapid 2.0.0"/>' +
-                '</changeset>' +
-                '<changeset id="36777544" user="Steve" uid="1" created_at="2016-01-24T15:02:06Z" closed_at="2016-01-24T15:02:07Z" open="false" min_lat="39.3823819" min_lon="-104.8639728" max_lat="39.3834184" max_lon="-104.8618622" comments_count="0">' +
-                '  <tag k="comment" v=""/>' +
-                '  <tag k="created_by" v="Rapid 2.0.0"/>' +
-                '</changeset>' +
-                '</osm>';
-
-            login();
-            connection.userChangesets(function(err, changesets) {
-                expect(changesets).to.deep.equal([{
-                    tags: {
-                        comment: 'Caprice Court has been extended',
-                        created_by: 'Rapid 2.0.0'
-                    }
-                }]);
-                connection.logout();
-                done();
-            });
-
-            serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
-                [200, { 'Content-Type': 'text/xml' }, changesetsXML]);
-            serverXHR.respond();
-        });
-    });
-
-    describe('#caches', function() {
-        it('loads reset caches', function () {
-            var caches = connection.caches();
-            expect(caches.tile).to.have.all.keys(['toLoad','loaded','inflight','seen','rtree']);
-            expect(caches.note).to.have.all.keys(['toLoad','loaded','inflight','inflightPost','note','closed','rtree']);
-            expect(caches.user).to.have.all.keys(['toLoad','user']);
-        });
-
-        describe('sets/gets caches', function() {
-            it('sets/gets a tile', function () {
-                var obj = {
-                    tile: { loaded: { '1,2,16': true, '3,4,16': true } }
-                };
-                connection.caches(obj);
-                expect(connection.caches().tile.loaded['1,2,16']).to.eql(true);
-                expect(Object.keys(connection.caches().tile.loaded).length).to.eql(2);
-            });
-
-            it('sets/gets a note', function () {
-                var note = Rapid.osmNote({ id: 1, loc: [0, 0] });
-                var note2 = Rapid.osmNote({ id: 2, loc: [0, 0] });
-                var obj = {
-                    note: { note: { 1: note, 2: note2 } }
-                };
-                connection.caches(obj);
-                expect(connection.caches().note.note[note.id]).to.eql(note);
-                expect(Object.keys(connection.caches().note.note).length).to.eql(2);
-            });
-
-            it('sets/gets a user', function () {
-                var user = { id: 1, display_name: 'Name' };
-                var user2 = { id: 2, display_name: 'Name' };
-                var obj = {
-                    user: { user: { 1: user, 2: user2 } }
-                };
-                connection.caches(obj);
-                expect(connection.caches().user.user[user.id]).to.eql(user);
-                expect(Object.keys(connection.caches().user.user).length).to.eql(2);
-            });
-        });
-
-    });
-
-    describe('#loadNotes', function() {
-        var notesXML = '<?xml version="1.0" encoding="UTF-8"?>' +
-            '<osm>' +
-            '<note lon="10" lat="0">' +
-            '  <id>1</id>' +
-            '  <url>https://www.openstreetmap.org/api/0.6/notes/1</url>' +
-            '  <comment_url>https://www.openstreetmap.org/api/0.6/notes/1/comment</comment_url>' +
-            '  <close_url>https://www.openstreetmap.org/api/0.6/notes/1/close</close_url>' +
-            '  <date_created>2019-01-01 00:00:00 UTC</date_created>' +
-            '  <status>open</status>' +
-            '  <comments>' +
-            '    <comment>' +
-            '      <date>2019-01-01 00:00:00 UTC</date>' +
-            '      <uid>1</uid>' +
-            '      <user>Steve</user>' +
-            '      <user_url>https://www.openstreetmap.org/user/Steve</user_url>' +
-            '      <action>opened</action>' +
-            '      <text>This is a note</text>' +
-            '      <html>&lt;p&gt;This is a note&lt;/p&gt;</html>' +
-            '    </comment>' +
-            '  </comments>' +
-            '</note>' +
-            '</osm>';
-
-        beforeEach(function() {
-            var dimensions = [64, 64];
-            context.projection
-                .scale(sdk.geoZoomToScale(14))
-                .translate([-116508, 0])  // 10,0
-                .dimensions([[0,0], dimensions]);
-        });
-
-        it('fires loadedNotes when notes are loaded', function(done) {
-            fetchMock.mock(/notes\?/, {
-                body: notesXML,
-                status: 200,
-                headers: { 'Content-Type': 'text/xml' }
-            });
-
-            connection.on('loadedNotes', spy);
-            connection.loadNotes(context.projection, {});
-
-            window.setTimeout(function() {
-                // was: calledOnce, now called multiple times as we fetch margin tiles
-                expect(spy).to.have.been.called;
-                done();
-            }, 500);
-        });
-    });
-
-
-    describe('#notes', function() {
-        beforeEach(function() {
-            var dimensions = [64, 64];
-            context.projection
-                .scale(sdk.geoZoomToScale(14))
-                .translate([-116508, 0])  // 10,0
-                .dimensions([[0,0], dimensions]);
-        });
-
-        it('returns notes in the visible map area', function() {
-            var notes = [
-                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0] } },
-                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0] } },
-                { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1] } }
-            ];
-
-            connection.caches('get').note.rtree.load(notes);
-            var res = connection.notes(context.projection);
-
-            expect(res).to.deep.eql([
-                { key: '0', loc: [10,0] },
-                { key: '1', loc: [10,0] }
-            ]);
-        });
-    });
-
-
-    describe('#getNote', function() {
-        it('returns a note', function () {
-            var note = Rapid.osmNote({ id: 1, loc: [0, 0], });
-            var obj = {
-                note: { note: { 1: note } }
-            };
-            connection.caches(obj);
-            var result = connection.getNote(1);
-            expect(result).to.deep.equal(note);
-        });
-    });
-
-    describe('#removeNote', function() {
-        it('removes a note that is new', function() {
-            var note = Rapid.osmNote({ id: -1, loc: [0, 0], });
-            connection.replaceNote(note);
-            connection.removeNote(note);
-            var result = connection.getNote(-1);
-            expect(result).to.eql(undefined);
-        });
-    });
-
-
-    describe('#replaceNote', function() {
-        it('returns a new note', function () {
-            var note = Rapid.osmNote({ id: 2, loc: [0, 0], });
-            var result = connection.replaceNote(note);
-            expect(result.id).to.eql(2);
-            expect(connection.caches().note.note[2]).to.eql(note);
-            var rtree = connection.caches().note.rtree;
-            var result_rtree = rtree.search({ 'minX': -1, 'minY': -1, 'maxX': 1, 'maxY': 1 });
-            expect(result_rtree.length).to.eql(1);
-            expect(result_rtree[0].data).to.eql(note);
-        });
-
-        it('replaces a note', function () {
-            var note = Rapid.osmNote({ id: 2, loc: [0, 0], });
-            connection.replaceNote(note);
-            note.status = 'closed';
-            var result = connection.replaceNote(note);
-            expect(result.status).to.eql('closed');
-
-            var rtree = connection.caches().note.rtree;
-            var result_rtree = rtree.search({ 'minX': -1, 'minY': -1, 'maxX': 1, 'maxY': 1 });
-            expect(result_rtree.length).to.eql(1);
-            expect(result_rtree[0].data.status).to.eql('closed');
-        });
-    });
-
-
-    describe('API capabilities', function() {
-        var capabilitiesXML = `<?xml version="1.0" encoding="UTF-8"?>
-        <osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
-            <api>
-                <version minimum="0.6" maximum="0.6"/>
-                <area maximum="0.25"/>
-                <note_area maximum="25"/>
-                <tracepoints per_page="5000"/>
-                <waynodes maximum="2000"/>
-                <changesets maximum_elements="50000"/>
-                <timeout seconds="300"/>
-                <status database="online" api="online" gpx="online"/>
-            </api>
-            <policy>
-                <imagery>
-                    <blacklist regex="\.foo\.com"/>
-                    <blacklist regex="\.bar\.org"/>
-                </imagery>
-            </policy>
-        </osm>`;
-
-        describe('#status', function() {
-            it('gets API status', function(done) {
-                fetchMock.mock('https://www.openstreetmap.org/api/capabilities', {
-                    body: capabilitiesXML,
-                    status: 200,
-                    headers: { 'Content-Type': 'text/xml' }
-                }, {
-                    overwriteRoutes: true
-                });
-
-                connection.status(function (err, val) {
-                    expect(val).to.eql('online');
-                    done();
-                });
-            });
-        });
-
-        describe('#imageryBlocklists', function() {
-            it('updates imagery blocklists', function(done) {
-                fetchMock.mock('https://www.openstreetmap.org/api/capabilities', {
-                    body: capabilitiesXML,
-                    status: 200,
-                    headers: { 'Content-Type': 'text/xml' }
-                }, {
-                    overwriteRoutes: true
-                });
-
-                connection.status(function() {
-                    var blocklists = connection.imageryBlocklists();
-                    expect(blocklists).to.deep.equal([new RegExp('\.foo\.com'), new RegExp('\.bar\.org')]);
-                    done();
-                });
-            });
-        });
-
-    });
-});
diff --git a/test/spec/services/taginfo.js b/test/spec/services/taginfo.js
deleted file mode 100644
index c90e89867c..0000000000
--- a/test/spec/services/taginfo.js
+++ /dev/null
@@ -1,405 +0,0 @@
-describe('serviceTaginfo', function() {
-    var taginfo;
-
-
-    before(function() {
-        Rapid.services.taginfo = Rapid.serviceTaginfo;
-    });
-
-    after(function() {
-        delete Rapid.services.taginfo;
-    });
-
-    beforeEach(function() {
-        taginfo = Rapid.services.taginfo;
-
-        fetchMock.mock(new RegExp('\/keys\/all.*sortname=values_all'), {
-            body: '{"data":[{"count_all":56136034,"key":"name","count_all_fraction":0.0132}]}',
-            status: 200,
-            headers: { 'Content-Type': 'application/json' }
-        });
-
-        // prepopulate popular keys list with "name"
-        taginfo.init();
-        fetchMock.reset();
-    });
-
-    afterEach(function() {
-        fetchMock.reset();
-    });
-
-    function parseQueryString(url) {
-        return sdk.utilStringQs(url.substring(url.indexOf('?')));
-    }
-
-    describe('#keys', function() {
-        it('calls the given callback with the results of the keys query', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"count_all":5190337,"key":"amenity","count_all_fraction":1.0}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.keys({ query: 'amen' }, callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {query: 'amen', page: '1', rp: '10', sortname: 'count_all', sortorder: 'desc', lang: 'en'}
-                );
-                expect(callback).to.have.been.calledWith(
-                    null, [{'title':'amenity', 'value':'amenity'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('includes popular keys', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"count_all":5190337,"count_nodes":500000,"key":"amenity","count_all_fraction":1.0, "count_nodes_fraction":1.0},'
-                    + '{"count_all":1,"key":"amenityother","count_all_fraction":0.0, "count_nodes":100}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.keys({ query: 'amen' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'title':'amenity', 'value':'amenity'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('includes popular keys with an entity type filter', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"count_all":5190337,"count_nodes":500000,"key":"amenity","count_all_fraction":1.0, "count_nodes_fraction":1.0},'
-                    + '{"count_all":1,"key":"amenityother","count_all_fraction":0.0, "count_nodes":100}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.keys({ query: 'amen', filter: 'nodes' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'title':'amenity', 'value':'amenity'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('includes unpopular keys with a wiki page', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"count_all":5190337,"key":"amenity","count_all_fraction":1.0, "count_nodes_fraction":1.0},'
-                    + '{"count_all":1,"key":"amenityother","count_all_fraction":0.0, "count_nodes_fraction":0.0, "in_wiki": true}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.keys({ query: 'amen' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(null, [
-                    {'title':'amenity', 'value':'amenity'},
-                    {'title':'amenityother', 'value':'amenityother'}
-                ]);
-                done();
-            }, 50);
-        });
-
-        it('sorts keys with \':\' below keys without \':\'', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"key":"ref:bag","count_all":9790586,"count_all_fraction":0.0028},' +
-                    '{"key":"ref","count_all":7933528,"count_all_fraction":0.0023}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.keys({ query: 'ref' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'title':'ref', 'value':'ref'},{'title':'ref:bag', 'value':'ref:bag'}]
-                );
-                done();
-            }, 50);
-        });
-    });
-
-    describe('#multikeys', function() {
-        it('calls the given callback with the results of the multikeys query', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"count_all":69593,"key":"recycling:glass","count_all_fraction":0.0}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.multikeys({ query: 'recycling:' }, callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {query: 'recycling:', page: '1', rp: '25', sortname: 'count_all', sortorder: 'desc', lang: 'en'}
-                );
-                expect(callback).to.have.been.calledWith(
-                    null, [{'title':'recycling:glass', 'value':'recycling:glass'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('excludes multikeys with extra colons', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"count_all":4426,"key":"service:bicycle:retail","count_all_fraction":0.0},' +
-                    '{"count_all":22,"key":"service:bicycle:retail:ebikes","count_all_fraction":0.0}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.multikeys({ query: 'service:bicycle:' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'title':'service:bicycle:retail', 'value':'service:bicycle:retail'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('excludes multikeys with wrong prefix', function(done) {
-            fetchMock.mock(/\/keys\/all/, {
-                body: '{"data":[{"count_all":4426,"key":"service:bicycle:retail","count_all_fraction":0.0},' +
-                    '{"count_all":22,"key":"disused:service:bicycle","count_all_fraction":0.0}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.multikeys({ query: 'service:bicycle:' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'title':'service:bicycle:retail', 'value':'service:bicycle:retail'}]
-                );
-                done();
-            }, 50);
-        });
-    });
-
-    describe('#values', function() {
-        it('calls the given callback with the results of the values query', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"parking","description":"A place for parking cars", "fraction":0.1}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'amenity', query: 'par' }, callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {key: 'amenity', query: 'par', page: '1', rp: '25', sortname: 'count_all', sortorder: 'desc', lang: 'en'}
-                );
-                expect(callback).to.have.been.calledWith(
-                    null, [{'value':'parking','title':'A place for parking cars'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('includes popular values', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"parking","description":"A place for parking cars", "fraction":1.0},' +
-                    '{"value":"party","description":"A place for partying", "fraction":0.0}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'amenity', query: 'par' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'value':'parking','title':'A place for parking cars'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('does not get values for extremely unpopular keys', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"Rue Pasteur","description":"", "fraction":0.0001},' +
-                    '{"value":"Via Trieste","description":"", "fraction":0.0001}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'name', query: 'ste' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(null, []);
-                done();
-            }, 50);
-        });
-
-        it('excludes values with capital letters and some punctuation', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"parking","description":"A place for parking cars", "fraction":0.2},'
-                    + '{"value":"PArking","description":"A common misspelling", "fraction":0.2},'
-                    + '{"value":"parking;partying","description":"A place for parking cars *and* partying", "fraction":0.2},'
-                    + '{"value":"parking, partying","description":"A place for parking cars *and* partying", "fraction":0.2},'
-                    + '{"value":"*","description":"", "fraction":0.2}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'amenity', query: 'par' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'value':'parking','title':'A place for parking cars'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('includes network values with capital letters and some punctuation', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"US:TX:FM","description":"Farm to Market Roads in the U.S. state of Texas.", "fraction":0.34},'
-                    + '{"value":"US:KY","description":"Primary and secondary state highways in the U.S. state of Kentucky.", "fraction":0.31},'
-                    + '{"value":"US:US","description":"U.S. routes in the United States.", "fraction":0.19},'
-                    + '{"value":"US:I","description":"Interstate highways in the United States.", "fraction":0.11},'
-                    + '{"value":"US:MD","description":"State highways in the U.S. state of Maryland.", "fraction":0.06}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'network', query: 'us' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(null, [
-                    {'value':'US:TX:FM','title':'Farm to Market Roads in the U.S. state of Texas.'},
-                    {'value':'US:KY','title':'Primary and secondary state highways in the U.S. state of Kentucky.'},
-                    {'value':'US:US','title':'U.S. routes in the United States.'},
-                    {'value':'US:I','title':'Interstate highways in the United States.'},
-                    {'value':'US:MD','title':'State highways in the U.S. state of Maryland.'}
-                ]);
-                done();
-            }, 50);
-        });
-
-        it('includes biological genus values with capital letters', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"Quercus","description":"Oak", "fraction":0.5}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'genus', query: 'qu' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'value':'Quercus','title':'Oak'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('includes biological taxon values with capital letters', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"Quercus robur","description":"Oak", "fraction":0.5}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'taxon', query: 'qu' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'value':'Quercus robur','title':'Oak'}]
-                );
-                done();
-            }, 50);
-        });
-
-        it('includes biological species values with capital letters', function(done) {
-            fetchMock.mock(/\/key\/values/, {
-                body: '{"data":[{"value":"Quercus robur","description":"Oak", "fraction":0.5}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.values({ key: 'species', query: 'qu' }, callback);
-
-            window.setTimeout(function() {
-                expect(callback).to.have.been.calledWith(
-                    null, [{'value':'Quercus robur','title':'Oak'}]
-                );
-                done();
-            }, 50);
-        });
-    });
-
-    describe('#roles', function() {
-        it('calls the given callback with the results of the roles query', function(done) {
-            fetchMock.mock(/\/relation\/roles/, {
-                body: '{"data":[{"role":"stop","count_relation_members_fraction":0.1757},' +
-                    '{"role":"south","count_relation_members_fraction":0.0035}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.roles({ rtype: 'route', query: 's', geometry: 'relation' }, callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {rtype: 'route', query: 's', page: '1', rp: '25', sortname: 'count_relation_members', sortorder: 'desc', lang: 'en'}
-                );
-                expect(callback).to.have.been.calledWith(null, [
-                    {'value': 'stop', 'title': 'stop'},
-                    {'value': 'south', 'title': 'south'}
-                ]);
-                done();
-            }, 50);
-        });
-    });
-
-    describe('#docs', function() {
-        it('calls the given callback with the results of the docs query', function(done) {
-            fetchMock.mock(/\/tag\/wiki_page/, {
-                body: '{"data":[{"on_way":false,"lang":"en","on_area":true,"image":"File:Car park2.jpg"}]}',
-                status: 200,
-                headers: { 'Content-Type': 'application/json' }
-            });
-
-            var callback = sinon.spy();
-            taginfo.docs({ key: 'amenity', value: 'parking' }, callback);
-
-            window.setTimeout(function() {
-                expect(parseQueryString(fetchMock.calls()[0][0])).to.eql(
-                    {key: 'amenity', value: 'parking'}
-                );
-                expect(callback).to.have.been.calledWith(
-                    null, [{'on_way':false,'lang':'en','on_area':true,'image':'File:Car park2.jpg'}]
-                );
-                done();
-            }, 50);
-        });
-    });
-
-});
diff --git a/test/spec/spec_helpers.js b/test/spec/spec_helpers.js
index ba641e94e6..e572420317 100644
--- a/test/spec/spec_helpers.js
+++ b/test/spec/spec_helpers.js
@@ -1,109 +1,20 @@
 /* globals chai:false */
 /* eslint no-extend-native:off */
 
-// Disable things that use the network
-for (var k in Rapid.services) { delete Rapid.services[k]; }
-
 // Try not to load imagery
 window.location.hash = '#background=none';
 
-// Run without data for speed (tests which need data can set it up themselves)
-Rapid.fileFetcher.assetPath('../dist/');
-var cached = Rapid.fileFetcher.cache();
-
-// Initializing `coreContext` will try loading the locale data and English locale strings:
-cached.locales = { en: { rtl: false, pct: 1 } };
-cached.locales_index_general = { en: { rtl: false, pct: 1 } };
-cached.locales_index_tagging = { en: { rtl: false, pct: 1 } };
-
-// Use fake data for the 'tagging' scope
-cached.locale_tagging_en = {
-  en: {
-    presets: {
-      fields: {
-        restrictions: {
-          label: 'Turn Restrictions'
-        },
-        access: {
-          label: 'Allowed Access',
-          placeholder: 'Not Specified',
-          types: {
-            access: 'All',
-            foot: 'Foot',
-            motor_vehicle: 'Motor Vehicles',
-            bicycle: 'Bicycles',
-            horse: 'Horses'
-          },
-          options: {
-            yes: {
-              title: 'Allowed',
-              description: 'Access allowed by law; a right of way'
-            },
-            no: {
-              title: 'Prohibited',
-              description: 'Access not allowed to the general public'
-            },
-            permissive: {
-              title: 'Permissive',
-              description: 'Access allowed until such time as the owner revokes the permission'
-            },
-            private: {
-              title: 'Private',
-              description: 'Access allowed only with permission of the owner on an individual basis'
-            },
-            designated: {
-              title: 'Designated',
-              description: 'Access allowed according to signs or specific local laws'
-            },
-            destination: {
-              title: 'Destination',
-              description: 'Access allowed only to reach a destination'
-            },
-            dismount: {
-              title: 'Dismount',
-              description: 'Access allowed but rider must dismount'
-            },
-            permit: {
-              title: 'Permit',
-              description: 'Access allowed only with a valid permit or license'
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-// Load the actual data from `dist/locales/` for the 'general' scope
-Rapid.localizer.loadLocale('en', 'general', 'locales');
-// Load the fake data seeded above for the 'tagging' scope
-Rapid.localizer.loadLocale('en', 'tagging');
-
-
-// Initializing `coreContext` initializes `_background`, which tries loading:
-cached.imagery = [];
-// Initializing `coreContext` initializes `_presets`, which tries loading:
-cached.preset_categories = {};
-cached.preset_defaults = {};
-cached.preset_fields = {};
-cached.preset_presets = {};
-// Initializing `coreContext` initializes `_validator`, which tries loading:
-cached.deprecated = [];
-// Initializing `coreContext` initializes `_uploader`, which tries loading:
-cached.discarded = {};
-
-
 mocha.setup({
-    timeout: 5000,  // 5 sec
-    ui: 'bdd',
-    globals: [
-        '__onmousemove.zoom',
-        '__onmouseup.zoom',
-        '__onkeydown.select',
-        '__onkeyup.select',
-        '__onclick.draw',
-        '__onclick.draw-block'
-    ]
+  timeout: 5000,  // 5 sec
+  ui: 'bdd',
+  globals: [
+    '__onmousemove.zoom',
+    '__onmouseup.zoom',
+    '__onkeydown.select',
+    '__onkeyup.select',
+    '__onclick.draw',
+    '__onclick.draw-block'
+  ]
 });
 
 expect = chai.expect;
@@ -112,30 +23,5 @@ window.d3 = Rapid.d3;   // Remove this if we can avoid exporting all of d3.js
 window.sdk = Rapid.sdk;
 delete window.PointerEvent;  // force the brower to use mouse events
 
-// some sticky fallbacks
-const capabilities = `<?xml version="1.0" encoding="UTF-8"?>
-<osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
-  <api>
-    <version minimum="0.6" maximum="0.6"/>
-    <area maximum="0.25"/>
-    <note_area maximum="25"/>
-    <tracepoints per_page="5000"/>
-    <waynodes maximum="2000"/>
-    <changesets maximum_elements="10000"/>
-    <timeout seconds="300"/>
-    <status database="online" api="online" gpx="online"/>
-  </api>
-  <policy>
-    <imagery>
-      <blacklist regex=".*\.google(apis)?\..*/(vt|kh)[\?/].*([xyz]=.*){3}.*"/>
-      <blacklist regex="http://xdworld\.vworld\.kr:8080/.*"/>
-      <blacklist regex=".*\.here\.com[/:].*"/>
-    </imagery>
-  </policy>
-</osm>`;
-
-fetchMock.sticky('https://www.openstreetmap.org/api/capabilities', capabilities, {sticky: true});
-fetchMock.sticky('http://www.openstreetmap.org/api/capabilities', capabilities, {sticky: true});
-
-fetchMock.config.fallbackToNetwork = true;
+fetchMock.config.fallbackToNetwork = false;
 fetchMock.config.overwriteRoutes = false;
diff --git a/test/spec/ui/cmd.js b/test/spec/ui/cmd.js
index 5f97792d2c..c9dfbb5100 100644
--- a/test/spec/ui/cmd.js
+++ b/test/spec/ui/cmd.js
@@ -1,62 +1,66 @@
-describe('uiCmd', function () {
-    var orig;
-    var ua = navigator.userAgent;
-    var isPhantom = (navigator.userAgent.match(/PhantomJS/) !== null);
-    var uaMock = function () { return ua; };
-
-    beforeEach(function() {
-        /* eslint-disable no-global-assign */
-        /* mock userAgent */
-        if (isPhantom) {
-            orig = navigator;
-            navigator = Object.create(orig, { userAgent: { get: uaMock }});
-        } else {
-            orig = navigator.__lookupGetter__('userAgent');
-            navigator.__defineGetter__('userAgent', uaMock);
-        }
-    });
-
-    afterEach(function() {
-        /* restore userAgent */
-        if (isPhantom) {
-            navigator = orig;
-        } else {
-            navigator.__defineGetter__('userAgent', orig);
-        }
-        /* eslint-enable no-global-assign */
-    });
-
-    it('does not overwrite mac keybindings', function () {
-        ua = 'Mac';
-        Rapid.utilDetect(true);  // force redetection
-        expect(Rapid.uiCmd('⌘A')).to.eql('⌘A');
-    });
-
-    it('changes keys to linux versions', function () {
-        ua = 'Linux';
-        Rapid.utilDetect(true);  // force redetection
-        expect(Rapid.uiCmd('⌘⌫')).to.eql('Ctrl+Backspace');
-        expect(Rapid.uiCmd('⌘A')).to.eql('Ctrl+A');
-        expect(Rapid.uiCmd('⇧A')).to.eql('Shift+A');
-        expect(Rapid.uiCmd('⌘⇧A')).to.eql('Ctrl+Shift+A');
-        expect(Rapid.uiCmd('⌘⇧Z')).to.eql('Ctrl+Shift+Z');
-    });
-
-    it('changes keys to win versions', function () {
-        ua = 'Win';
-        Rapid.utilDetect(true);  // force redetection
-        expect(Rapid.uiCmd('⌘⌫')).to.eql('Ctrl+Backspace');
-        expect(Rapid.uiCmd('⌘A')).to.eql('Ctrl+A');
-        expect(Rapid.uiCmd('⇧A')).to.eql('Shift+A');
-        expect(Rapid.uiCmd('⌘⇧A')).to.eql('Ctrl+Shift+A');
-        expect(Rapid.uiCmd('⌘⇧Z')).to.eql('Ctrl+Y');  // special case
-    });
-
-    it('handles multi-character keys', function () {
-        ua = 'Win';
-        Rapid.utilDetect(true);  // force redetection
-        expect(Rapid.uiCmd('f11')).to.eql('f11');
-        expect(Rapid.uiCmd('⌘plus')).to.eql('Ctrl+plus');
-    });
+describe('uiCmd', () => {
+  let _orig;
+  let _userAgent = navigator.userAgent;
+  const isPhantom = (navigator.userAgent.match(/PhantomJS/) !== null);
+  const uaMock = () => _userAgent;
+
+  beforeEach(() => {
+    /* eslint-disable no-global-assign */
+    /* mock userAgent */
+    if (isPhantom) {
+      _orig = navigator;
+      navigator = Object.create(_orig, { userAgent: { get: uaMock }});
+    } else {
+      _orig = navigator.__lookupGetter__('userAgent');
+      navigator.__defineGetter__('userAgent', uaMock);
+    }
+  });
+
+  afterEach(() => {
+    /* restore userAgent */
+    if (isPhantom) {
+      navigator = _orig;
+    } else {
+      navigator.__defineGetter__('userAgent', _orig);
+    }
+    /* eslint-enable no-global-assign */
+  });
+
+
+  it('does not overwrite mac keybindings', () => {
+    _userAgent = 'Mac';
+    Rapid.utilDetect(true);  // force redetection
+    expect(Rapid.uiCmd('⌘A')).to.eql('⌘A');
+  });
+
+
+  it('changes keys to linux versions', () => {
+    _userAgent = 'Linux';
+    Rapid.utilDetect(true);  // force redetection
+    expect(Rapid.uiCmd('⌘⌫')).to.eql('Ctrl+Backspace');
+    expect(Rapid.uiCmd('⌘A')).to.eql('Ctrl+A');
+    expect(Rapid.uiCmd('⇧A')).to.eql('Shift+A');
+    expect(Rapid.uiCmd('⌘⇧A')).to.eql('Ctrl+Shift+A');
+    expect(Rapid.uiCmd('⌘⇧Z')).to.eql('Ctrl+Shift+Z');
+  });
+
+
+  it('changes keys to win versions', () => {
+    _userAgent = 'Win';
+    Rapid.utilDetect(true);  // force redetection
+    expect(Rapid.uiCmd('⌘⌫')).to.eql('Ctrl+Backspace');
+    expect(Rapid.uiCmd('⌘A')).to.eql('Ctrl+A');
+    expect(Rapid.uiCmd('⇧A')).to.eql('Shift+A');
+    expect(Rapid.uiCmd('⌘⇧A')).to.eql('Ctrl+Shift+A');
+    expect(Rapid.uiCmd('⌘⇧Z')).to.eql('Ctrl+Y');  // special case
+  });
+
+
+  it('handles multi-character keys', () => {
+    _userAgent = 'Win';
+    Rapid.utilDetect(true);  // force redetection
+    expect(Rapid.uiCmd('f11')).to.eql('f11');
+    expect(Rapid.uiCmd('⌘plus')).to.eql('Ctrl+plus');
+  });
 
 });
diff --git a/test/spec/ui/combobox.js b/test/spec/ui/combobox.js
index c3ba9f0aaa..8d8c705eba 100644
--- a/test/spec/ui/combobox.js
+++ b/test/spec/ui/combobox.js
@@ -1,275 +1,283 @@
-describe('uiCombobox', function() {
-    var body, context, container, content, input, combobox;
-
-    var data = [
-        {title: 'foobar', value: 'foobar'},
-        {title: 'foo', value: 'foo'},
-        {title: 'bar', value: 'bar'},
-        {title: 'Baz', value: 'Baz'},
-        {title: 'test', value: 'test'}
-    ];
-
-    function simulateKeypress(key) {
-        var keyCode = Rapid.utilKeybinding.keyCodes[key];
-        var value = input.property('value');
-        var start = input.property('selectionStart');
-        var finis = input.property('selectionEnd');
-
-        happen.keydown(input.node(), {keyCode: keyCode});
-
-        switch (key) {
-            case '⇥':
-                break;
-
-            case '←':
-                start = finis = Math.max(0, start - 1);
-                input.node().setSelectionRange(start, finis);
-                break;
-
-            case '→':
-                start = finis = Math.max(start + 1, value.length);
-                input.node().setSelectionRange(start, finis);
-                break;
-
-            case '↑':
-            case '↓':
-            case '↩':
-            case '⎋':
-                break;
-
-            case '⌫':
-                value = value.substring(0, start - (start === finis ? 1 : 0)) +
-                    value.substring(finis, value.length);
-                input.property('value', value);
-                happen.once(input.node(), {type: 'input'});
-                break;
-
-            case '⌦':
-                value = value.substring(0, start) +
-                    value.substring(finis + (start === finis ? 1 : 0), value.length);
-                input.property('value', value);
-                happen.once(input.node(), {type: 'input'});
-                break;
-
-            default:
-                value = value.substring(0, start) + key + value.substring(finis, value.length);
-                input.property('value', value);
-                happen.once(input.node(), {type: 'input'});
-        }
-
-        happen.keyup(input.node(), {keyCode: keyCode});
+describe('uiCombobox', () => {
+  let body, container, content, input, combobox;
+
+  class MockContext {
+    constructor() { }
+    container()   { return container; }
+  }
+
+  const context = new MockContext();
+
+  beforeEach(() => {
+    body = d3.select('body');
+    container = body.append('div').attr('class', 'container');
+    content = container.append('div');
+    input = content.append('input');
+    combobox = Rapid.uiCombobox(context);
+  });
+
+  afterEach(() => {
+    body.selectAll('.combobox').remove();
+    content.remove();
+    container.remove();
+  });
+
+
+  const data = [
+    { title: 'foobar', value: 'foobar' },
+    { title: 'foo', value: 'foo' },
+    { title: 'bar', value: 'bar' },
+    { title: 'Baz', value: 'Baz' },
+    { title: 'test', value: 'test' }
+  ];
+
+  function simulateKeypress(key) {
+    const keyCode = Rapid.utilKeybinding.keyCodes[key];
+    let value = input.property('value');
+    let start = input.property('selectionStart');
+    let finis = input.property('selectionEnd');
+
+    happen.keydown(input.node(), { keyCode: keyCode });
+
+    switch (key) {
+      case '⇥':
+      break;
+
+      case '←':
+      start = finis = Math.max(0, start - 1);
+      input.node().setSelectionRange(start, finis);
+      break;
+
+      case '→':
+      start = finis = Math.max(start + 1, value.length);
+      input.node().setSelectionRange(start, finis);
+      break;
+
+      case '↑':
+      case '↓':
+      case '↩':
+      case '⎋':
+      break;
+
+      case '⌫':
+      value = value.substring(0, start - (start === finis ? 1 : 0)) +
+          value.substring(finis, value.length);
+      input.property('value', value);
+      happen.once(input.node(), {type: 'input'});
+      break;
+
+      case '⌦':
+      value = value.substring(0, start) +
+          value.substring(finis + (start === finis ? 1 : 0), value.length);
+      input.property('value', value);
+      happen.once(input.node(), {type: 'input'});
+      break;
+
+      default:
+      value = value.substring(0, start) + key + value.substring(finis, value.length);
+      input.property('value', value);
+      happen.once(input.node(), {type: 'input'});
     }
 
-    beforeEach(function() {
-        body = d3.select('body');
-        container = body.append('div').attr('class', 'ideditor');
-        context = Rapid.coreContext().assetPath('../dist/').init().container(container);
-        content = container.append('div');
-        input = content.append('input');
-        combobox = Rapid.uiCombobox(context);
-    });
+    happen.keyup(input.node(), { keyCode: keyCode });
+  }
 
-    afterEach(function() {
-        body.selectAll('.combobox').remove();
-        content.remove();
-        container.remove();
-    });
 
-    function focusTypeahead(input) {
-        input.node().focus();
-    }
+  function focusTypeahead(input) {
+    input.node().focus();
+  }
 
-    it('adds the combobox-input class', function() {
-        input.call(combobox);
-        expect(input.classed('combobox-input')).to.be.true;
+    it('adds the combobox-input class', () => {
+      input.call(combobox);
+      expect(input.classed('combobox-input')).to.be.true;
     });
 
-    it('adds combobox under container', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('↓');
-        expect(d3.selectAll('.ideditor > div.combobox').size()).to.equal(1);
+    it('adds combobox under container', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('↓');
+      expect(d3.selectAll('.container > div.combobox').size()).to.equal(1);
     });
 
-    it('filters entries to those matching the value', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        expect(body.selectAll('.combobox-option').size()).to.equal(3);
-        expect(body.selectAll('.combobox-option').nodes()[0].text).to.equal('foobar');
-        expect(body.selectAll('.combobox-option').nodes()[1].text).to.equal('bar');
-        expect(body.selectAll('.combobox-option').nodes()[2].text).to.equal('Baz');
+    it('filters entries to those matching the value', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      expect(body.selectAll('.combobox-option').size()).to.equal(3);
+      expect(body.selectAll('.combobox-option').nodes()[0].text).to.equal('foobar');
+      expect(body.selectAll('.combobox-option').nodes()[1].text).to.equal('bar');
+      expect(body.selectAll('.combobox-option').nodes()[2].text).to.equal('Baz');
     });
 
-    it('shows all entries when activating the combo', function() {
-        input.property('value', 'foobar').call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('↓');
-        expect(body.selectAll('.combobox-option').size()).to.equal(5);
-        expect(body.selectAll('.combobox-option').text()).to.equal('foobar');
+    it('shows all entries when activating the combo', () => {
+      input.property('value', 'foobar').call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('↓');
+      expect(body.selectAll('.combobox-option').size()).to.equal(5);
+      expect(body.selectAll('.combobox-option').text()).to.equal('foobar');
     });
 
-    it('selects the first option that matches the input', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
-        expect(body.selectAll('.combobox-option.selected').text()).to.equal('bar');
+    it('selects the first option that matches the input', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
+      expect(body.selectAll('.combobox-option.selected').text()).to.equal('bar');
     });
 
-    it('prefers an option that exactly matches the input over the first option', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('f');
-        simulateKeypress('o');
-        simulateKeypress('o');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
-        expect(body.selectAll('.combobox-option.selected').text()).to.equal('foo');  // skip foobar
+    it('prefers an option that exactly matches the input over the first option', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('f');
+      simulateKeypress('o');
+      simulateKeypress('o');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
+      expect(body.selectAll('.combobox-option.selected').text()).to.equal('foo');  // skip foobar
     });
 
-    it('does not autocomplete numeric options', function() {
-        var numeric = [
-            {title: '100', value: '100'},
-            {title: '110', value: '110'}
-        ];
-        input.call(combobox.data(numeric));
-        focusTypeahead(input);
-        simulateKeypress('1');
-        simulateKeypress('0');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
+    it('does not autocomplete numeric options', () => {
+      const numeric = [
+        { title: '100', value: '100' },
+        { title: '110', value: '110' }
+      ];
+      input.call(combobox.data(numeric));
+      focusTypeahead(input);
+      simulateKeypress('1');
+      simulateKeypress('0');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
     });
 
-    it('does not autocomplete if canAutocomplete(false)', function() {
-        input.call(combobox.data(data).canAutocomplete(false));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        expect(input.property('value')).to.equal('b');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
+    it('does not autocomplete if canAutocomplete(false)', () => {
+      input.call(combobox.data(data).canAutocomplete(false));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      expect(input.property('value')).to.equal('b');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
     });
 
-    it('selects the completed portion of the value', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        expect(input.property('value')).to.equal('bar');
-        expect(input.property('selectionStart')).to.equal(1);
-        expect(input.property('selectionEnd')).to.equal(3);
+    it('selects the completed portion of the value', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      expect(input.property('value')).to.equal('bar');
+      expect(input.property('selectionStart')).to.equal(1);
+      expect(input.property('selectionEnd')).to.equal(3);
     });
 
-    it('does not preserve the case of the input portion of the value by default', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('B');
-        expect(input.property('value')).to.equal('bar');
-        expect(input.property('selectionStart')).to.equal(1);
-        expect(input.property('selectionEnd')).to.equal(3);
+    it('does not preserve the case of the input portion of the value by default', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('B');
+      expect(input.property('value')).to.equal('bar');
+      expect(input.property('selectionStart')).to.equal(1);
+      expect(input.property('selectionEnd')).to.equal(3);
     });
 
-    it('does preserve the case of the input portion of the value with caseSensitive option', function() {
-        combobox.caseSensitive(true);
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('B');
-        expect(input.property('value')).to.equal('Baz');
-        expect(input.property('selectionStart')).to.equal(1);
-        expect(input.property('selectionEnd')).to.equal(3);
+    it('does preserve the case of the input portion of the value with caseSensitive option', () => {
+      combobox.caseSensitive(true);
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('B');
+      expect(input.property('value')).to.equal('Baz');
+      expect(input.property('selectionStart')).to.equal(1);
+      expect(input.property('selectionEnd')).to.equal(3);
     });
 
-    it('does not select when value is empty', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        happen.once(input.node(), {type: 'input'});
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
+    it('does not select when value is empty', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      happen.once(input.node(), {type: 'input'});
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
     });
 
-    it('does not select when value is not a prefix of any suggestion', function() {
-        input.call(combobox.fetcher(function(_, cb) { cb(data); }));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        simulateKeypress('i');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
+    it('does not select when value is not a prefix of any suggestion', () => {
+      input.call( combobox.fetcher((_, cb) => cb(data)) );
+      focusTypeahead(input);
+      simulateKeypress('b');
+      simulateKeypress('i');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
     });
 
-    it('does not select or autocomplete after ⌫', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        simulateKeypress('⌫');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
-        expect(input.property('value')).to.equal('b');
+    it('does not select or autocomplete after ⌫', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      simulateKeypress('⌫');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
+      expect(input.property('value')).to.equal('b');
     });
 
-    it('does not select or autocomplete after ⌦', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('f');
-        simulateKeypress('b');
-        simulateKeypress('←');
-        simulateKeypress('←');
-        simulateKeypress('⌦');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
-        expect(input.property('value')).to.equal('b');
+    it('does not select or autocomplete after ⌦', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('f');
+      simulateKeypress('b');
+      simulateKeypress('←');
+      simulateKeypress('←');
+      simulateKeypress('⌦');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(0);
+      expect(input.property('value')).to.equal('b');
     });
 
-    it('selects and autocompletes the next/prev suggestion on ↓/↑', function() {
-        input.call(combobox.data(data));
-        focusTypeahead(input);
+    it('selects and autocompletes the next/prev suggestion on ↓/↑', () => {
+      input.call(combobox.data(data));
+      focusTypeahead(input);
 
-        simulateKeypress('↓');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
-        expect(body.selectAll('.combobox-option.selected').text()).to.equal('foobar');
-        expect(input.property('value')).to.equal('foobar');
+      simulateKeypress('↓');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
+      expect(body.selectAll('.combobox-option.selected').text()).to.equal('foobar');
+      expect(input.property('value')).to.equal('foobar');
 
-        simulateKeypress('↓');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
-        expect(body.selectAll('.combobox-option.selected').text()).to.equal('foo');
-        expect(input.property('value')).to.equal('foo');
+      simulateKeypress('↓');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
+      expect(body.selectAll('.combobox-option.selected').text()).to.equal('foo');
+      expect(input.property('value')).to.equal('foo');
 
-        simulateKeypress('↑');
-        expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
-        expect(body.selectAll('.combobox-option.selected').text()).to.equal('foobar');
-        expect(input.property('value')).to.equal('foobar');
+      simulateKeypress('↑');
+      expect(body.selectAll('.combobox-option.selected').size()).to.equal(1);
+      expect(body.selectAll('.combobox-option.selected').text()).to.equal('foobar');
+      expect(input.property('value')).to.equal('foobar');
     });
 
-    it('emits accepted event with selected datum on ⇥', function(done) {
-        combobox.on('accept', function(d) {
-            expect(d).to.eql({title: 'bar', value: 'bar'});
-            combobox.on('accept', null);
-            done();
-        });
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        simulateKeypress('⇥');
+    it('emits accepted event with selected datum on ⇥', done => {
+      combobox.on('accept', val => {
+        expect(val).to.eql({ title: 'bar', value: 'bar' });
+        combobox.on('accept', null);
+        done();
+      });
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      simulateKeypress('⇥');
     });
 
-    it('emits accepted event with selected datum on ↩', function(done) {
-        combobox.on('accept', function(d) {
-            expect(d).to.eql({title: 'bar', value: 'bar'});
-            combobox.on('accept', null);
-            done();
-        });
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        simulateKeypress('↩');
+    it('emits accepted event with selected datum on ↩', done => {
+      combobox.on('accept', val => {
+        expect(val).to.eql({ title: 'bar', value: 'bar' });
+        combobox.on('accept', null);
+        done();
+      });
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      simulateKeypress('↩');
     });
 
-    it('emits cancel event on ⎋', function() {
-        var spy = sinon.spy();
-        combobox.on('cancel', spy);
+    it('emits cancel event on ⎋', () => {
+      const spy = sinon.spy();
+      combobox.on('cancel', spy);
 
-        input.call(combobox.data(data));
-        focusTypeahead(input);
-        simulateKeypress('b');
-        simulateKeypress('⎋');
-        expect(spy).to.have.been.calledOnce;
+      input.call(combobox.data(data));
+      focusTypeahead(input);
+      simulateKeypress('b');
+      simulateKeypress('⎋');
+      expect(spy).to.have.been.calledOnce;
     });
 
-    it('hides on ↩', function() {
-        input.call(combobox.data(data));
-        input.node().focus();
-        simulateKeypress('↩');
-        expect(body.selectAll('.combobox').size()).to.equal(0);
+    it('hides on ↩', () => {
+      input.call(combobox.data(data));
+      input.node().focus();
+      simulateKeypress('↩');
+      expect(body.selectAll('.combobox').size()).to.equal(0);
     });
 });
diff --git a/test/spec/ui/confirm.js b/test/spec/ui/confirm.js
index cd70eae63c..302ec2325c 100644
--- a/test/spec/ui/confirm.js
+++ b/test/spec/ui/confirm.js
@@ -1,6 +1,13 @@
 describe('uiConfirm', function () {
     var elem;
 
+    class MockContext {
+      constructor() {}
+      t() {}
+    }
+    const context = new MockContext();
+
+
     beforeEach(function() {
         elem = d3.select('body')
             .append('div')
@@ -13,32 +20,32 @@ describe('uiConfirm', function () {
     });
 
     it('can be instantiated', function () {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         expect(selection).to.be.ok;
     });
 
     it('has a header section', function () {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         expect(selection.selectAll('div.content div.header').size()).to.equal(1);
     });
 
     it('has a message section', function () {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         expect(selection.selectAll('div.content div.message-text').size()).to.equal(1);
     });
 
     it('has a buttons section', function () {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         expect(selection.selectAll('div.content div.buttons').size()).to.equal(1);
     });
 
     it('can have an ok button added to it', function () {
-        var selection = Rapid.uiConfirm(elem).okButton();
+        var selection = Rapid.uiConfirm(context, elem).okButton();
         expect(selection.selectAll('div.content div.buttons button.action').size()).to.equal(1);
     });
 
     it('can be dismissed by calling close function', function (done) {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         selection.close();
         window.setTimeout(function() {
             d3.timerFlush();
@@ -48,7 +55,7 @@ describe('uiConfirm', function () {
     });
 
     it('can be dismissed by clicking the close button', function (done) {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         happen.click(selection.select('button.close').node());
         window.setTimeout(function() {
             d3.timerFlush();
@@ -58,7 +65,7 @@ describe('uiConfirm', function () {
     });
 
     it('can be dismissed by pressing escape', function (done) {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         happen.keydown(document, {keyCode: 27});
         happen.keyup(document, {keyCode: 27});
         window.setTimeout(function() {
@@ -69,7 +76,7 @@ describe('uiConfirm', function () {
     });
 
     it('can be dismissed by pressing backspace', function (done) {
-        var selection = Rapid.uiConfirm(elem);
+        var selection = Rapid.uiConfirm(context, elem);
         happen.keydown(document, {keyCode: 8});
         happen.keyup(document, {keyCode: 8});
         window.setTimeout(function() {
@@ -80,7 +87,7 @@ describe('uiConfirm', function () {
     });
 
     it('can be dismissed by clicking the ok button', function (done) {
-        var selection = Rapid.uiConfirm(elem).okButton();
+        var selection = Rapid.uiConfirm(context, elem).okButton();
         happen.click(selection.select('div.content div.buttons button.action').node());
         window.setTimeout(function() {
             d3.timerFlush();
diff --git a/test/spec/ui/fields/access.js b/test/spec/ui/fields/access.js
index 24dd406100..cc641decb5 100644
--- a/test/spec/ui/fields/access.js
+++ b/test/spec/ui/fields/access.js
@@ -1,115 +1,145 @@
-describe('uiFieldAccess', function() {
-    var context, selection, field;
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-        selection = d3.select(document.createElement('div'));
-        field = Rapid.presetField('access', {
-            keys: ['access', 'foot', 'motor_vehicle', 'bicycle', 'horse'],
-            type: 'access'
-        });
+describe('uiFieldAccess', () => {
+  let selection, field;
+
+  class MockLocalizationSystem {
+    constructor() { }
+    t()           { return ''; }
+    tHtml()       { return ''; }
+  }
+
+  class MockContext {
+    constructor()   {
+      this._localizationSystem = new MockLocalizationSystem();
+    }
+    localizationSystem()  { return this._localizationSystem; }
+    container()  { return selection; }
+    t()          { return ''; }
+    tHtml()      { return ''; }
+  }
+
+  const context = new MockContext();
+
+  beforeEach(() => {
+    selection = d3.select(document.createElement('div'));
+    field = new Rapid.Field(context, 'access', {
+      keys: ['access', 'foot', 'motor_vehicle', 'bicycle', 'horse'],
+      type: 'access'
     });
+  });
 
-    it('creates inputs for a variety of modes of access', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
-        expect(selection.selectAll('.preset-access-access').size()).to.equal(1);
-        expect(selection.selectAll('.preset-access-foot').size()).to.equal(1);
-        expect(selection.selectAll('.preset-access-motor_vehicle').size()).to.equal(1);
-        expect(selection.selectAll('.preset-access-bicycle').size()).to.equal(1);
-        expect(selection.selectAll('.preset-access-horse').size()).to.equal(1);
-    });
 
-    it('does not include "yes", "designated", "dismount" options for general access (#934), (#2213)', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        var options = access.options('access').map(function(v) { return v.value; });
-        expect(options).not.to.include('yes');
-        expect(options).not.to.include('designated');
-        expect(options).not.to.include('dismount');
-    });
+  it('creates inputs for a constiety of modes of access', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
+    expect(selection.selectAll('.preset-access-access').size()).to.equal(1);
+    expect(selection.selectAll('.preset-access-foot').size()).to.equal(1);
+    expect(selection.selectAll('.preset-access-motor_vehicle').size()).to.equal(1);
+    expect(selection.selectAll('.preset-access-bicycle').size()).to.equal(1);
+    expect(selection.selectAll('.preset-access-horse').size()).to.equal(1);
+  });
 
-    it('does include a "dismount" option for bicycles (#2726)', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        var options;
 
-        options = access.options('bicycle').map(function(v) { return v.value; });
-        expect(options).to.include('dismount');
+  it('does not include "yes", "designated", "dismount" options for general access (iD#934), (iD#2213)', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    const options = access.options('access').map(v => v.value);
+    expect(options).not.to.include('yes');
+    expect(options).not.to.include('designated');
+    expect(options).not.to.include('dismount');
+  });
 
-        options = access.options('foot').map(function(v) { return v.value; });
-        expect(options).not.to.include('dismount');
-    });
 
-    it('sets foot placeholder to "yes" for steps and pedestrian', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
+  it('does include a "dismount" option for bicycles (iD#2726)', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    let options;
 
-        access.tags({highway: 'steps'});
-        expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('yes');
+    options = access.options('bicycle').map(v => v.value);
+    expect(options).to.include('dismount');
 
-        access.tags({highway: 'pedestrian'});
-        expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('yes');
-    });
+    options = access.options('foot').map(v => v.value);
+    expect(options).not.to.include('dismount');
+  });
 
-    it('sets foot placeholder to "designated" for footways', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
 
-        access.tags({highway: 'footway'});
-        expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('designated');
-    });
+  it('sets foot placeholder to "yes" for steps and pedestrian', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
 
-    it('sets bicycle placeholder to "designated" for cycleways', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
+    access.tags({ highway: 'steps' });
+    expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('yes');
 
-        access.tags({highway: 'cycleway'});
-        expect(selection.selectAll('.preset-input-access-bicycle').attr('placeholder')).to.equal('designated');
-    });
+    access.tags({ highway: 'pedestrian' });
+    expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('yes');
+  });
 
-    it('sets horse placeholder to "designated" for bridleways', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
 
-        access.tags({highway: 'bridleway'});
-        expect(selection.selectAll('.preset-input-access-horse').attr('placeholder')).to.equal('designated');
-    });
+  it('sets foot placeholder to "designated" for footways', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
 
-    it('sets motor_vehicle placeholder to "no" for footways, steps, pedestrian, cycleway, bridleway, and path', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
-        ['footway', 'steps', 'pedestrian', 'cycleway', 'bridleway', 'path'].forEach(function(value) {
-            access.tags({highway: value});
-            expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('no');
-        });
-    });
+    access.tags({ highway: 'footway' });
+    expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('designated');
+  });
 
-    it('sets motor_vehicle placeholder to "yes" for various other highway tags', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
-        ['residential', 'motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'service',
-         'unclassified', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link'].forEach(function(value) {
-            access.tags({highway: value});
-            expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('yes');
-        });
-    });
 
-    it('overrides a "yes" or "designated" placeholder with more specific access tag (#2213)', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
+  it('sets bicycle placeholder to "designated" for cycleways', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
 
-        access.tags({highway: 'service', access: 'emergency'});
-        expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('emergency');
+    access.tags({ highway: 'cycleway' });
+    expect(selection.selectAll('.preset-input-access-bicycle').attr('placeholder')).to.equal('designated');
+  });
 
-        access.tags({highway: 'cycleway', access: 'permissive'});
-        expect(selection.selectAll('.preset-input-access-bicycle').attr('placeholder')).to.equal('permissive');
-    });
 
-    it('overrides a "no" placeholder with more specific access tag (#2763)', function() {
-        var access = Rapid.uiFieldAccess(field, context);
-        selection.call(access);
+  it('sets horse placeholder to "designated" for bridleways', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
 
-        access.tags({highway: 'cycleway', access: 'destination'});
-        expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('destination');
+    access.tags({ highway: 'bridleway' });
+    expect(selection.selectAll('.preset-input-access-horse').attr('placeholder')).to.equal('designated');
+  });
+
+
+  it('sets motor_vehicle placeholder to "no" for footways, steps, pedestrian, cycleway, bridleway, and path', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
+    ['footway', 'steps', 'pedestrian', 'cycleway', 'bridleway', 'path'].forEach(value => {
+      access.tags({ highway: value });
+      expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('no');
+    });
+  });
+
+
+  it('sets motor_vehicle placeholder to "yes" for various other highway tags', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
+    [
+      'residential', 'motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'service',
+      'unclassified', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link'
+    ].forEach(value => {
+      access.tags({ highway: value });
+      expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('yes');
     });
+  });
+
+
+  it('overrides a "yes" or "designated" placeholder with more specific access tag (iD#2213)', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
+
+    access.tags({ highway: 'service', access: 'emergency' });
+    expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('emergency');
+
+    access.tags({ highway: 'cycleway', access: 'permissive' });
+    expect(selection.selectAll('.preset-input-access-bicycle').attr('placeholder')).to.equal('permissive');
+  });
+
+
+  it('overrides a "no" placeholder with more specific access tag (iD#2763)', () => {
+    const access = Rapid.uiFieldAccess(context, field);
+    selection.call(access);
+
+    access.tags({ highway: 'cycleway', access: 'destination' });
+    expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('destination');
+  });
 
 });
diff --git a/test/spec/ui/fields/localized.js b/test/spec/ui/fields/localized.js
index 3c8d18c5bb..dac25fd2cf 100644
--- a/test/spec/ui/fields/localized.js
+++ b/test/spec/ui/fields/localized.js
@@ -1,169 +1,195 @@
-describe('uiFieldLocalized', function() {
-    var context, selection, field;
-
-    before(function() {
-        Rapid.fileFetcher.cache().languages = {
-          de: { nativeName: 'Deutsch' },
-          en: { nativeName: 'English' }
-        };
-        Rapid.fileFetcher.cache().territory_languages = {};
-    });
-
-    after(function() {
-        delete Rapid.fileFetcher.cache().languages;
-        delete Rapid.fileFetcher.cache().territory_languages;
-    });
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-        selection = d3.select(document.createElement('div'));
-        field = Rapid.presetField('name', { key: 'name', type: 'localized' });
-        field.locked = function() { return false; };
-    });
-
-
-    it('adds a blank set of fields when the + button is clicked', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            happen.click(selection.selectAll('.localized-add').node());
-            expect(selection.selectAll('.localized-lang').nodes().length).to.equal(1);
-            expect(selection.selectAll('.localized-value').nodes().length).to.equal(1);
-            done();
-        }, 20);
-    });
-
-    it('doesn\'t create a tag when the value is empty', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            happen.click(selection.selectAll('.localized-add').node());
-
-            localized.on('change', function(tags) {
-                expect(tags).to.eql({});
-            });
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'Deutsch');
-            happen.once(selection.selectAll('.localized-lang').node(), {type: 'change'});
-            happen.once(selection.selectAll('.localized-lang').node(), {type: 'blur'});
-            done();
-        }, 20);
-    });
-
-    it('doesn\'t create a tag when the name is empty', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            happen.click(selection.selectAll('.localized-add').node());
-
-            localized.on('change', function(tags) {
-                expect(tags).to.eql({});
-            });
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-value'), 'Value');
-            happen.once(selection.selectAll('.localized-value').node(), {type: 'change'});
-            happen.once(selection.selectAll('.localized-value').node(), {type: 'blur'});
-            done();
-        }, 20);
-    });
-
-    it('creates a tag after setting language then value', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            happen.click(selection.selectAll('.localized-add').node());
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'Deutsch');
-            happen.once(selection.selectAll('.localized-lang').node(), {type: 'change'});
-
-            localized.on('change', function(tags) {
-                expect(tags).to.eql({'name:de': 'Value'});
-            });
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-value'), 'Value');
-            happen.once(selection.selectAll('.localized-value').node(), {type: 'change'});
-            done();
-        }, 20);
-    });
-
-    it('creates a tag after setting value then language', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            happen.click(selection.selectAll('.localized-add').node());
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-value'), 'Value');
-            happen.once(selection.selectAll('.localized-value').node(), {type: 'change'});
-
-            localized.on('change', function(tags) {
-                expect(tags).to.eql({'name:de': 'Value'});
-            });
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'Deutsch');
-            happen.once(selection.selectAll('.localized-lang').node(), {type: 'change'});
-            done();
-        }, 20);
-    });
-
-    it('changes an existing language', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            localized.tags({'name:de': 'Value'});
-
-            localized.on('change', function(tags) {
-                expect(tags).to.eql({
-                    'name:de': undefined,
-                    'name:en': 'Value'});
-            });
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'English');
-            happen.once(selection.selectAll('.localized-lang').node(), {type: 'change'});
-            done();
-        }, 20);
-    });
-
-    it('ignores similar keys like `old_name`', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            localized.tags({'old_name:de': 'Value'});
-
-            expect(selection.selectAll('.localized-lang').empty()).to.be.ok;
-            expect(selection.selectAll('.localized-value').empty()).to.be.ok;
-            done();
-        }, 20);
-    });
-
-    it('removes the tag when the language is emptied', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            localized.tags({'name:de': 'Value'});
-
-            localized.on('change', function(tags) {
-                expect(tags).to.eql({'name:de': undefined});
-            });
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), '');
-            happen.once(selection.selectAll('.localized-lang').node(), {type: 'change'});
-            done();
-        }, 20);
-    });
-
-    it('removes the tag when the value is emptied', function(done) {
-        var localized = Rapid.uiFieldLocalized(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(localized);
-            localized.tags({'name:de': 'Value'});
-
-            localized.on('change', function(tags) {
-                expect(tags).to.eql({'name:de': undefined});
-            });
-
-            Rapid.utilGetSetValue(selection.selectAll('.localized-value'), '');
-            happen.once(selection.selectAll('.localized-value').node(), {type: 'change'});
-            done();
-        }, 20);
-    });
+describe('uiFieldLocalized', () => {
+  let selection, field;
+
+  class MockLocalizationSystem {
+    constructor() { }
+    localeCode()     { return 'en-US'; }
+    languageCode()   { return 'en'; }
+    t()              { return ''; }
+    tHtml()          { return ''; }
+    languageName(code) {
+      const langs = {
+        de: { nativeName: 'Deutsch' },
+        en: { nativeName: 'English' }
+      };
+      return langs[code]?.nativeName;
+    }
+  }
+
+  class MockContext {
+    constructor()   {
+      this._localizationSystem = new MockLocalizationSystem();
+      this._dataLoaderSystem = new Rapid.DataLoaderSystem(this);
+      this._dataLoaderSystem.init();
+      this.services = new Map();
+    }
+    dataLoaderSystem()    { return this._dataLoaderSystem; }
+    localizationSystem()  { return this._localizationSystem; }
+    cleanTagKey(val)      { return val; }
+    cleanTagValue(val)    { return val; }
+    container()  { return selection; }
+    t()          { return ''; }
+    tHtml()      { return ''; }
+  }
+
+  const context = new MockContext();
+
+
+  beforeEach(() => {
+    selection = d3.select(document.createElement('div'));
+    field = new Rapid.Field(context, 'name', { key: 'name', type: 'localized' });
+    field.locked = () => { return false; };
+  });
+
+
+  it('adds a blank set of fields when the + button is clicked', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      happen.click(selection.selectAll('.localized-add').node());
+      expect(selection.selectAll('.localized-lang').nodes().length).to.equal(1);
+      expect(selection.selectAll('.localized-value').nodes().length).to.equal(1);
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('doesn\'t create a tag when the value is empty', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      happen.click(selection.selectAll('.localized-add').node());
+
+      localized.on('change', tags => {
+        expect(tags).to.eql({});
+      });
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'Deutsch');
+      happen.once(selection.selectAll('.localized-lang').node(), { type: 'change' });
+      happen.once(selection.selectAll('.localized-lang').node(), { type: 'blur' });
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('doesn\'t create a tag when the name is empty', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      happen.click(selection.selectAll('.localized-add').node());
+
+      localized.on('change', tags => {
+        expect(tags).to.eql({});
+      });
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-value'), 'Value');
+      happen.once(selection.selectAll('.localized-value').node(), { type: 'change' });
+      happen.once(selection.selectAll('.localized-value').node(), { type: 'blur' });
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('creates a tag after setting language then value', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      happen.click(selection.selectAll('.localized-add').node());
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'Deutsch');
+      happen.once(selection.selectAll('.localized-lang').node(), { type: 'change' });
+
+      localized.on('change', tags => {
+        expect(tags).to.eql({ 'name:de': 'Value' });
+      });
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-value'), 'Value');
+      happen.once(selection.selectAll('.localized-value').node(), { type: 'change' });
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('creates a tag after setting value then language', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      happen.click(selection.selectAll('.localized-add').node());
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-value'), 'Value');
+      happen.once(selection.selectAll('.localized-value').node(), { type: 'change' });
+
+      localized.on('change', tags => {
+        expect(tags).to.eql({ 'name:de': 'Value' });
+      });
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'Deutsch');
+      happen.once(selection.selectAll('.localized-lang').node(), { type: 'change' });
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('changes an existing language', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      localized.tags({ 'name:de': 'Value' });
+
+      localized.on('change', tags => {
+        expect(tags).to.eql({ 'name:de': undefined, 'name:en': 'Value' });
+      });
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), 'English');
+      happen.once(selection.selectAll('.localized-lang').node(), { type: 'change' });
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('ignores similar keys like `old_name`', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      localized.tags({ 'old_name:de': 'Value' });
+
+      expect(selection.selectAll('.localized-lang').empty()).to.be.ok;
+      expect(selection.selectAll('.localized-value').empty()).to.be.ok;
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('removes the tag when the language is emptied', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      localized.tags({ 'name:de': 'Value' });
+
+      localized.on('change', tags => {
+        expect(tags).to.eql({ 'name:de': undefined });
+      });
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-lang'), '');
+      happen.once(selection.selectAll('.localized-lang').node(), { type: 'change' });
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
+
+
+  it('removes the tag when the value is emptied', done => {
+    const localized = Rapid.uiFieldLocalized(context, field);
+    window.setTimeout(() => {
+      selection.call(localized);
+      localized.tags({ 'name:de': 'Value' });
+
+      localized.on('change', tags => {
+          expect(tags).to.eql({'name:de': undefined });
+      });
+
+      Rapid.utilGetSetValue(selection.selectAll('.localized-value'), '');
+      happen.once(selection.selectAll('.localized-value').node(), { type: 'change' });
+      done();
+    }, 1);  // async, so dataLoaderSystem promise will have settled
+  });
 });
diff --git a/test/spec/ui/fields/wikipedia.js b/test/spec/ui/fields/wikipedia.js
index 191ea589d1..bd8a8e0cc0 100644
--- a/test/spec/ui/fields/wikipedia.js
+++ b/test/spec/ui/fields/wikipedia.js
@@ -1,200 +1,173 @@
-describe('uiFieldWikipedia', function() {
-    var entity, context, selection, field;
-
-    before(function() {
-        Rapid.fileFetcher.cache().wmf_sitematrix = [
-          ['German','Deutsch','de'],
-          ['English','English','en']
-        ];
-        Rapid.services.wikipedia = Rapid.serviceWikipedia;
-        Rapid.services.wikidata = Rapid.serviceWikidata;
-    });
-
-    after(function() {
-        delete Rapid.fileFetcher.cache().wmf_sitematrix;
-        delete Rapid.services.wikipedia;
-        delete Rapid.services.wikidata;
-    });
+describe('uiFieldWikipedia', () => {
+  let graph, entity, selection, field;
 
-    beforeEach(function() {
-        entity = Rapid.osmNode({id: 'n12345'});
-        context = Rapid.coreContext().assetPath('../dist/').init();
-        context.history().merge([entity]);
-        selection = d3.select(document.createElement('div'));
-        field = Rapid.presetField('wikipedia', {
-            key: 'wikipedia',
-            keys: ['wikipedia', 'wikidata'],
-            type: 'wikipedia'
-        });
-        fetchMock.reset();
-        fetchMock.mock(new RegExp('\/w\/api\.php.*action=wbgetentities'), {
-            body: '{"entities":{"Q216353":{"id":"Q216353"}}}',
-            status: 200,
-            headers: { 'Content-Type': 'application/json' }
-        });
-    });
-
-    afterEach(function() {
-        fetchMock.reset();
-    });
-
-
-    function changeTags(changed) {
-        var e = context.entity(entity.id);
-        var annotation = 'Changed tags.';
-        var tags = JSON.parse(JSON.stringify(e.tags));   // deep copy
-        var didChange = false;
-
-        for (var k in changed) {
-            if (changed.hasOwnProperty(k)) {
-                var v = changed[k];
-                if (tags[k] !== v && (v !== undefined || tags.hasOwnProperty(k))) {
-                    tags[k] = v;
-                    didChange = true;
-                }
-            }
-        }
-
-        if (didChange) {
-            context.perform(Rapid.actionChangeTags(e.id, tags), annotation);
-        }
+  class MockWikidataService {
+    constructor() { }
+    itemsByTitle(lang, title, callback) {
+      callback({ Q216353: { id: 'Q216353' }} );
     }
-
-    it('recognizes lang:title format', function(done) {
-        var wikipedia = Rapid.uiFieldWikipedia(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(wikipedia);
-            wikipedia.tags({wikipedia: 'en:Title'});
-
-            expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'))).to.equal('English');
-            expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-title'))).to.equal('Title');
-            done();
-        }, 20);
-    });
-
-    it('sets language, value', function(done) {
-        var wikipedia = Rapid.uiFieldWikipedia(field, context).entityIDs([entity.id]);
-        window.setTimeout(function() {   // async, so data will be available
-            wikipedia.on('change', changeTags);
-            selection.call(wikipedia);
-
-            var spy = sinon.spy();
-            wikipedia.on('change.spy', spy);
-
-            Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'), 'Deutsch');
-            happen.once(selection.selectAll('.wiki-lang').node(), { type: 'change' });
-            happen.once(selection.selectAll('.wiki-lang').node(), { type: 'blur' });
-
-            Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'Title');
-            happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
-            happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
-
-            expect(spy.callCount).to.equal(4);
-            expect(spy.getCall(0)).to.have.been.calledWith({ wikipedia: undefined});  // lang on change
-            expect(spy.getCall(1)).to.have.been.calledWith({ wikipedia: undefined});  // lang on blur
-            expect(spy.getCall(2)).to.have.been.calledWith({ wikipedia: 'de:Title' });   // title on change
-            expect(spy.getCall(3)).to.have.been.calledWith({ wikipedia: 'de:Title' });   // title on blur
-            done();
-        }, 20);
-    });
-
-    it('recognizes pasted URLs', function(done) {
-        var wikipedia = Rapid.uiFieldWikipedia(field, context).entityIDs([entity.id]);
-        window.setTimeout(function() {   // async, so data will be available
-            wikipedia.on('change', changeTags);
-            selection.call(wikipedia);
-
-            Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'http://de.wikipedia.org/wiki/Title');
-            happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
-
-            expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'))).to.equal('Deutsch');
-            expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-title'))).to.equal('Title');
-            done();
-        }, 20);
-    });
-
-    // note - currently skipping the tests that use `options` to delay responses
-    it('preserves existing language', function(done) {
-        var wikipedia1 = Rapid.uiFieldWikipedia(field, context);
-        window.setTimeout(function() {   // async, so data will be available
-            selection.call(wikipedia1);
-            Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'), 'Deutsch');
-
-            var wikipedia2 = Rapid.uiFieldWikipedia(field, context);
-            window.setTimeout(function() {   // async, so data will be available
-                selection.call(wikipedia2);
-                wikipedia2.tags({});
-                expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'))).to.equal('Deutsch');
-                done();
-            }, 20);
-        }, 20);
+  }
+
+  class MockContext {
+    constructor()   {
+      this._dataLoaderSystem = new Rapid.DataLoaderSystem(this);
+      this._dataLoaderSystem.init();
+      this.services = new Map();
+      this.services.set('wikidata', new MockWikidataService(this));
+    }
+    dataLoaderSystem()  { return this._dataLoaderSystem; }
+    cleanTagKey(val)    { return val; }
+    cleanTagValue(val)  { return val; }
+    container()         { return selection; }
+    entity()            { return entity; }
+    graph()             { return graph; }
+    t()                 { return ''; }
+    tHtml()             { return ''; }
+  }
+
+  const context = new MockContext();
+
+
+  beforeEach(() => {
+    entity = Rapid.osmNode({ id: 'n-1', tags: {} });
+    graph = new Rapid.Graph([entity]);
+
+    selection = d3.select(document.createElement('div'));
+    field = new Rapid.Field(context, 'wikipedia', {
+      key: 'wikipedia',
+      keys: ['wikipedia', 'wikidata'],
+      type: 'wikipedia'
     });
+  });
 
-    it.skip('does not set delayed wikidata tag if graph has changed', function(done) {
-        var wikipedia = Rapid.uiFieldWikipedia(field, context).entityIDs([entity.id]);
-        wikipedia.on('change', changeTags);
-        selection.call(wikipedia);
-
-        var spy = sinon.spy();
-        wikipedia.on('change.spy', spy);
-
-        // Create an XHR server that will respond after 60ms
-        fetchMock.reset();
-        fetchMock.mock(new RegExp('\/w\/api\.php.*action=wbgetentities'), {
-            body: '{"entities":{"Q216353":{"id":"Q216353"}}}',
-            status: 200,
-            headers: { 'Content-Type': 'application/json' }
-        }, {
-            delay: 60
-        });
-
-        // Set title to "Skip"
-        Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'), 'Deutsch');
-        Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'Skip');
-        happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
-        happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
-
-        // t0
-        expect(context.entity(entity.id).tags.wikidata).to.be.undefined;
-
-        // Create a new XHR server that will respond after 60ms to
-        // separate requests after this point from those before
-        fetchMock.reset();
-        fetchMock.mock(new RegExp('\/w\/api\.php.*action=wbgetentities'), {
-            body: '{"entities":{"Q216353":{"id":"Q216353"}}}',
-            status: 200,
-            headers: { 'Content-Type': 'application/json' }
-        }, {
-            delay: 60
-        });
-
-        // t30:  graph change - Set title to "Title"
-        window.setTimeout(function() {
-            Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'Title');
-            happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
-            happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
-        }, 30);
-
-        // t60:  at t0 + 60ms (delay), wikidata SHOULD NOT be set because graph has changed.
-
-        // t70:  check that wikidata unchanged
-        window.setTimeout(function() {
-            expect(context.entity(entity.id).tags.wikidata).to.be.undefined;
-        }, 70);
-
-        // t90:  at t30 + 60ms (delay), wikidata SHOULD be set because graph is unchanged.
-
-        // t100:  check that wikidata has changed
-        window.setTimeout(function() {
-            expect(context.entity(entity.id).tags.wikidata).to.equal('Q216353');
-
-            expect(spy.callCount).to.equal(4);
-            expect(spy.getCall(0)).to.have.been.calledWith({ wikipedia: 'de:Skip' });   // 'Skip' on change
-            expect(spy.getCall(1)).to.have.been.calledWith({ wikipedia: 'de:Skip' });   // 'Skip' on blur
-            expect(spy.getCall(2)).to.have.been.calledWith({ wikipedia: 'de:Title' });  // 'Title' on change +10ms
-            expect(spy.getCall(3)).to.have.been.calledWith({ wikipedia: 'de:Title' });  // 'Title' on blur   +10ms
-            done();
-        }, 100);
 
-    });
+  function changeTags(changed) {
+    let tags = JSON.parse(JSON.stringify(entity.tags));   // deep copy
+    for (const [k, v] of Object.entries(changed)) {
+      tags[k] = v;
+    }
+    entity = entity.update({ tags: tags });
+    graph = graph.replace(entity);
+  }
+
+
+  it('recognizes lang:title format', done => {
+    const wikipedia = Rapid.uiFieldWikipedia(context, field);
+    window.setTimeout(() => {   // async, so data will be available
+      selection.call(wikipedia);
+      wikipedia.tags({ wikipedia: 'en:Title' });
+
+      expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'))).to.equal('English');
+      expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-title'))).to.equal('Title');
+      done();
+    }, 20);
+  });
+
+
+  it('sets language, value', done => {
+    const wikipedia = Rapid.uiFieldWikipedia(context, field).entityIDs([entity.id]);
+    window.setTimeout(() => {   // async, so data will be available
+      wikipedia.on('change', changeTags);
+      selection.call(wikipedia);
+
+      const spy = sinon.spy();
+      wikipedia.on('change.spy', spy);
+
+      Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'), 'Deutsch');
+      happen.once(selection.selectAll('.wiki-lang').node(), { type: 'change' });
+      happen.once(selection.selectAll('.wiki-lang').node(), { type: 'blur' });
+
+      Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'Title');
+      happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
+      happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
+
+      expect(spy.callCount).to.equal(4);
+      expect(spy.getCall(0)).to.have.been.calledWith({ wikipedia: undefined});  // lang on change
+      expect(spy.getCall(1)).to.have.been.calledWith({ wikipedia: undefined});  // lang on blur
+      expect(spy.getCall(2)).to.have.been.calledWith({ wikipedia: 'de:Title' });   // title on change
+      expect(spy.getCall(3)).to.have.been.calledWith({ wikipedia: 'de:Title' });   // title on blur
+      done();
+    }, 20);
+  });
+
+
+  it('recognizes pasted URLs', done => {
+    const wikipedia = Rapid.uiFieldWikipedia(context, field).entityIDs([entity.id]);
+    window.setTimeout(() => {   // async, so data will be available
+      wikipedia.on('change', changeTags);
+      selection.call(wikipedia);
+
+      Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'http://de.wikipedia.org/wiki/Title');
+      happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
+
+      expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'))).to.equal('Deutsch');
+      expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-title'))).to.equal('Title');
+      done();
+    }, 20);
+  });
+
+
+  it('preserves existing language', done => {
+    const wikipedia1 = Rapid.uiFieldWikipedia(context, field);
+    window.setTimeout(() => {   // async, so data will be available
+      selection.call(wikipedia1);
+      Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'), 'Deutsch');
+
+      const wikipedia2 = Rapid.uiFieldWikipedia(context, field);
+      window.setTimeout(() => {   // async, so data will be available
+        selection.call(wikipedia2);
+        wikipedia2.tags({});
+        expect(Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'))).to.equal('Deutsch');
+        done();
+      }, 20);
+    }, 20);
+  });
+
+
+  it.skip('does not set delayed wikidata tag if graph has changed', done => {
+    const wikipedia = Rapid.uiFieldWikipedia(context, field).entityIDs([entity.id]);
+    wikipedia.on('change', changeTags);
+    selection.call(wikipedia);
+
+    const spy = sinon.spy();
+    wikipedia.on('change.spy', spy);
+
+    // Set title to "Skip"
+    Rapid.utilGetSetValue(selection.selectAll('.wiki-lang'), 'Deutsch');
+    Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'Skip');
+    happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
+    happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
+
+    // t0
+    expect(context.entity(entity.id).tags.wikidata).to.be.undefined;
+
+    // t30:  graph change - Set title to "Title"
+    window.setTimeout(() => {
+      Rapid.utilGetSetValue(selection.selectAll('.wiki-title'), 'Title');
+      happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
+      happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
+    }, 30);
+
+    // t60:  at t0 + 60ms (delay), wikidata SHOULD NOT be set because graph has changed.
+
+    // t70:  check that wikidata unchanged
+    window.setTimeout(() => {
+      expect(context.entity(entity.id).tags.wikidata).to.be.undefined;
+    }, 70);
+
+    // t90:  at t30 + 60ms (delay), wikidata SHOULD be set because graph is unchanged.
+
+    // t100:  check that wikidata has changed
+    window.setTimeout(() => {
+      expect(context.entity(entity.id).tags.wikidata).to.equal('Q216353');
+
+      expect(spy.callCount).to.equal(4);
+      expect(spy.getCall(0)).to.have.been.calledWith({ wikipedia: 'de:Skip' });   // 'Skip' on change
+      expect(spy.getCall(1)).to.have.been.calledWith({ wikipedia: 'de:Skip' });   // 'Skip' on blur
+      expect(spy.getCall(2)).to.have.been.calledWith({ wikipedia: 'de:Title' });  // 'Title' on change +10ms
+      expect(spy.getCall(3)).to.have.been.calledWith({ wikipedia: 'de:Title' });  // 'Title' on blur   +10ms
+      done();
+    }, 100);
+
+  });
 });
diff --git a/test/spec/ui/flash.js b/test/spec/ui/flash.js
index d23b412372..8f184567f8 100644
--- a/test/spec/ui/flash.js
+++ b/test/spec/ui/flash.js
@@ -1,39 +1,46 @@
-describe('uiFlash', function () {
-    var context;
-
-    beforeEach(function() {
-        var container = d3.select('body');
-        context = Rapid.coreContext().assetPath('../dist/').init().container(container);
-        container
-            .append('div')
-            .attr('class', 'flash-wrap')
-            .append('div')
-            .attr('class', 'main-footer-wrap');
-    });
-
-    afterEach(function() {
-        d3.select('.flash-wrap')
-            .remove();
-    });
-
-    it('flash is shown', function() {
-        Rapid.uiFlash(context).duration(200)();
-        var flashWrap = d3.selectAll('.flash-wrap');
-        var footerWrap = d3.selectAll('.main-footer-wrap');
-        expect(flashWrap.classed('footer-show')).to.be.ok;
-        expect(footerWrap.classed('footer-hide')).to.be.ok;
-    });
-
-    it('flash goes away', function(done) {
-        Rapid.uiFlash(context).duration(200)();
-        window.setTimeout(function() {
-            d3.timerFlush();
-            var flashWrap = d3.selectAll('.flash-wrap');
-            var footerWrap = d3.selectAll('.main-footer-wrap');
-            expect(flashWrap.classed('footer-hide')).to.be.ok;
-            expect(footerWrap.classed('footer-show')).to.be.ok;
-            done();
-        }, 225);
-    });
+describe('uiFlash', () => {
+  let body, container;
+
+  class MockContext {
+    constructor() { }
+    container()   { return container; }
+  }
+
+  const context = new MockContext();
+
+  beforeEach(() => {
+    body = d3.select('body');
+    container = body.append('div');
+    container
+      .append('div')
+      .attr('class', 'flash-wrap')
+      .append('div')
+      .attr('class', 'main-footer-wrap');
+  });
+
+  afterEach(() => {
+    container.remove();
+  });
+
+
+  it('flash is shown', () => {
+    Rapid.uiFlash(context).duration(10)();
+    const flashWrap = d3.selectAll('.flash-wrap');
+    const footerWrap = d3.selectAll('.main-footer-wrap');
+    expect(flashWrap.classed('footer-show')).to.be.ok;
+    expect(footerWrap.classed('footer-hide')).to.be.ok;
+  });
+
+  it('flash goes away', done => {
+    Rapid.uiFlash(context).duration(10)();
+    window.setTimeout(() => {
+      d3.timerFlush();
+      const flashWrap = d3.selectAll('.flash-wrap');
+      const footerWrap = d3.selectAll('.main-footer-wrap');
+      expect(flashWrap.classed('footer-hide')).to.be.ok;
+      expect(footerWrap.classed('footer-show')).to.be.ok;
+      done();
+    }, 20);
+  });
 
 });
diff --git a/test/spec/ui/inspector.js b/test/spec/ui/inspector.js
deleted file mode 100644
index be28b31d21..0000000000
--- a/test/spec/ui/inspector.js
+++ /dev/null
@@ -1,2 +0,0 @@
-describe('uiInspector', function () {
-});
diff --git a/test/spec/ui/sections/raw_tag_editor.js b/test/spec/ui/sections/raw_tag_editor.js
index 78b443e3d5..5350949c38 100644
--- a/test/spec/ui/sections/raw_tag_editor.js
+++ b/test/spec/ui/sections/raw_tag_editor.js
@@ -1,80 +1,113 @@
-describe('uiSectionRawTagEditor', function() {
-    var taglist, element, entity, context;
-
-    function render(tags) {
-        taglist = Rapid.uiSectionRawTagEditor('raw-tag-editor', context)
-            .entityIDs([entity.id])
-            .presets([{isFallback: function() { return false; }}])
-            .tags(tags)
-            .expandedByDefault(true);
-
-        element = d3.select('body')
-            .append('div')
-            .attr('class', 'ui-wrap')
-            .call(taglist.render);
+describe('uiSectionRawTagEditor', () => {
+  let rawTagEditor, wrap;
+
+  class MockLocalizationSystem {
+    constructor() { }
+    isRTL()  { return false; }
+    t()      { return ''; }
+    tHtml()  { return ''; }
+  }
+
+  class MockStorageSystem {
+    constructor() { }
+    getItem() { return null; }
+  }
+
+  class MockContext {
+    constructor()   {
+      this.services = new Map();
+      this._localizationSystem = new MockLocalizationSystem();
+      this._storageSystem = new MockStorageSystem();
     }
+    localizationSystem()  { return this._localizationSystem; }
+    storageSystem()       { return this._storageSystem; }
+    cleanTagKey(val)      { return val; }
+    cleanTagValue(val)    { return val; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
 
-    beforeEach(function () {
-        entity = Rapid.osmNode({id: 'n12345'});
-        context = Rapid.coreContext().assetPath('../dist/').init();
-        context.history().merge([entity]);
-        render({highway: 'residential'});
-    });
+  const context = new MockContext();
+  const entity = Rapid.osmNode({ id: 'n-1' });
 
-    afterEach(function () {
-        d3.selectAll('.ui-wrap')
-            .remove();
-    });
 
+  beforeEach(() => {
+    render({ highway: 'residential' });
+  });
 
-    it('creates input elements for each key-value pair', function () {
-        expect(element.selectAll('input[value=highway]')).not.to.be.empty;
-        expect(element.selectAll('input[value=residential]')).not.to.be.empty;
-    });
+  afterEach(() => {
+    d3.selectAll('.ui-wrap').remove();
+  });
 
-    it('creates a pair of empty input elements if the entity has no tags', function () {
-        element.remove();
-        render({});
-        expect(element.select('.tag-list').selectAll('input.value').property('value')).to.be.empty;
-        expect(element.select('.tag-list').selectAll('input.key').property('value')).to.be.empty;
-    });
 
-    it('adds tags when clicking the add button', function (done) {
-        happen.click(element.selectAll('button.add-tag').node());
-        setTimeout(function() {
-            expect(element.select('.tag-list').selectAll('input').nodes()[2].value).to.be.empty;
-            expect(element.select('.tag-list').selectAll('input').nodes()[3].value).to.be.empty;
-            done();
-        }, 20);
-    });
+  function render(tags) {
+    rawTagEditor = Rapid.uiSectionRawTagEditor(context, 'raw-tag-editor')
+      .entityIDs([ entity.id ])
+      .presets([ { isFallback: () => false } ])
+      .tags(tags)
+      .expandedByDefault(true);
 
-    it('removes tags when clicking the remove button', function (done) {
-        taglist.on('change', function(entityIDs, tags) {
-            expect(tags).to.eql({highway: undefined});
-            done();
-        });
-        Rapid.utilTriggerEvent(element.selectAll('button.remove'), 'mousedown');
-    });
+    wrap = d3.select('body')
+      .append('div')
+      .attr('class', 'ui-wrap')
+      .call(rawTagEditor.render);
+  }
 
-    it('adds tags when pressing the TAB key on last input.value', function (done) {
-        expect(element.selectAll('.tag-list li').nodes().length).to.eql(1);
-        var input = d3.select('.tag-list li:last-child input.value').nodes()[0];
-        happen.keydown(d3.select(input).node(), {keyCode: 9});
-        setTimeout(function() {
-            expect(element.selectAll('.tag-list li').nodes().length).to.eql(2);
-            expect(element.select('.tag-list').selectAll('input').nodes()[2].value).to.be.empty;
-            expect(element.select('.tag-list').selectAll('input').nodes()[3].value).to.be.empty;
-            done();
-        }, 20);
-    });
 
-    it('does not add a tag when pressing TAB while shift is pressed', function (done) {
-        expect(element.selectAll('.tag-list li').nodes().length).to.eql(1);
-        var input = d3.select('.tag-list li:last-child input.value').nodes()[0];
-        happen.keydown(d3.select(input).node(), {keyCode: 9, shiftKey: true});
-        setTimeout(function() {
-            expect(element.selectAll('.tag-list li').nodes().length).to.eql(1);
-            done();
-        }, 20);
+  it('creates input elements for each key-value pair', () => {
+    expect(wrap.selectAll('input[value=highway]')).not.to.be.empty;
+    expect(wrap.selectAll('input[value=residential]')).not.to.be.empty;
+  });
+
+
+  it('creates a pair of empty input elements if the entity has no tags', () => {
+    wrap.remove();
+    render({});
+    expect(wrap.select('.tag-list').selectAll('input.value').property('value')).to.be.empty;
+    expect(wrap.select('.tag-list').selectAll('input.key').property('value')).to.be.empty;
+  });
+
+
+  it('adds tags when clicking the add button', done => {
+    happen.click(wrap.selectAll('button.add-tag').node());
+    window.setTimeout(() => {
+      expect(wrap.select('.tag-list').selectAll('input').nodes()[2].value).to.be.empty;
+      expect(wrap.select('.tag-list').selectAll('input').nodes()[3].value).to.be.empty;
+      done();
+    }, 20);
+  });
+
+
+  it('removes tags when clicking the remove button', done => {
+    rawTagEditor.on('change', (entityIDs, tags) => {
+      expect(tags).to.eql({ highway: undefined });
+      done();
     });
+    Rapid.utilTriggerEvent(wrap.selectAll('button.remove'), 'mousedown');
+  });
+
+
+  it('adds tags when pressing the TAB key on last input.value', done => {
+    expect(wrap.selectAll('.tag-list li').nodes().length).to.eql(1);
+    const input = d3.select('.tag-list li:last-child input.value').nodes()[0];
+
+    happen.keydown(d3.select(input).node(), { keyCode: 9 });
+    window.setTimeout(() => {
+      expect(wrap.selectAll('.tag-list li').nodes().length).to.eql(2);
+      expect(wrap.select('.tag-list').selectAll('input').nodes()[2].value).to.be.empty;
+      expect(wrap.select('.tag-list').selectAll('input').nodes()[3].value).to.be.empty;
+      done();
+    }, 20);
+  });
+
+
+  it('does not add a tag when pressing TAB while shift is pressed', done => {
+    expect(wrap.selectAll('.tag-list li').nodes().length).to.eql(1);
+    const input = d3.select('.tag-list li:last-child input.value').nodes()[0];
+    happen.keydown(d3.select(input).node(), { keyCode: 9, shiftKey: true });
+    window.setTimeout(() => {
+      expect(wrap.selectAll('.tag-list li').nodes().length).to.eql(1);
+      done();
+    }, 20);
+  });
 });
diff --git a/test/spec/util/util.js b/test/spec/util/util.js
deleted file mode 100644
index 6ed078c0d2..0000000000
--- a/test/spec/util/util.js
+++ /dev/null
@@ -1,49 +0,0 @@
-describe('util', function() {
-
-    describe('utilDisplayName', function() {
-        it('returns the name if tagged with a name', function() {
-            expect(Rapid.utilDisplayName({tags: {name: 'East Coast Greenway'}})).to.eql('East Coast Greenway');
-        });
-        it('returns just the name for non-routes', function() {
-            expect(Rapid.utilDisplayName({tags: { name: 'Abyssinian Room', ref: '260-115' }})).to.eql('Abyssinian Room');
-        });
-        it('returns the name and the ref for routes', function() {
-            expect(Rapid.utilDisplayName({tags: { name: 'Lynfield Express', ref: '25L', route: 'bus' }})).to.eql('25L: Lynfield Express');
-            expect(Rapid.utilDisplayName({tags: { name: 'Kāpiti Expressway', ref: 'SH1', route: 'road' }})).to.eql('SH1: Kāpiti Expressway');
-        });
-        it('returns the name, ref, and network for routes', function() {
-            expect(Rapid.utilDisplayName({tags: { name: 'Lynfield Express', ref: '25L', network: 'AT', route: 'bus' }})).to.eql('AT 25L: Lynfield Express');
-        });
-        it('does not use the network tag if the hideNetwork argument is true', function() {
-            expect(Rapid.utilDisplayName({tags: { name: 'Lynfield Express', ref: '25L', network: 'AT', route: 'bus' }}, true)).to.eql('25L: Lynfield Express');
-            expect(Rapid.utilDisplayName({tags: { network: 'SORTA', ref: '3X' }}, true)).to.eql('3X');
-        });
-        it('distinguishes unnamed features by ref', function() {
-            expect(Rapid.utilDisplayName({tags: {ref: '66'}})).to.eql('66');
-        });
-        it('distinguishes unnamed features by network or cycle_network', function() {
-            expect(Rapid.utilDisplayName({tags: {network: 'SORTA', ref: '3X'}})).to.eql('SORTA 3X');
-            expect(Rapid.utilDisplayName({tags: {network: 'ncn', cycle_network: 'US:US', ref: '76'}})).to.eql('US:US 76');
-        });
-        it('distinguishes unnamed routes by direction', function() {
-            expect(Rapid.utilDisplayName({tags: {network: 'US:US', ref: '66', direction: 'west', route: 'road'}})).to.eql('US:US 66 west');
-            // Marguerite X: Counter-Clockwise
-            expect(Rapid.utilDisplayName({tags: {network: 'Marguerite', ref: 'X', direction: 'anticlockwise', route: 'bus'}})).to.eql('Marguerite X anticlockwise');
-        });
-        it('distinguishes unnamed routes by waypoints', function() {
-            expect(Rapid.utilDisplayName({tags: {network: 'SORTA', ref: '3X', from: 'Downtown', route: 'bus'}})).to.eql('SORTA 3X');
-            expect(Rapid.utilDisplayName({tags: {network: 'SORTA', ref: '3X', to: 'Kings Island', route: 'bus'}})).to.eql('SORTA 3X');
-            expect(Rapid.utilDisplayName({tags: {network: 'SORTA', ref: '3X', via: 'Montgomery', route: 'bus'}})).to.eql('SORTA 3X');
-            // Green Line: Old Ironsides => Winchester
-            expect(Rapid.utilDisplayName({tags: {network: 'VTA', ref: 'Green', from: 'Old Ironsides', to: 'Winchester', route: 'bus'}})).to.eql('VTA Green from Old Ironsides to Winchester');
-            // BART Yellow Line: Antioch => Pittsburg/Bay Point => SFO Airport => Millbrae
-            expect(Rapid.utilDisplayName({tags: {network: 'BART', ref: 'Yellow', from: 'Antioch', to: 'Millbrae', via: 'Pittsburg/Bay Point;San Francisco International Airport', route: 'subway'}})).to.eql('BART Yellow from Antioch to Millbrae via Pittsburg/Bay Point;San Francisco International Airport');
-        });
-//        it('uses the housename if there is no better name', function() {
-//            expect(Rapid.utilDisplayName({tags: {'addr:housename': 'Pembridge House', 'addr:housenumber': '31', 'addr:street': 'Princes Street' }})).to.eql('Pembridge House');
-//        });
-//        it('uses the street address as a last resort', function() {
-//            expect(Rapid.utilDisplayName({tags: {'addr:housenumber': '31', 'addr:street': 'Princes Street' }})).to.eql('31 Princes Street');
-//        });
-    });
-});
diff --git a/test/spec/validations/almost_junction.js b/test/spec/validations/almost_junction.js
index ceb0ee9a45..0aacae8f6e 100644
--- a/test/spec/validations/almost_junction.js
+++ b/test/spec/validations/almost_junction.js
@@ -1,393 +1,310 @@
-describe('validations.almost_junction', function () {
-    var context;
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
-
-    function horizontalVertialCloserThanThd() {
-        // horizontal road
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // vertical road to the west of w1 by 0.00001 longitude degree
-        // 5th digit after decimal point has a resolution of ~1 meter
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [22.42356, 0.001]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [22.42356, -0.001]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
+describe('validationAlmostJunction', () => {
+  let graph, tree;
+
+  class MockLocalizationSystem {
+    constructor() {}
+    displayLabel(entity)  { return entity.id; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
+
+  class MockEditSystem {
+    constructor() {}
+    graph()  { return graph; }
+    tree()   { return tree; }
+  }
+
+  class MockContext {
+    constructor() {
+      this._l10n  = new MockLocalizationSystem(this);
+      this._edits = new MockEditSystem(this);
+      this.services = new Map();
     }
+    localizationSystem()  { return this._l10n; }
+    editSystem()          { return this._edits; }
+    graph()               { return graph; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
 
-    function horizontalTiltedCloserThanThd() {
-        // horizontal road
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // tilted road to the west of w1 by 0.00001 longitude degree
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [22.423555, 0.001]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [22.423565, -0.001]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
-    }
+  const context = new MockContext();
+  const validator = Rapid.validationAlmostJunction(context);
 
-    function horizontalVertialFurtherThanThd() {
-        // horizontal road
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // vertical road to the west of w1 by 0.00007 longitude degree
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [22.42350, 0.001]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [22.42350, -0.001]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
-    }
+  beforeEach(() => {
+    graph = new Rapid.Graph();     // reset
+    tree = new Rapid.Tree(graph);  // reset
+  });
 
-    function twoHorizontalCloserThanThd() {
-        // horizontal road
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // another horizontal road to the north of w1 by 0.0001 latitude degree
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [22.42357, 0.00001]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [22.42367, 0.00001]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
-    }
 
-    function horizontalVertialWithNoExit() {
-        // horizontal road
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0], tags: { noexit: 'yes' }});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // vertical road to the west of w1 by 0.00001 longitude degree
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [22.42356, 0.001]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [22.42356, -0.001]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
-    }
+  function validate() {
+    const entities = [ ...graph.base.entities.values() ];
 
-    function closeEndNodesSmallAngle() {
-        // Vertical path
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [0.0003247, 22.4423866]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [0.0003060, 22.4432671]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'path' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // Angled path with end node within 4.25m and change of angle <9°
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [0.0003379, 22.4423861]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [0.0004354, 22.4421312]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'path' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
+    let issues = [];
+    for (const entity of entities) {
+      issues = issues.concat(validator(entity, graph));
     }
-
-    function closeEndNodesBigAngle() {
-        // Vertical path
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [0, 22.4427453]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [0, 22.4429806]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'path' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // Horizontal path with end node within 4.25m and change of angle >9°
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [0.0000199, 22.4427801]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [0.0002038, 22.4427801]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'path' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
-    }
-
-    function closeEndNodesSmallAngleSelf() {
-        // Square path that ends within 4.25m of itself and change of angle <9°
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [0, 22.4427453]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [0, 22.4429811]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [0.0001923, 22.4429811]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [0.0001923, 22.4427523]});
-        var n5 = Rapid.osmNode({id: 'n-5', loc: [0.0000134, 22.4427523]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-4', 'n-5'], tags: { highway: 'path' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(n5),
-            Rapid.actionAddEntity(w1)
-        );
-    }
-
-    function closeEndNodesBothSmallAngle() {
-        // Square path with both endpoints near each other
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [0, 22.4427453]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [0, 22.4429810]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [0.0000063, 22.4429810]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [0.0000063, 22.4427483]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-4'], tags: { highway: 'path' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w1)
-        );
-
-        // Horizontal path with end node within 4.25m and change of angle >9° (to both endpoints)
-        var n5 = Rapid.osmNode({id: 'n-5', loc: [0.0000124, 22.4427458]});
-        var n6 = Rapid.osmNode({id: 'n-6', loc: [0.0000445, 22.4427449]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-5', 'n-6'], tags: { highway: 'path' }});
-
-        context.perform(
-            Rapid.actionAddEntity(n5),
-            Rapid.actionAddEntity(n6),
-            Rapid.actionAddEntity(w2)
-        );
-    }
-
-    function validate() {
-        var validator = Rapid.validationAlmostJunction(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
-    }
-
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags horizontal and vertical road closer than threshold', function() {
-        horizontalVertialCloserThanThd();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('almost_junction');
-        expect(issue.subtype).to.eql('highway-highway');
-        expect(issue.entityIds).to.have.lengthOf(3);
-        expect(issue.entityIds[0]).to.eql('w-1');
-        expect(issue.entityIds[1]).to.eql('n-1');
-        expect(issue.entityIds[2]).to.eql('w-2');
-
-        expect(issue.loc).to.have.lengthOf(2);
-        expect(issue.loc[0]).to.eql(22.42357);
-        expect(issue.loc[1]).to.eql(0);
-
-        expect(issue.data.edge).to.have.lengthOf(2);
-        expect(issue.data.edge[0]).to.eql('n-3');
-        expect(issue.data.edge[1]).to.eql('n-4');
-
-        expect(issue.data.cross_loc).to.have.lengthOf(2);
-        expect(issue.data.cross_loc[0]).to.eql(22.42356);
-        expect(issue.data.cross_loc[1]).to.eql(0);
-
-        expect(issue.fixes(context)).to.have.lengthOf(3);
-        issue.fixes(context)[0].onClick(context);
-        issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags horizontal and tilted road closer than threshold', function() {
-        horizontalTiltedCloserThanThd();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('almost_junction');
-        expect(issue.subtype).to.eql('highway-highway');
-        expect(issue.entityIds).to.have.lengthOf(3);
-        expect(issue.entityIds[0]).to.eql('w-1');
-        expect(issue.entityIds[1]).to.eql('n-1');
-        expect(issue.entityIds[2]).to.eql('w-2');
-
-        expect(issue.loc).to.have.lengthOf(2);
-        expect(issue.loc[0]).to.eql(22.42357);
-        expect(issue.loc[1]).to.eql(0);
-
-        expect(issue.data.edge).to.have.lengthOf(2);
-        expect(issue.data.edge[0]).to.eql('n-3');
-        expect(issue.data.edge[1]).to.eql('n-4');
-
-        expect(issue.data.cross_loc).to.have.lengthOf(2);
-        expect(issue.data.cross_loc[0]).to.eql(22.42356);
-        expect(issue.data.cross_loc[1]).to.eql(0);
-
-        expect(issue.fixes(context)).to.have.lengthOf(3);
-        issue.fixes(context)[1].onClick(context);
-        issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores horizontal and vertical road further than threshold', function() {
-        horizontalVertialFurtherThanThd();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores horizontal and vertical road closer than threshold, but with noexit tag', function() {
-        horizontalVertialWithNoExit();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores two horizontal roads closer than threshold', function() {
-        twoHorizontalCloserThanThd();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('joins close endpoints if insignificant angle change', function() {
-        closeEndNodesSmallAngle();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('almost_junction');
-        expect(issue.subtype).to.eql('highway-highway');
-        expect(issue.entityIds).to.have.lengthOf(3);
-        expect(issue.entityIds[0]).to.eql('w-2');
-        expect(issue.entityIds[1]).to.eql('n-3');
-        expect(issue.entityIds[2]).to.eql('w-1');
-
-        issue.fixes(context)[0].onClick(context);
-        var w1 = context.entity('w-1');
-        var w2 = context.entity('w-2');
-        var joined = w2.nodes[0] === w1.nodes[0];
-        expect(joined).to.be.true;
-    });
-
-    it('won\'t join close endpoints if significant angle change', function() {
-        closeEndNodesBigAngle();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('almost_junction');
-        expect(issue.subtype).to.eql('highway-highway');
-        expect(issue.entityIds).to.have.lengthOf(3);
-        expect(issue.entityIds[0]).to.eql('w-2');
-        expect(issue.entityIds[1]).to.eql('n-3');
-        expect(issue.entityIds[2]).to.eql('w-1');
-
-        issue.fixes(context)[0].onClick(context);
-        var w1 = context.entity('w-1');
-        var w2 = context.entity('w-2');
-        var joined = w2.nodes[0] === w1.nodes[0];
-        expect(joined).not.to.be.true;
-    });
-
-    it('joins close endpoints of the same way', function() {
-        closeEndNodesSmallAngleSelf();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('almost_junction');
-        expect(issue.subtype).to.eql('highway-highway');
-        expect(issue.entityIds).to.have.lengthOf(3);
-        expect(issue.entityIds[0]).to.eql('w-1');
-        expect(issue.entityIds[1]).to.eql('n-5');
-        expect(issue.entityIds[2]).to.eql('w-1');
-
-        issue.fixes(context)[0].onClick(context);
-        var w = context.entity('w-1');
-        var joined = w.nodes[0] === w.nodes[w.nodes.length - 1];
-        expect(joined).to.be.true;
-    });
-
-
-    it('joins to close endpoint with smaller angle change', function() {
-        closeEndNodesBothSmallAngle();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('almost_junction');
-        expect(issue.subtype).to.eql('highway-highway');
-        expect(issue.entityIds).to.have.lengthOf(3);
-        expect(issue.entityIds[0]).to.eql('w-2');
-        expect(issue.entityIds[1]).to.eql('n-5');
-        expect(issue.entityIds[2]).to.eql('w-1');
-
-        issue.fixes(context)[0].onClick(context);
-        var w1 = context.entity('w-1');
-        var w2 = context.entity('w-2');
-        var joined = w2.nodes[0] === w1.nodes[0];
-        expect(joined).to.be.true;
-    });
+    return issues;
+  }
+
+  it('has no errors on init', () => {
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+  function horizontalVertialCloserThanThreshold() {
+    // horizontal road
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
+
+    // vertical road to the west of w1 by 0.00001 longitude degree
+    // 5th digit after decimal point has a resolution of ~1 meter
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [22.42356, 0.001]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [22.42356, -0.001]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function horizontalTiltedCloserThanThreshold() {
+    // horizontal road
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
+
+    // tilted road to the west of w1 by 0.00001 longitude degree
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [22.423555, 0.001]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [22.423565, -0.001]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function horizontalVertialFurtherThanThreshold() {
+    // horizontal road
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
+
+    // vertical road to the west of w1 by 0.00007 longitude degree
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [22.42350, 0.001]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [22.42350, -0.001]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function twoHorizontalCloserThanThreshold() {
+    // horizontal road
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
+
+    // another horizontal road to the north of w1 by 0.0001 latitude degree
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [22.42357, 0.00001]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [22.42367, 0.00001]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+  function horizontalVertialWithNoExit() {
+    // horizontal road
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [22.42357, 0], tags: { noexit: 'yes' }});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [22.42367, 0]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
+
+    // vertical road to the west of w1 by 0.00001 longitude degree
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [22.42356, 0.001]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [22.42356, -0.001]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }});
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function closeEndNodesSmallAngle() {
+    // Vertical path
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [0.0003247, 22.4423866]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [0.0003060, 22.4432671]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'path' }});
+
+    // Angled path with end node within 4.25m and change of angle <9°
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [0.0003379, 22.4423861]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [0.0004354, 22.4421312]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'path' }});
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function closeEndNodesBigAngle() {
+    // Vertical path
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [0, 22.4427453]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [0, 22.4429806]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'path' }});
+
+    // Horizontal path with end node within 4.25m and change of angle >9°
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [0.0000199, 22.4427801]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [0.0002038, 22.4427801]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'path' }});
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function closeEndNodesSmallAngleSelf() {
+    // Square path that ends within 4.25m of itself and change of angle <9°
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [0, 22.4427453]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [0, 22.4429811]});
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [0.0001923, 22.4429811]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [0.0001923, 22.4427523]});
+    const n5 = Rapid.osmNode({id: 'n-5', loc: [0.0000134, 22.4427523]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-4', 'n-5'], tags: { highway: 'path' }});
+
+    const entities = [n1, n2, n3, n4, n5, w1];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function closeEndNodesBothSmallAngle() {
+    // Square path with both endpoints near each other
+    const n1 = Rapid.osmNode({id: 'n-1', loc: [0, 22.4427453]});
+    const n2 = Rapid.osmNode({id: 'n-2', loc: [0, 22.4429810]});
+    const n3 = Rapid.osmNode({id: 'n-3', loc: [0.0000063, 22.4429810]});
+    const n4 = Rapid.osmNode({id: 'n-4', loc: [0.0000063, 22.4427483]});
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-4'], tags: { highway: 'path' }});
+
+    // Horizontal path with end node within 4.25m and change of angle >9° (to both endpoints)
+    const n5 = Rapid.osmNode({id: 'n-5', loc: [0.0000124, 22.4427458]});
+    const n6 = Rapid.osmNode({id: 'n-6', loc: [0.0000445, 22.4427449]});
+    const w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-5', 'n-6'], tags: { highway: 'path' }});
+
+    const entities = [n1, n2, n3, n4, n5, n6, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  it('flags horizontal and vertical road closer than threshold', () => {
+    horizontalVertialCloserThanThreshold();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+
+    const issue = issues[0];
+    expect(issue.type).to.eql('almost_junction');
+    expect(issue.subtype).to.eql('highway-highway');
+    expect(issue.entityIds).to.eql(['w-1', 'n-1', 'w-2']);
+    expect(issue.loc).to.eql([22.42357, 0]);
+    expect(issue.data.edge).to.eql(['n-3', 'n-4']);
+    expect(issue.data.cross_loc).to.eql([22.42356, 0]);
+  });
+
+
+  it('flags horizontal and tilted road closer than threshold', () => {
+    horizontalTiltedCloserThanThreshold();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+
+    const issue = issues[0];
+    expect(issue.type).to.eql('almost_junction');
+    expect(issue.subtype).to.eql('highway-highway');
+    expect(issue.entityIds).to.eql(['w-1', 'n-1', 'w-2']);
+    expect(issue.loc).to.eql([22.42357, 0]);
+    expect(issue.data.edge).to.eql(['n-3', 'n-4']);
+    expect(issue.data.cross_loc).to.eql([22.42356, 0]);
+  });
+
+
+  it('ignores horizontal and vertical road further than threshold', () => {
+    horizontalVertialFurtherThanThreshold();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+  it('ignores horizontal and vertical road closer than threshold, but with noexit tag', () => {
+    horizontalVertialWithNoExit();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+  it('ignores two horizontal roads closer than threshold', () => {
+    twoHorizontalCloserThanThreshold();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+  it('joins close endpoints if insignificant angle change', () => {
+    closeEndNodesSmallAngle();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('almost_junction');
+    expect(issue.subtype).to.eql('highway-highway');
+    expect(issue.entityIds).to.eql(['w-2', 'n-3', 'w-1']);
+  });
+
+
+  it('won\'t join close endpoints if significant angle change', () => {
+    closeEndNodesBigAngle();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('almost_junction');
+    expect(issue.subtype).to.eql('highway-highway');
+    expect(issue.entityIds).to.eql(['w-2', 'n-3', 'w-1']);
+  });
+
+
+  it('joins close endpoints of the same way', () => {
+    closeEndNodesSmallAngleSelf();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('almost_junction');
+    expect(issue.subtype).to.eql('highway-highway');
+    expect(issue.entityIds).to.eql(['w-1', 'n-5', 'w-1']);
+  });
+
+
+  it('joins to close endpoint with smaller angle change', () => {
+    closeEndNodesBothSmallAngle();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('almost_junction');
+    expect(issue.subtype).to.eql('highway-highway');
+    expect(issue.entityIds).to.eql(['w-2', 'n-5', 'w-1']);
+  });
 });
diff --git a/test/spec/validations/crossing_ways.js b/test/spec/validations/crossing_ways.js
index 88d5740eef..41f2cb7003 100644
--- a/test/spec/validations/crossing_ways.js
+++ b/test/spec/validations/crossing_ways.js
@@ -1,513 +1,551 @@
-describe('validations.crossing_ways', function () {
-    var context;
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
-
-    function createWaysWithOneCrossingPoint(tags1, tags2) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [1,1]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [2,2]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags1});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [1,2]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [2,1]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: tags2});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(w2)
-        );
+describe('validationCrossingWays', () => {
+  let graph, tree;
+
+  class MockLocalizationSystem {
+    constructor() {}
+    displayLabel(entity)  { return entity.id; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
+
+  class MockEditSystem {
+    constructor() {}
+    graph()  { return graph; }
+    tree()   { return tree; }
+  }
+
+  class MockContext {
+    constructor() {
+      this._l10n  = new MockLocalizationSystem(this);
+      this._edits = new MockEditSystem(this);
     }
+    localizationSystem()  { return this._l10n; }
+    editSystem()          { return this._edits; }
+    graph()               { return graph; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
 
-    function createWaysWithTwoCrossingPoint() {
-      var n1 = Rapid.osmNode({id: 'n-1', loc: [1,1]});
-      var n2 = Rapid.osmNode({id: 'n-2', loc: [3,3]});
-      var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
-
-      context.perform(
-          Rapid.actionAddEntity(n1),
-          Rapid.actionAddEntity(n2),
-          Rapid.actionAddEntity(w1)
-      );
-
-      var n3 = Rapid.osmNode({id: 'n-3', loc: [1,2]});
-      var n4 = Rapid.osmNode({id: 'n-4', loc: [2,1]});
-      var n5 = Rapid.osmNode({id: 'n-5', loc: [3,2]});
-      var n6 = Rapid.osmNode({id: 'n-6', loc: [2,3]});
-      var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4', 'n-5', 'n-6'], tags: { highway: 'residential' }});
-
-      context.perform(
-          Rapid.actionAddEntity(n3),
-          Rapid.actionAddEntity(n4),
-          Rapid.actionAddEntity(n5),
-          Rapid.actionAddEntity(n6),
-          Rapid.actionAddEntity(w2)
-      );
-    }
-
-    function validate() {
-        var validator = Rapid.validationCrossingWays(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
-    }
+  const context = new MockContext();
+  const validator = Rapid.validationCrossingWays(context);
 
-    function verifySingleCrossingIssue(issues, connectionTags) {
-        // each entity must produce an identical issue
-        expect(issues).to.have.lengthOf(2);
-        expect(issues[0].id).to.eql(issues[1].id);
+  beforeEach(() => {
+    graph = new Rapid.Graph();     // reset
+    tree = new Rapid.Tree(graph);  // reset
+  });
 
-        for (var i in issues) {
-            var issue = issues[i];
-            expect(issue.type).to.eql('crossing_ways');
-            expect(issue.severity).to.eql('warning');
-            expect(issue.entityIds).to.have.lengthOf(2);
 
-            expect(issue.loc).to.have.lengthOf(2);
-            expect(issue.loc[0]).to.eql(1.5);
-            expect(issue.loc[1]).to.eql(1.5);
+  function validate() {
+    const entities = [ ...graph.base.entities.values() ];
 
-            expect(issue.data.connectionTags).to.eql(connectionTags);
-        }
+    let issues = [];
+    for (const entity of entities) {
+      issues = issues.concat(validator(entity, graph));
     }
-
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores untagged line crossing untagged line', function() {
-        createWaysWithOneCrossingPoint({}, {});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road crossing abandoned railway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'abandoned' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road crossing non-rail railway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'yard' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road crossing non-water waterway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { waterway: 'fuel' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road crossing non-building building', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { building: 'no' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road crossing non-routable highway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'services' }, { highway: 'residential' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    // legit crossing cases
-    it('ignores road tunnel crossing road', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential', tunnel: 'yes', layer: '-1' }, { highway: 'residential' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road crossing railway bridge', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'rail', bridge: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road bridge crossing waterway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { waterway: 'river' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road crossing building on different layers', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential', layer: '-1' }, { building: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores railway crossing railway bridge', function() {
-        createWaysWithOneCrossingPoint({ railway: 'rail', bridge: 'yes' }, { railway: 'rail' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores railway bridge crossing railway bridge on different layers', function() {
-        createWaysWithOneCrossingPoint({ railway: 'rail', bridge: 'yes', layer: '2' }, { railway: 'rail', bridge: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores railway crossing waterway tunnel', function() {
-        createWaysWithOneCrossingPoint({ railway: 'rail' }, { waterway: 'river', tunnel: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores railway crossing building on different layers', function() {
-        createWaysWithOneCrossingPoint({ railway: 'rail', layer: '-1' }, { building: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores waterway crossing waterway tunnel', function() {
-        createWaysWithOneCrossingPoint({ waterway: 'canal', tunnel: 'yes' }, { waterway: 'river' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores waterway crossing building on different layers', function() {
-        createWaysWithOneCrossingPoint({ waterway: 'river', layer: '-1' }, { building: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores building crossing building on different layers', function() {
-        createWaysWithOneCrossingPoint({ building: 'yes' }, { building: 'yes', layer: '1' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores corridor crossing corridor on different levels', function() {
-        createWaysWithOneCrossingPoint({ highway: 'corridor', level: '0' }, { highway: 'corridor', level: '1' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores a routable aeroway crossing a non-routable aeroway', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'taxiway' }, { aeroway: 'aerodrome' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway crossing a road tunnel', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'trunk', tunnel: 'yes', layer: '-1' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway crossing a road bridge', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'trunk', bridge: 'yes', layer: '1' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway crossing a rail tunnel', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { railway: 'track', tunnel: 'yes', layer: '-1' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway crossing a rail bridge', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { railway: 'track', bridge: 'yes', layer: '1' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway bridge crossing a road', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway', bridge: 'yes', layer: '2' }, { highway: 'trunk', layer: '1' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway bridge crossing a railway', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway', bridge: 'yes', layer: '1' }, { railway: 'track' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway crossing a culvert', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'taxiway' }, { waterway: 'ditch', tunnel: 'culvert', layer: -1 });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores an aeroway crossing a building on a different layer', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { building: 'yes', layer: '0.5' });
-        const issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    // warning crossing cases between ways
-    it('flags road crossing road', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'residential' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags road crossing footway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway' });
-        verifySingleCrossingIssue(validate(), { highway: 'crossing' });
-    });
-
-    it('flags road crossing cycleway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'cycleway' });
-        verifySingleCrossingIssue(validate(), { highway: 'crossing' });
-    });
-
-    it('flags road crossing crosswalk', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', crossing: 'marked' });
-        verifySingleCrossingIssue(validate(), { highway: 'crossing', crossing: 'marked' });
-    });
-
-    it('flags road=track crossing footway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'track' }, { highway: 'footway' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags cycleway crossing cycleway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'cycleway' }, { highway: 'cycleway' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags cycleway crossing footway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'cycleway' }, { highway: 'footway' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags footway crossing footway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'footway' }, { highway: 'footway' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags road crossing railway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'rail' });
-        verifySingleCrossingIssue(validate(), { railway: 'level_crossing' });
-    });
-
-    it('flags footway crossing railway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'footway' }, { railway: 'rail' });
-        verifySingleCrossingIssue(validate(), { railway: 'crossing' });
-    });
-
-    it('flags cycleway crossing railway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'cycleway' }, { railway: 'rail' });
-        verifySingleCrossingIssue(validate(), { railway: 'crossing' });
-    });
-
-    it('flags minor road crossing waterway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { waterway: 'river' });
-        verifySingleCrossingIssue(validate(), { ford: 'yes' });
-    });
-
-    it('flags major road crossing waterway', function() {
-        createWaysWithOneCrossingPoint({ highway: 'motorway' }, { waterway: 'river' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags road crossing building', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags railway crossing railway', function() {
-        createWaysWithOneCrossingPoint({ railway: 'rail' }, { railway: 'rail' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags railway crossing waterway', function() {
-        createWaysWithOneCrossingPoint({ railway: 'rail' }, { waterway: 'river' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags road bridge crossing road bridge on the same layer', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { highway: 'tertiary', bridge: 'yes' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags road bridge crossing aqueduct on the same layer', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { waterway: 'canal', bridge: 'aqueduct' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags road tunnel crossing waterway tunnel on the same layer', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential', tunnel: 'yes' }, { waterway: 'canal', tunnel: 'yes' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags railway bridge crossing road bridge on the same layer', function() {
-        createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { railway: 'rail', bridge: 'yes' });
-        verifySingleCrossingIssue(validate(), { railway: 'level_crossing' });
-    });
-
-    it('flags railway crossing building', function() {
-        createWaysWithOneCrossingPoint({ railway: 'rail' }, { building: 'yes' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags waterway crossing waterway', function() {
-        createWaysWithOneCrossingPoint({ waterway: 'canal' }, { waterway: 'canal' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags waterway tunnel crossing waterway tunnel on the same layer', function() {
-        createWaysWithOneCrossingPoint({ waterway: 'canal', tunnel: 'yes' }, { waterway: 'canal', tunnel: 'yes' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags waterway crossing building', function() {
-        createWaysWithOneCrossingPoint({ waterway: 'river' }, { building: 'yes' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags building crossing building', function() {
-        createWaysWithOneCrossingPoint({ building: 'yes' }, { building: 'yes' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags corridor crossing corridor on the same level', function() {
-        createWaysWithOneCrossingPoint({ highway: 'corridor', level: '0' }, { highway: 'corridor', level: '0' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags road crossing road twice', function() {
-        createWaysWithTwoCrossingPoint();
-        var issues = validate();
-        expect(issues).to.have.lengthOf(4);
-        var issue = issues[0];
-        expect(issue.type).to.eql('crossing_ways');
-        expect(issue.entityIds).to.have.lengthOf(2);
-
-        expect(issue.loc).to.have.lengthOf(2);
-        expect(issue.loc[0]).to.eql(1.5);
-        expect(issue.loc[1]).to.eql(1.5);
-
-        issue = issues[1];
-        expect(issue.type).to.eql('crossing_ways');
-        expect(issue.entityIds).to.have.lengthOf(2);
-
-        expect(issue.loc).to.have.lengthOf(2);
-        expect(issue.loc[0]).to.eql(2.5);
-        expect(issue.loc[1]).to.eql(2.5);
-    });
-
-    function createWayAndRelationWithOneCrossingPoint(wayTags, relTags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [1,1]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [2,2]});
-        var w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: wayTags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w1)
-        );
-
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [1,2]});
-        var n4 = Rapid.osmNode({id: 'n-4', loc: [2,1]});
-        var n5 = Rapid.osmNode({id: 'n-5', loc: [3,2]});
-        var n6 = Rapid.osmNode({id: 'n-6', loc: [2,3]});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-3', 'n-4', 'n-5'], tags: {}});
-        var w3 = Rapid.osmWay({id: 'w-3', nodes: ['n-5', 'n-6', 'n-3'], tags: {}});
-        var r1 = Rapid.osmRelation({id: 'r-1', members: [{id: 'w-2', type: 'way'}, {id: 'w-3', type: 'way'}], tags: relTags});
-
-        context.perform(
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(n4),
-            Rapid.actionAddEntity(n5),
-            Rapid.actionAddEntity(n6),
-            Rapid.actionAddEntity(w2),
-            Rapid.actionAddEntity(w3),
-            Rapid.actionAddEntity(r1)
-        );
+    return issues;
+  }
+
+  it('has no errors on init', () => {
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+
+  //
+  //        n-2
+  //         *
+  //         |
+  // n-3 *---|---* n-4
+  //         |
+  //         *
+  //        n-1
+  //
+  function createWaysWithOneCrossingPoint(w1tags = {}, w2tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, -1] });
+    const n2 = Rapid.osmNode({ id: 'n-2', loc: [0,  1] });
+    const w1 = Rapid.osmWay({ id: 'w-1', nodes: ['n-1', 'n-2'], tags: w1tags });
+
+    const n3 = Rapid.osmNode({ id: 'n-3', loc: [-1, 0] });
+    const n4 = Rapid.osmNode({ id: 'n-4', loc: [ 1, 0] });
+    const w2 = Rapid.osmWay({ id: 'w-2', nodes: ['n-3', 'n-4'], tags: w2tags });
+
+    const entities = [n1, n2, n3, n4, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+
+  function verifySingleCrossingIssue(issues, connectionTags) {
+    // each entity must produce an identical issue
+    expect(issues).to.have.lengthOf(2);
+    expect(issues[0].id).to.eql(issues[1].id);
+
+    for (const issue of issues) {
+      expect(issue.type).to.eql('crossing_ways');
+      expect(issue.severity).to.eql('warning');
+      expect(issue.entityIds).to.have.lengthOf(2);
+      expect(issue.loc).to.eql([0, 0]);
+      expect(issue.data.connectionTags).to.eql(connectionTags);
     }
+  }
+
+  it('ignores untagged line crossing untagged line', () => {
+    createWaysWithOneCrossingPoint({}, {});
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road crossing abandoned railway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'abandoned' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road crossing non-rail railway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'yard' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road crossing non-water waterway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { waterway: 'fuel' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road crossing non-building building', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { building: 'no' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road crossing non-routable highway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'services' }, { highway: 'residential' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  // legit crossing cases
+  it('ignores road tunnel crossing road', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential', tunnel: 'yes', layer: '-1' }, { highway: 'residential' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road crossing railway bridge', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'rail', bridge: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road bridge crossing waterway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { waterway: 'river' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road crossing building on different layers', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential', layer: '-1' }, { building: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores railway crossing railway bridge', () => {
+    createWaysWithOneCrossingPoint({ railway: 'rail', bridge: 'yes' }, { railway: 'rail' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores railway bridge crossing railway bridge on different layers', () => {
+    createWaysWithOneCrossingPoint({ railway: 'rail', bridge: 'yes', layer: '2' }, { railway: 'rail', bridge: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores railway crossing waterway tunnel', () => {
+    createWaysWithOneCrossingPoint({ railway: 'rail' }, { waterway: 'river', tunnel: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores railway crossing building on different layers', () => {
+    createWaysWithOneCrossingPoint({ railway: 'rail', layer: '-1' }, { building: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores waterway crossing waterway tunnel', () => {
+    createWaysWithOneCrossingPoint({ waterway: 'canal', tunnel: 'yes' }, { waterway: 'river' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores waterway crossing building on different layers', () => {
+    createWaysWithOneCrossingPoint({ waterway: 'river', layer: '-1' }, { building: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores building crossing building on different layers', () => {
+    createWaysWithOneCrossingPoint({ building: 'yes' }, { building: 'yes', layer: '1' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores corridor crossing corridor on different levels', () => {
+    createWaysWithOneCrossingPoint({ highway: 'corridor', level: '0' }, { highway: 'corridor', level: '1' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores a routable aeroway crossing a non-routable aeroway', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'taxiway' }, { aeroway: 'aerodrome' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway crossing a road tunnel', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'trunk', tunnel: 'yes', layer: '-1' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway crossing a road bridge', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'trunk', bridge: 'yes', layer: '1' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway crossing a rail tunnel', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { railway: 'track', tunnel: 'yes', layer: '-1' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway crossing a rail bridge', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { railway: 'track', bridge: 'yes', layer: '1' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway bridge crossing a road', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway', bridge: 'yes', layer: '2' }, { highway: 'trunk', layer: '1' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway bridge crossing a railway', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway', bridge: 'yes', layer: '1' }, { railway: 'track' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway crossing a culvert', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'taxiway' }, { waterway: 'ditch', tunnel: 'culvert', layer: -1 });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores an aeroway crossing a building on a different layer', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { building: 'yes', layer: '0.5' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  // warning crossing cases between ways
+  it('flags road crossing road', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'residential' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags road crossing footway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway' });
+    verifySingleCrossingIssue(validate(), { highway: 'crossing' });
+  });
+
+  it('flags road crossing cycleway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'cycleway' });
+    verifySingleCrossingIssue(validate(), { highway: 'crossing' });
+  });
+
+  it('flags road crossing crosswalk', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', crossing: 'marked' });
+    verifySingleCrossingIssue(validate(), { highway: 'crossing', crossing: 'marked' });
+  });
+
+  it('flags road=track crossing footway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'track' }, { highway: 'footway' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags cycleway crossing cycleway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'cycleway' }, { highway: 'cycleway' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags cycleway crossing footway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'cycleway' }, { highway: 'footway' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags footway crossing footway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'footway' }, { highway: 'footway' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags road crossing railway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { railway: 'rail' });
+    verifySingleCrossingIssue(validate(), { railway: 'level_crossing' });
+  });
+
+  it('flags footway crossing railway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'footway' }, { railway: 'rail' });
+    verifySingleCrossingIssue(validate(), { railway: 'crossing' });
+  });
+
+  it('flags cycleway crossing railway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'cycleway' }, { railway: 'rail' });
+    verifySingleCrossingIssue(validate(), { railway: 'crossing' });
+  });
+
+  it('flags minor road crossing waterway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { waterway: 'river' });
+    verifySingleCrossingIssue(validate(), { ford: 'yes' });
+  });
+
+  it('flags major road crossing waterway', () => {
+    createWaysWithOneCrossingPoint({ highway: 'motorway' }, { waterway: 'river' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags road crossing building', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags railway crossing railway', () => {
+    createWaysWithOneCrossingPoint({ railway: 'rail' }, { railway: 'rail' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags railway crossing waterway', () => {
+    createWaysWithOneCrossingPoint({ railway: 'rail' }, { waterway: 'river' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags road bridge crossing road bridge on the same layer', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { highway: 'tertiary', bridge: 'yes' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags road bridge crossing aqueduct on the same layer', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { waterway: 'canal', bridge: 'aqueduct' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags road tunnel crossing waterway tunnel on the same layer', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential', tunnel: 'yes' }, { waterway: 'canal', tunnel: 'yes' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags railway bridge crossing road bridge on the same layer', () => {
+    createWaysWithOneCrossingPoint({ highway: 'residential', bridge: 'yes' }, { railway: 'rail', bridge: 'yes' });
+    verifySingleCrossingIssue(validate(), { railway: 'level_crossing' });
+  });
+
+  it('flags railway crossing building', () => {
+    createWaysWithOneCrossingPoint({ railway: 'rail' }, { building: 'yes' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags waterway crossing waterway', () => {
+    createWaysWithOneCrossingPoint({ waterway: 'canal' }, { waterway: 'canal' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags waterway tunnel crossing waterway tunnel on the same layer', () => {
+    createWaysWithOneCrossingPoint({ waterway: 'canal', tunnel: 'yes' }, { waterway: 'canal', tunnel: 'yes' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags waterway crossing building', () => {
+    createWaysWithOneCrossingPoint({ waterway: 'river' }, { building: 'yes' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags building crossing building', () => {
+    createWaysWithOneCrossingPoint({ building: 'yes' }, { building: 'yes' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags corridor crossing corridor on the same level', () => {
+    createWaysWithOneCrossingPoint({ highway: 'corridor', level: '0' }, { highway: 'corridor', level: '0' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags an aeroway crosing another aeroway', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { aeroway: 'taxiway' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags an aeroway crosing a major road', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'motorway' });
+    verifySingleCrossingIssue(validate(), { aeroway: 'aircraft_crossing' });
+  });
+
+  it('flags an aeroway crosing a service road', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'service' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags an aeroway crosing a path', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'corridor' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags an aeroway crosing a railway', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'taxiway' }, { railway: 'disused' });
+    verifySingleCrossingIssue(validate(), { aeroway: 'aircraft_crossing', railway: 'level_crossing' });
+  });
+
+  it('flags an aeroway crosing a waterway', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { waterway: 'canal' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags an aeroway crosing a building', () => {
+    createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { building: 'hangar' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+
+  //
+  //        n-2
+  //         *
+  //         |
+  // n-3 *---|---* n-4
+  //         |   |
+  // n-6 *---|---* n-5
+  //         |
+  //         *
+  //        n-1
+  //
+  function createWaysWithTwoCrossingPoints() {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, -2] });
+    const n2 = Rapid.osmNode({ id: 'n-2', loc: [0,  2] });
+    const w1 = Rapid.osmWay({ id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'residential' }});
+
+    const n3 = Rapid.osmNode({ id: 'n-3', loc: [-1,  1] });
+    const n4 = Rapid.osmNode({ id: 'n-4', loc: [ 1,  1] });
+    const n5 = Rapid.osmNode({ id: 'n-5', loc: [ 1, -1] });
+    const n6 = Rapid.osmNode({ id: 'n-6', loc: [-1, -1] });
+    const w2 = Rapid.osmWay({ id: 'w-2', nodes: ['n-3', 'n-4', 'n-5', 'n-6'], tags: { highway: 'residential' }});
+
+    const entities = [n1, n2, n3, n4, n5, n6, w1, w2];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+  it('flags road crossing road twice', () => {
+    createWaysWithTwoCrossingPoints();
+    const issues = validate();
+    expect(issues).to.have.lengthOf(4);
+
+    let issue = issues[0];
+    expect(issue.type).to.eql('crossing_ways');
+    expect(issue.entityIds).to.eql(['w-1', 'w-2']);
+    expect(issue.loc).to.eql([0, 1]);
+
+    issue = issues[1];
+    expect(issue.type).to.eql('crossing_ways');
+    expect(issue.entityIds).to.eql(['w-1', 'w-2']);
+    expect(issue.loc).to.eql([0, -1]);
+
+    issue = issues[2];
+    expect(issue.type).to.eql('crossing_ways');
+    expect(issue.entityIds).to.eql(['w-2', 'w-1']);
+    expect(issue.loc).to.eql([0, 1]);
+
+    issue = issues[3];
+    expect(issue.type).to.eql('crossing_ways');
+    expect(issue.entityIds).to.eql(['w-2', 'w-1']);
+    expect(issue.loc).to.eql([0, -1]);
+  });
+
+
+  //
+  // n-6 *-------* n-5
+  //     |  n-2  |
+  //     |   *   |
+  //     |   |   |
+  // n-3 *---|---* n-4
+  //         |
+  //         *
+  //        n-1
+  //
+  function createWayAndRelationWithOneCrossingPoint(w1tags = {}, r1tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, -1] });
+    const n2 = Rapid.osmNode({ id: 'n-2', loc: [0,  1] });
+    const w1 = Rapid.osmWay({ id: 'w-1', nodes: ['n-1', 'n-2'], tags: w1tags });
+
+    const n3 = Rapid.osmNode({ id: 'n-3', loc: [-1, 0] });
+    const n4 = Rapid.osmNode({ id: 'n-4', loc: [ 1, 0] });
+    const n5 = Rapid.osmNode({ id: 'n-5', loc: [ 1, 3] });
+    const n6 = Rapid.osmNode({ id: 'n-6', loc: [-1, 3] });
+    const w2 = Rapid.osmWay({ id: 'w-2', nodes: ['n-3', 'n-4', 'n-5'], tags: {} });
+    const w3 = Rapid.osmWay({ id: 'w-3', nodes: ['n-5', 'n-6', 'n-3'], tags: {} });
+    const r1 = Rapid.osmRelation({id: 'r-1', members: [{ id: 'w-2', type: 'way' }, { id: 'w-3', type: 'way' }], tags: r1tags });
+
+    const entities = [n1, n2, n3, n4, n5, n6, w1, w2, w3, r1];
+    graph = new Rapid.Graph(entities);
+    tree = new Rapid.Tree(graph);
+    tree.rebase(entities, true);
+  }
+
+  it('ignores road line crossing relation with building=yes without a type', () => {
+    createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road line crossing type=building relation', () => {
+    createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes', type: 'building' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores road line crossing waterway multipolygon relation', () => {
+    createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { waterway: 'river', type: 'multipolygon' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags road line crossing building multipolygon relation', () => {
+    createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes', type: 'multipolygon' });
+    verifySingleCrossingIssue(validate(), null);
+  });
+
+  it('flags footway line crossing footway multipolygon relation', () => {
+    createWayAndRelationWithOneCrossingPoint({ highway: 'footway' }, { highway: 'footway', type: 'multipolygon' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags road line crossing footway multipolygon relation', () => {
+    createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', type: 'multipolygon' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags railway line crossing footway multipolygon relation', () => {
+    createWayAndRelationWithOneCrossingPoint({ railway: 'tram' }, { highway: 'footway', type: 'multipolygon' });
+    verifySingleCrossingIssue(validate(), {});
+  });
+
+  it('flags waterway line crossing footway multipolygon relation', () => {
+    createWayAndRelationWithOneCrossingPoint({ waterway: 'stream' }, { highway: 'footway', type: 'multipolygon' });
+    verifySingleCrossingIssue(validate(), {});
+  });
 
-    it('ignores road line crossing relation with building=yes without a type', function() {
-        createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road line crossing type=building relation', function() {
-        createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes', type: 'building' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores road line crossing waterway multipolygon relation', function() {
-        createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { waterway: 'river', type: 'multipolygon' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags road line crossing building multipolygon relation', function() {
-        createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes', type: 'multipolygon' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags footway line crossing footway multipolygon relation', function() {
-        createWayAndRelationWithOneCrossingPoint({ highway: 'footway' }, { highway: 'footway', type: 'multipolygon' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags road line crossing footway multipolygon relation', function() {
-        createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', type: 'multipolygon' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags railway line crossing footway multipolygon relation', function() {
-        createWayAndRelationWithOneCrossingPoint({ railway: 'tram' }, { highway: 'footway', type: 'multipolygon' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags waterway line crossing footway multipolygon relation', function() {
-        createWayAndRelationWithOneCrossingPoint({ waterway: 'stream' }, { highway: 'footway', type: 'multipolygon' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags an aeroway crosing another aeroway', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { aeroway: 'taxiway' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags an aeroway crosing a major road', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'motorway' });
-        verifySingleCrossingIssue(validate(), { aeroway: 'aircraft_crossing' });
-    });
-
-    it('flags an aeroway crosing a service road', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'service' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags an aeroway crosing a path', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { highway: 'corridor' });
-        verifySingleCrossingIssue(validate(), {});
-    });
-
-    it('flags an aeroway crosing a railway', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'taxiway' }, { railway: 'disused' });
-        verifySingleCrossingIssue(validate(), { aeroway: 'aircraft_crossing', railway: 'level_crossing' });
-    });
-
-    it('flags an aeroway crosing a waterway', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { waterway: 'canal' });
-        verifySingleCrossingIssue(validate(), null);
-    });
-
-    it('flags an aeroway crosing a building', function() {
-        createWaysWithOneCrossingPoint({ aeroway: 'runway' }, { building: 'hangar' });
-        verifySingleCrossingIssue(validate(), null);
-    });
 });
diff --git a/test/spec/validations/disconnected_way.js b/test/spec/validations/disconnected_way.js
index a89970a6ec..3d6a9a0b2f 100644
--- a/test/spec/validations/disconnected_way.js
+++ b/test/spec/validations/disconnected_way.js
@@ -1,96 +1,152 @@
-describe('validations.disconnected_way', function () {
-    var context;
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
-
-    function createWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w)
-        );
-    }
+describe('validationDisconnectedWay', () => {
+  let graph;
+
+  class MockLocalizationSystem {
+    constructor() {}
+    displayLabel(entity)  { return entity.id; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
 
-    function createConnectingWays(tags1, tags2) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags1});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-1', 'n-3'], tags: tags2});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w),
-            Rapid.actionAddEntity(w2)
-        );
+  class MockContext {
+    constructor() {
+      this._l10n  = new MockLocalizationSystem(this);
+      this.services = new Map();
     }
+    localizationSystem()  { return this._l10n; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
+
+  const context = new MockContext();
+  const validator = Rapid.validationDisconnectedWay(context);
+
+  beforeEach(() => {
+    graph = new Rapid.Graph();     // reset
+  });
 
-    function validate() {
-        var validator = Rapid.validationDisconnectedWay(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
+
+  function validate() {
+    const entities = [ ...graph.base.entities.values() ];
+
+    let issues = [];
+    for (const entity of entities) {
+      issues = issues.concat(validator(entity, graph));
     }
+    return issues;
+  }
+
+  it('has no errors on init', () => {
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+  //
+  //  n-1  *
+  //
+  function createDisconnectedNode(n1tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, 0], tags: n1tags });
+    const entities = [n1];
+    graph = new Rapid.Graph(entities);
+  }
+
+  it('ignores non-routable node', () => {
+    createDisconnectedNode({ amenity: 'bench' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags disconnected routable node', () => {
+    createDisconnectedNode({ highway: 'elevator' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+
+    const issue = issues[0];
+    expect(issue.type).to.eql('disconnected_way');
+    expect(issue.subtype).to.eql('highway');
+    expect(issue.severity).to.eql('warning');
+    expect(issue.entityIds).to.eql(['n-1']);
+  });
+
+
+  //
+  //  n-2  *
+  //       |
+  //  n-1  *
+  //
+  function createDisconnectedWay(w1tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, 0] });
+    const n2 = Rapid.osmNode({ id: 'n-2', loc: [0, 1] });
+    const w1 = Rapid.osmWay({ id: 'w-1', nodes: ['n-1', 'n-2'], tags: w1tags });
+
+    const entities = [n1, n2, w1];
+    graph = new Rapid.Graph(entities);
+  }
+
+  it('ignores non-routable way', () => {
+    createDisconnectedWay({ amenity: 'bench' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores non-routable highway', () => {
+    createDisconnectedWay({ highway: 'services' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags disconnected routable highway', () => {
+    createDisconnectedWay({ highway: 'unclassified' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+
+    const issue = issues[0];
+    expect(issue.type).to.eql('disconnected_way');
+    expect(issue.subtype).to.eql('highway');
+    expect(issue.severity).to.eql('warning');
+    expect(issue.entityIds).to.eql(['w-1']);
+  });
+
+
+  //
+  //  n-2  *
+  //       |
+  //  n-1  *---*  n-3
+  //
+  function createConnectedWays(w1tags = {}, w2tags = {}, n1tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, 0], tags: n1tags });
+    const n2 = Rapid.osmNode({ id: 'n-2', loc: [0, 1] });
+    const n3 = Rapid.osmNode({ id: 'n-3', loc: [1, 0] });
+    const w1 = Rapid.osmWay({ id: 'w-1', nodes: ['n-1', 'n-2'], tags: w1tags });
+    const w2 = Rapid.osmWay({ id: 'w-2', nodes: ['n-1', 'n-3'], tags: w2tags });
+
+    const entities = [n1, n2, n3, w1, w2];
+    graph = new Rapid.Graph(entities);
+  }
+
+  it('flags highway connected only to service area', () => {
+    createConnectedWays({ highway: 'unclassified' }, { highway: 'services' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+
+    const issue = issues[0];
+    expect(issue.type).to.eql('disconnected_way');
+    expect(issue.subtype).to.eql('highway');
+    expect(issue.severity).to.eql('warning');
+    expect(issue.entityIds).to.eql(['w-1']);
+  });
+
+  it('ignores highway connected to entrance vertex', () => {
+    createConnectedWays({ highway: 'unclassified' }, {}, { entrance: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
 
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags disconnected highway', function() {
-        createWay({'highway': 'unclassified'});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('disconnected_way');
-        expect(issue.subtype).to.eql('highway');
-        expect(issue.severity).to.eql('warning');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
-
-    it('flags highway connected only to service area', function() {
-        createConnectingWays({'highway': 'unclassified'}, {'highway': 'services'});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('disconnected_way');
-        expect(issue.subtype).to.eql('highway');
-        expect(issue.severity).to.eql('warning');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
-
-    it('ignores highway with connected entrance vertex', function() {
-
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4], tags: {'entrance': 'yes'}});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: {'highway': 'unclassified'}});
-        var w2 = Rapid.osmWay({id: 'w-2', nodes: ['n-1', 'n-3']});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w),
-            Rapid.actionAddEntity(w2)
-        );
-
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
+  it('ignores highway connected to parking entrance vertex', () => {
+    createConnectedWays({ highway: 'unclassified' }, {}, { amenity: 'parking_entrance' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
 
 });
diff --git a/test/spec/validations/incompatible_source.js b/test/spec/validations/incompatible_source.js
index 10775bd93c..509bff8c4e 100644
--- a/test/spec/validations/incompatible_source.js
+++ b/test/spec/validations/incompatible_source.js
@@ -1,71 +1,51 @@
-describe('validations.incompatible_source', function () {
-    var context;
+describe('validationIncompatibleSource', () => {
 
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
+  class MockLocalizationSystem {
+    constructor() {}
+  }
 
-    function createWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w)
-        );
-    }
-
-    function validate() {
-        var validator = Rapid.validationIncompatibleSource(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
+  class MockContext {
+    constructor() {
+      this._l10n = new MockLocalizationSystem(this);
     }
+    localizationSystem()  { return this._l10n; }
+  }
+
+  const validator = Rapid.validationIncompatibleSource(new MockContext());
+
+
+  it('ignores way with no source tag', () => {
+    const n = Rapid.osmNode({ tags: { amenity: 'cafe', building: 'yes', name: 'Key Largo Café' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores way with okay source tag', () => {
+    const n = Rapid.osmNode({ tags: { amenity: 'cafe', building: 'yes', name: 'Key Largo Café', source: 'survey' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores way with excepted source tag', () => {
+    const n = Rapid.osmNode({ tags: { amenity: 'cafe', building: 'yes', name: 'Key Largo Café', source: 'Google drive' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags way with incompatible source tag', () => {
+    const n = Rapid.osmNode({ tags: { amenity: 'cafe', building: 'yes', name: 'Key Largo Café', source: 'Google Maps' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('incompatible_source');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
+
+  it('does not flag buildings in the google-africa-buildings dataset', () => {
+    const n = Rapid.osmNode({ tags: { building: 'yes', source: 'esri/Google_Africa_Buildings' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
 
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores way with no source tag', function() {
-        createWay({ amenity: 'cafe', building: 'yes', name: 'Key Largo Café'});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores way with okay source tag', function() {
-        createWay({ amenity: 'cafe', building: 'yes', name: 'Key Largo Café', source: 'survey'});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores way with excepted source tag', function() {
-        createWay({ amenity: 'cafe', building: 'yes', name: 'Key Largo Café', source: 'Google drive'});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags way with incompatible source tag', function() {
-        createWay({ amenity: 'cafe', building: 'yes', name: 'Key Largo Café', source: 'Google Maps'});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('incompatible_source');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
-
-    it('does not flag buildings in the google-africa-buildings dataset', function() {
-        createWay({ building: 'yes', source: 'esri/Google_Africa_Buildings' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
 });
diff --git a/test/spec/validations/mismatched_geometry.js b/test/spec/validations/mismatched_geometry.js
index 4128db1824..2050faee43 100644
--- a/test/spec/validations/mismatched_geometry.js
+++ b/test/spec/validations/mismatched_geometry.js
@@ -1,117 +1,141 @@
-describe('validations.mismatched_geometry', function () {
-    var context, _savedAreaKeys;
-
-    beforeEach(function() {
-        _savedAreaKeys = Rapid.osmAreaKeys;
-        context = Rapid.coreContext()
-            .assetPath('../dist/')
-            .init();
-    });
-
-    afterEach(function() {
-        Rapid.osmSetAreaKeys(_savedAreaKeys);
-    });
-
-
-    function createPoint(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4], tags: tags});
-        context.perform(
-            Rapid.actionAddEntity(n1)
-        );
+describe('validationMismatchedGeometry', () => {
+  let graph;
+
+  class MockLocalizationSystem {
+    constructor() {}
+    displayLabel(entity)  { return entity.id; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
+
+  class MockLocationSystem {
+    constructor() {}
+  }
+
+  class MockContext {
+    constructor() {
+      this._l10n      = new MockLocalizationSystem(this);
+      this._locations = new MockLocationSystem(this);
+      this._presets   = new Rapid.PresetSystem(this);
     }
+    localizationSystem()  { return this._l10n; }
+    locationSystem()      { return this._locations; }
+    presetSystem()        { return this._presets; }
+    t()                   { return ''; }
+    tHtml()               { return ''; }
+  }
 
-    function createOpenWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w)
-        );
-    }
+  const context = new MockContext();
+  const validator = Rapid.validationMismatchedGeometry(context);
 
-    function createClosedWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-1'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w)
-        );
-    }
+  beforeEach(() => {
+    graph = new Rapid.Graph();     // reset
+  });
 
-    function validate() {
-        var validator = Rapid.validationMismatchedGeometry(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
-    }
 
+  function validate() {
+    const entities = [ ...graph.base.entities.values() ];
 
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores points', function() {
-        createPoint({ building: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores open way without area tag', function() {
-        createOpenWay({});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores closed way with area tag', function() {
-        createClosedWay({ building: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores open way with tag that allows both lines and areas', function() {
-        createOpenWay({ man_made: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags open way with area tag', function() {
-        Rapid.osmSetAreaKeys({ building: {} });
-        createOpenWay({ building: 'yes' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('mismatched_geometry');
-        expect(issue.subtype).to.eql('area_as_line');
-        expect(issue.severity).to.eql('warning');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
-
-    it('flags open way with both area and line tags', function() {
-        createOpenWay({ area: 'yes', barrier: 'fence' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('mismatched_geometry');
-        expect(issue.subtype).to.eql('area_as_line');
-        expect(issue.severity).to.eql('warning');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
+    let issues = [];
+    for (const entity of entities) {
+      issues = issues.concat(validator(entity, graph));
+    }
+    return issues;
+  }
+
+  it('has no errors on init', () => {
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+
+  //
+  //  n-1  *
+  //
+  function createPoint(n1tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, 0], tags: n1tags });
+    const entities = [n1];
+    graph = new Rapid.Graph(entities);
+  }
+
+
+  //        n-2
+  //         *
+  //        / \
+  //  n-1  *   *  n-3
+  //
+  function createOpenWay(w1tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, 0] });
+    const n2 = Rapid.osmNode({ id: 'n-2', loc: [1, 1] });
+    const n3 = Rapid.osmNode({ id: 'n-3', loc: [2, 0] });
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3'], tags: w1tags });
+    const entities = [n1, n2, n3, w1];
+    graph = new Rapid.Graph(entities);
+  }
+
+
+  //        n-2
+  //         *
+  //        / \
+  //  n-1  *---*  n-3
+  //
+  function createClosedWay(w1tags = {}) {
+    const n1 = Rapid.osmNode({ id: 'n-1', loc: [0, 0] });
+    const n2 = Rapid.osmNode({ id: 'n-2', loc: [1, 1] });
+    const n3 = Rapid.osmNode({ id: 'n-3', loc: [2, 0] });
+    const w1 = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-1'], tags: w1tags });
+    const entities = [n1, n2, n3, w1];
+    graph = new Rapid.Graph(entities);
+  }
+
+
+  it('ignores building mapped as point', () => {
+    createPoint({ building: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores open way without area tag', () => {
+    createOpenWay({});
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores closed way with area tag', () => {
+    createClosedWay({ building: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores open way with tag that allows both lines and areas', () => {
+    createOpenWay({ man_made: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags open way with area tag', () => {
+    Rapid.osmSetAreaKeys({ building: {} });
+    createOpenWay({ building: 'yes' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+
+    const issue = issues[0];
+    expect(issue.type).to.eql('mismatched_geometry');
+    expect(issue.subtype).to.eql('area_as_line');
+    expect(issue.severity).to.eql('warning');
+    expect(issue.entityIds).to.eql(['w-1']);
+  });
+
+  it('flags open way with both area and line tags', () => {
+    createOpenWay({ area: 'yes', barrier: 'fence' });
+    const issues = validate();
+    expect(issues).to.have.lengthOf(1);
+
+    const issue = issues[0];
+    expect(issue.type).to.eql('mismatched_geometry');
+    expect(issue.subtype).to.eql('area_as_line');
+    expect(issue.severity).to.eql('warning');
+    expect(issue.entityIds).to.eql(['w-1']);
+  });
 
 });
diff --git a/test/spec/validations/missing_role.js b/test/spec/validations/missing_role.js
index 6470ac17f3..c878cd24d8 100644
--- a/test/spec/validations/missing_role.js
+++ b/test/spec/validations/missing_role.js
@@ -1,100 +1,88 @@
-describe('validations.missing_role', function () {
-    var context;
+describe('validationMissingRole', () => {
 
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
+  class MockLocalizationSystem {
+    constructor() {}
+  }
 
-    function createWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w)
-        );
+  class MockContext {
+    constructor() {
+      this._l10n = new MockLocalizationSystem(this);
     }
+    localizationSystem() { return this._l10n; }
+  }
 
-    function createRelation(tags, role) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-1']});
-        var r = Rapid.osmRelation({id: 'r-1', members: [{id: 'w-1', role: role}], tags: tags});
+  const validator = Rapid.validationMissingRole(new MockContext());
 
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w),
-            Rapid.actionAddEntity(r)
-        );
-    }
 
-    function validate() {
-        var validator = Rapid.validationMissingRole(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
-    }
+  it('ignores ways with no relations', () => {
+    const w = Rapid.osmWay();
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(0);
+  });
 
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
+  it('ignores member with missing role in non-multipolygon relation', () => {
+    const w = Rapid.osmWay();
+    const r = Rapid.osmRelation({ tags: { type: 'boundary' }, members: [{ id: w.id, role: '' }] });
+    const g = new Rapid.Graph([w, r]);
+    const rIssues = validator(r, g);
+    const wIssues = validator(w, g);
+    expect(rIssues).to.have.lengthOf(0);
+    expect(wIssues).to.have.lengthOf(0);
+  });
 
-    it('ignores way with no relations', function() {
-        createWay({});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
+  it('ignores way with outer role in multipolygon', () => {
+    const w = Rapid.osmWay();
+    const r = Rapid.osmRelation({ tags: { type: 'multipolygon' }, members: [{ id: w.id, role: 'outer' }] });
+    const g = new Rapid.Graph([w, r]);
+    const rIssues = validator(r, g);
+    const wIssues = validator(w, g);
+    expect(rIssues).to.have.lengthOf(0);
+    expect(wIssues).to.have.lengthOf(0);
+  });
 
-    it('ignores way with null role in non-multipolygon relation', function() {
-        createRelation({ type: 'boundary' }, null);
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
+  it('ignores way with inner role in multipolygon', () => {
+    const w = Rapid.osmWay();
+    const r = Rapid.osmRelation({ tags: { type: 'multipolygon' }, members: [{ id: w.id, role: 'inner' }] });
+    const g = new Rapid.Graph([w, r]);
+    const rIssues = validator(r, g);
+    const wIssues = validator(w, g);
+    expect(rIssues).to.have.lengthOf(0);
+    expect(wIssues).to.have.lengthOf(0);
+  });
 
-    it('ignores way with outer role in multipolygon', function() {
-        createRelation({ type: 'multipolygon' }, 'outer');
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
+  it('flags way with missing role in multipolygon', () => {
+    const w = Rapid.osmWay();
+    const r = Rapid.osmRelation({ tags: { type: 'multipolygon' }, members: [{ id: w.id, role: '' }] });
+    const g = new Rapid.Graph([w, r]);
+    const rIssues = validator(r, g);
+    const wIssues = validator(w, g);
+    expect(rIssues).to.have.lengthOf(1);
+    expect(wIssues).to.have.lengthOf(1);
+    expect(rIssues[0].hash).to.eql(wIssues[0].hash);
 
-    it('ignores way with inner role in multipolygon', function() {
-        createRelation({ type: 'multipolygon' }, 'inner');
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
+    const issue = rIssues[0];
+    expect(issue.type).to.eql('missing_role');
+    expect(issue.entityIds).to.have.lengthOf(2);
+    expect(issue.entityIds[0]).to.eql(r.id);
+    expect(issue.entityIds[1]).to.eql(w.id);
+  });
 
-    it('flags way with null role in multipolygon', function() {
-        createRelation({ type: 'multipolygon' }, null);
-        var issues = validate();
-        expect(issues).to.have.lengthOf(2);
-        expect(issues[0].id).to.eql(issues[1].id);
-        var issue = issues[0];
-        expect(issue.type).to.eql('missing_role');
-        expect(issue.entityIds).to.have.lengthOf(2);
-        expect(issue.entityIds[0]).to.eql('r-1');
-        expect(issue.entityIds[1]).to.eql('w-1');
-    });
+  it('flags way with whitespace string role in multipolygon', () => {
+    const w = Rapid.osmWay();
+    const r = Rapid.osmRelation({ tags: { type: 'multipolygon' }, members: [{ id: w.id, role: '  ' }] });
+    const g = new Rapid.Graph([w, r]);
+    const rIssues = validator(r, g);
+    const wIssues = validator(w, g);
+    expect(rIssues).to.have.lengthOf(1);
+    expect(wIssues).to.have.lengthOf(1);
+    expect(rIssues[0].hash).to.eql(wIssues[0].hash);
 
-    it('flags way with whitespace string role in multipolygon', function() {
-        createRelation({ type: 'multipolygon' }, '   ');
-        var issues = validate();
-        expect(issues).to.have.lengthOf(2);
-        expect(issues[0].id).to.eql(issues[1].id);
-        var issue = issues[0];
-        expect(issue.type).to.eql('missing_role');
-        expect(issue.entityIds).to.have.lengthOf(2);
-        expect(issue.entityIds[0]).to.eql('r-1');
-        expect(issue.entityIds[1]).to.eql('w-1');
-    });
+    const issue = rIssues[0];
+    expect(issue.type).to.eql('missing_role');
+    expect(issue.entityIds).to.have.lengthOf(2);
+    expect(issue.entityIds[0]).to.eql(r.id);
+    expect(issue.entityIds[1]).to.eql(w.id);
+  });
 
 });
diff --git a/test/spec/validations/missing_tag.js b/test/spec/validations/missing_tag.js
index d5820afa54..af31871edb 100644
--- a/test/spec/validations/missing_tag.js
+++ b/test/spec/validations/missing_tag.js
@@ -1,125 +1,99 @@
-describe('validations.missing_tag', function () {
-    var context;
+describe('validationMissingTag', () => {
 
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
+  class MockLocalizationSystem {
+    constructor() {}
+  }
 
-    function createWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w)
-        );
-    }
-
-    function createRelation(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-1']});
-        var r = Rapid.osmRelation({id: 'r-1', members: [{id: 'w-1'}], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w),
-            Rapid.actionAddEntity(r)
-        );
+  class MockContext {
+    constructor() {
+      this._l10n = new MockLocalizationSystem(this);
+      this.services = new Map();
     }
-
-    function validate() {
-        var validator = Rapid.validationMissingTag(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
-    }
-
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores way with descriptive tags', function() {
-        createWay({ leisure: 'park' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores multipolygon with descriptive tags', function() {
-        createRelation({ leisure: 'park', type: 'multipolygon' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags no tags', function() {
-        createWay({});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('missing_tag');
-        expect(issue.subtype).to.eql('any');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
-
-    it('flags no descriptive tags', function() {
-        createWay({ name: 'Main Street', source: 'Bing' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('missing_tag');
-        expect(issue.subtype).to.eql('descriptive');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
-
-    it('flags no descriptive tags on multipolygon', function() {
-        createRelation({ name: 'City Park', source: 'Bing', type: 'multipolygon' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('missing_tag');
-        expect(issue.subtype).to.eql('descriptive');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('r-1');
-    });
-
-    it('flags no type tag on relation', function() {
-        createRelation({ name: 'City Park', source: 'Bing', leisure: 'park' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('missing_tag');
-        expect(issue.subtype).to.eql('relation_type');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('r-1');
-    });
-
-    it('ignores highway with classification', function() {
-        createWay({ highway: 'primary' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags highway=road', function() {
-        createWay({ highway: 'road' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('missing_tag');
-        expect(issue.subtype).to.eql('highway_classification');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
+    localizationSystem() { return this._l10n; }
+  }
+
+  const validator = Rapid.validationMissingTag(new MockContext());
+
+
+  it('ignores way with descriptive tags', () => {
+    const w = Rapid.osmWay({ tags: { leisure: 'park' }});
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores multipolygon with descriptive tags', () => {
+    const r = Rapid.osmRelation({ tags: { type: 'multipolygon', leisure: 'park' }, members: [] });
+    const g = new Rapid.Graph([r]);
+    const issues = validator(r, g);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags no tags', () => {
+    const w = Rapid.osmWay({ tags: {} });
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('missing_tag');
+    expect(issue.subtype).to.eql('any');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(w.id);
+  });
+
+  it('flags no descriptive tags on a way', () => {
+    const w = Rapid.osmWay({ tags: { name: 'Main Street', source: 'Bing' } });
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('missing_tag');
+    expect(issue.subtype).to.eql('descriptive');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(w.id);
+  });
+
+  it('flags no descriptive tags on multipolygon', () => {
+    const r = Rapid.osmRelation({ tags: { name: 'City Park', source: 'Bing', type: 'multipolygon' }, members: [] });
+    const g = new Rapid.Graph([r]);
+    const issues = validator(r, g);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('missing_tag');
+    expect(issue.subtype).to.eql('descriptive');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(r.id);
+  });
+
+  it('flags no type tag on relation', () => {
+    const r = Rapid.osmRelation({ tags: { name: 'City Park', source: 'Bing', leisure: 'park' }, members: [] });
+    const g = new Rapid.Graph([r]);
+    const issues = validator(r, g);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('missing_tag');
+    expect(issue.subtype).to.eql('relation_type');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(r.id);
+  });
+
+  it('ignores highway with classification', () => {
+    const w = Rapid.osmWay({ tags: { highway: 'primary' }});
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags highway=road', () => {
+    const w = Rapid.osmWay({ tags: { highway: 'road' }});
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('missing_tag');
+    expect(issue.subtype).to.eql('highway_classification');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(w.id);
+  });
 
 });
diff --git a/test/spec/validations/outdated_tags.js b/test/spec/validations/outdated_tags.js
index 7160be7e0c..251b58e659 100644
--- a/test/spec/validations/outdated_tags.js
+++ b/test/spec/validations/outdated_tags.js
@@ -1,147 +1,89 @@
-describe('validations.outdated_tags', function () {
-    var context;
-
-    before(function() {
-        Rapid.fileFetcher.cache().deprecated = [
-          { old: { highway: 'no' } },
-          { old: { highway: 'ford' }, replace: { ford: '*' } }
-        ];
-    });
-
-    after(function() {
-        Rapid.fileFetcher.cache().deprecated = [];
-    });
-
-    beforeEach(function() {
-        context = Rapid.coreContext()
-            .assetPath('../dist/')
-            .init();
-    });
-
-
-    function createWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(w)
-        );
-    }
-
-    function createRelation(wayTags, relationTags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-1'], tags: wayTags});
-        var r = Rapid.osmRelation({id: 'r-1', members: [{id: 'w-1'}], tags: relationTags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w),
-            Rapid.actionAddEntity(r)
-        );
+describe('validationOutdatedTags', () => {
+
+  class MockLocalizationSystem {
+    constructor() {}
+    t(id) { return id; }
+  }
+
+  class MockLocationSystem {
+    constructor() {}
+  }
+
+  class MockContext {
+    constructor() {
+      this._l10n = new MockLocalizationSystem(this);
+      this._locations = new MockLocationSystem(this);
+      this._presets = new Rapid.PresetSystem(this);
+      this._data = new Rapid.DataLoaderSystem(this);
+      this.services = new Map();
     }
-
-    function validate(validator) {
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
-    }
-
-    it('has no errors on init', function(done) {
-        var validator = Rapid.validationOutdatedTags(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('has no errors on good tags', function(done) {
-        createWay({'highway': 'unclassified'});
-        var validator = Rapid.validationOutdatedTags(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('flags deprecated tag with replacement', function(done) {
-        createWay({'highway': 'ford'});
-        var validator = Rapid.validationOutdatedTags(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('outdated_tags');
-            expect(issue.subtype).to.eql('deprecated_tags');
-            expect(issue.severity).to.eql('warning');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
-
-    it('flags deprecated tag with no replacement', function(done) {
-        createWay({'highway': 'no'});
-        var validator = Rapid.validationOutdatedTags(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('outdated_tags');
-            expect(issue.subtype).to.eql('deprecated_tags');
-            expect(issue.severity).to.eql('warning');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
-
-    it('ignores way with no relations', function(done) {
-        createWay({});
-        var validator = Rapid.validationOutdatedTags(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('ignores multipolygon tagged on the relation', function(done) {
-        createRelation({}, { type: 'multipolygon', building: 'yes' });
-        var validator = Rapid.validationOutdatedTags(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('flags multipolygon tagged on the outer way', function(done) {
-        createRelation({ building: 'yes' }, { type: 'multipolygon' });
-        var validator = Rapid.validationOutdatedTags(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.not.have.lengthOf(0);
-            var issue = issues[0];
-            expect(issue.type).to.eql('outdated_tags');
-            expect(issue.subtype).to.eql('old_multipolygon');
-            expect(issue.entityIds).to.have.lengthOf(2);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            expect(issue.entityIds[1]).to.eql('r-1');
-            done();
-        }, 20);
-    });
+    dataLoaderSystem() { return this._data; }
+    localizationSystem() { return this._l10n; }
+    locationSystem() { return this._locations; }
+    presetSystem() { return this._presets; }
+  }
+
+  const validator = Rapid.validationOutdatedTags(new MockContext());
+
+
+  it('has no errors on good tags', () => {
+    const w = Rapid.osmWay({ tags: { highway: 'unclassified' }});
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags deprecated tag with replacement', () => {
+    const w = Rapid.osmWay({ tags: { highway: 'ford' }});
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('outdated_tags');
+    expect(issue.subtype).to.eql('deprecated_tags');
+    expect(issue.severity).to.eql('warning');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(w.id);
+  });
+
+  it('flags deprecated tag with no replacement', () => {
+    const w = Rapid.osmWay({ tags: { highway: 'no' }});
+    const g = new Rapid.Graph([w]);
+    const issues = validator(w, g);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('outdated_tags');
+    expect(issue.subtype).to.eql('deprecated_tags');
+    expect(issue.severity).to.eql('warning');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(w.id);
+  });
+
+  it('ignores multipolygon tagged on the relation', () => {
+    const w = Rapid.osmWay({ tags: {} });
+    const r = Rapid.osmRelation({ tags: { building: 'yes', type: 'multipolygon' }, members: [{ id: w.id, role: 'outer' }] });
+    const g = new Rapid.Graph([w, r]);
+    const wIssues = validator(w, g);
+    const rIssues = validator(r, g);
+    expect(wIssues).to.have.lengthOf(0);
+    expect(rIssues).to.have.lengthOf(0);
+  });
+
+  it('flags multipolygon tagged on the outer way', () => {
+    const w = Rapid.osmWay({ tags: { building: 'yes' } });
+    const r = Rapid.osmRelation({ tags: { type: 'multipolygon' }, members: [{ id: w.id, role: 'outer' }] });
+    const g = new Rapid.Graph([w, r]);
+    const wIssues = validator(w, g);
+    const rIssues = validator(r, g);
+    expect(rIssues).to.have.lengthOf(0);
+    expect(wIssues).to.have.lengthOf(1);
+
+    const issue = wIssues[0];
+    expect(issue.type).to.eql('outdated_tags');
+    expect(issue.subtype).to.eql('old_multipolygon');
+    expect(issue.entityIds).to.have.lengthOf(2);
+    expect(issue.entityIds[0]).to.eql(w.id);
+    expect(issue.entityIds[1]).to.eql(r.id);
+  });
 
 });
diff --git a/test/spec/validations/private_data.js b/test/spec/validations/private_data.js
index 17f4ba9b39..d47918dd92 100644
--- a/test/spec/validations/private_data.js
+++ b/test/spec/validations/private_data.js
@@ -1,72 +1,49 @@
-describe('validations.private_data', function () {
-    var context;
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
-
-    function createWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w)
-        );
-    }
-
-    function validate() {
-        var validator = Rapid.validationPrivateData(context);
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
-    }
-
-    it('has no errors on init', function() {
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores way with no tags', function() {
-        createWay({});
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores way with phone tag', function() {
-        createWay({ phone: '123-456-7890' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores generic building with phone tag', function() {
-        createWay({ building: 'yes', phone: '123-456-7890' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('ignores guest house with phone tag', function() {
-        createWay({ building: 'house', phone: '123-456-7890', tourism: 'guest_house' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(0);
-    });
-
-    it('flags house with phone tag', function() {
-        createWay({ building: 'house', phone: '123-456-7890' });
-        var issues = validate();
-        expect(issues).to.have.lengthOf(1);
-        var issue = issues[0];
-        expect(issue.type).to.eql('private_data');
-        expect(issue.entityIds).to.have.lengthOf(1);
-        expect(issue.entityIds[0]).to.eql('w-1');
-    });
+describe('validationPrivateData', () => {
+
+  class MockLocalizationSystem {
+    constructor() {}
+  }
+
+  class MockContext {
+    constructor() { this._l10n = new MockLocalizationSystem(this); }
+    localizationSystem() { return this._l10n; }
+  }
+
+  const validator = Rapid.validationPrivateData(new MockContext());
+
+
+  it('ignores way with no tags', () => {
+    const n = Rapid.osmNode({ tags: {} });
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores way with phone tag', () => {
+    const n = Rapid.osmNode({ tags: { phone: '123-456-7890' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores generic building with phone tag', () => {
+    const n = Rapid.osmNode({ tags: { building: 'yes', phone: '123-456-7890' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores guest house with phone tag', () => {
+    const n = Rapid.osmNode({ tags: { building: 'house', phone: '123-456-7890', tourism: 'guest_house' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags house with phone tag', () => {
+    const n = Rapid.osmNode({ tags: { building: 'house', phone: '123-456-7890' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('private_data');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
 
 });
diff --git a/test/spec/validations/suspicious_name.js b/test/spec/validations/suspicious_name.js
index ec4e1a6113..b813b64362 100644
--- a/test/spec/validations/suspicious_name.js
+++ b/test/spec/validations/suspicious_name.js
@@ -1,227 +1,134 @@
-describe('validations.suspicious_name', function () {
-    var context;
-
-    before(function() {
-        Rapid.services.nsi = Rapid.serviceNsi;
-        Rapid.fileFetcher.cache().nsi_presets = { presets: {} };
-        Rapid.fileFetcher.cache().nsi_features = { type: 'FeatureCollection', features: [] };
-        Rapid.fileFetcher.cache().nsi_dissolved = { dissolved: {} };
-        Rapid.fileFetcher.cache().nsi_replacements = { replacements: {} };
-
-        Rapid.fileFetcher.cache().nsi_trees = {
-          trees: {
-            brands: {
-              mainTag: 'brand:wikidata'
-            }
-          }
-        };
-        Rapid.fileFetcher.cache().nsi_data = {
-          nsi: {
-            'brands/shop/supermarket': {
-              properties: {
-                path: 'brands/shop/supermarket',
-                exclude: {
-                  generic: ['^(mini|super)?\\s?(market|mart|mercado)( municipal)?$' ],
-                  named: ['^(famiglia cooperativa|семейный)$']
-                }
-              }
-            }
-          }
-        };
-        Rapid.fileFetcher.cache().nsi_generics = {
-          genericWords: ['^stores?$']
-        };
-    });
-
-    after(function() {
-        delete Rapid.services.nsi;
-    });
-
-    beforeEach(function() {
-        context = Rapid.coreContext().assetPath('../dist/').init();
-    });
-
-    function createWay(tags) {
-        var n1 = Rapid.osmNode({id: 'n-1', loc: [4,4]});
-        var n2 = Rapid.osmNode({id: 'n-2', loc: [4,5]});
-        var n3 = Rapid.osmNode({id: 'n-3', loc: [5,5]});
-        var w = Rapid.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3'], tags: tags});
-
-        context.perform(
-            Rapid.actionAddEntity(n1),
-            Rapid.actionAddEntity(n2),
-            Rapid.actionAddEntity(n3),
-            Rapid.actionAddEntity(w)
-        );
-    }
+describe('validationSuspiciousName', () => {
 
-    function validate(validator) {
-        var changes = context.history().changes();
-        var entities = changes.modified.concat(changes.created);
-        var issues = [];
-        entities.forEach(function(entity) {
-            issues = issues.concat(validator(entity, context.graph()));
-        });
-        return issues;
+  class MockNsi {
+    constructor() {
+      this.status = 'ok';
+    }
+    isGenericName(tags) {
+      const name = tags.name ?? '';
+      // simulate global exclude
+      if (/^stores?$/.test(name)) return true;
+      // simulate category exclude
+      if (/^(mini|super)?\s?(market|mart|mercado)( municipal)?$/.test(name)) return true;
+      return false;
     }
+  }
 
-    it('has no errors on init', function(done) {
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('ignores way with no tags', function(done) {
-        createWay({});
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('ignores feature with no name', function(done) {
-        createWay({ shop: 'supermarket' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('ignores feature with a specific name', function(done) {
-        createWay({ shop: 'supermarket', name: 'Lou\'s' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('ignores feature with a specific name that includes a generic name', function(done) {
-        createWay({ shop: 'supermarket', name: 'Lou\'s Store' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('ignores feature matching excludeNamed pattern in name-suggestion-index', function(done) {
-        createWay({ shop: 'supermarket', name: 'famiglia cooperativa' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('flags feature matching a excludeGeneric pattern in name-suggestion-index', function(done) {
-        createWay({ shop: 'supermarket', name: 'super mercado' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('suspicious_name');
-            expect(issue.subtype).to.eql('generic_name');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
-
-    it('flags feature matching a global exclude pattern in name-suggestion-index', function(done) {
-        createWay({ shop: 'supermarket', name: 'store' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('suspicious_name');
-            expect(issue.subtype).to.eql('generic_name');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
-
-    it('flags feature with a name that is just a defining tag key', function(done) {
-        createWay({ amenity: 'drinking_water', name: 'Amenity' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('suspicious_name');
-            expect(issue.subtype).to.eql('generic_name');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
-
-    it('flags feature with a name that is just a defining tag value', function(done) {
-        createWay({ shop: 'red_bicycle_emporium', name: 'Red Bicycle Emporium' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('suspicious_name');
-            expect(issue.subtype).to.eql('generic_name');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
-
-    it('ignores feature with a non-matching `not:name` tag', function(done) {
-        createWay({ shop: 'supermarket', name: 'Lou\'s', 'not:name': 'Lous' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(0);
-            done();
-        }, 20);
-    });
-
-    it('flags feature with a matching `not:name` tag', function(done) {
-        createWay({ shop: 'supermarket', name: 'Lous', 'not:name': 'Lous' });
-        var validator = Rapid.validationSuspiciousName(context);
-        window.setTimeout(function() {   // async, so data will be available
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('suspicious_name');
-            expect(issue.subtype).to.eql('not_name');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
-
-    it('flags feature with a matching a semicolon-separated `not:name` tag', function(done) {
-        createWay({ shop: 'supermarket', name: 'Lous', 'not:name': 'Louis\';Lous;Louis\'s' });
-        window.setTimeout(function() {   // async, so data will be available
-            var validator = Rapid.validationSuspiciousName(context);
-            var issues = validate(validator);
-            expect(issues).to.have.lengthOf(1);
-            var issue = issues[0];
-            expect(issue.type).to.eql('suspicious_name');
-            expect(issue.subtype).to.eql('not_name');
-            expect(issue.entityIds).to.have.lengthOf(1);
-            expect(issue.entityIds[0]).to.eql('w-1');
-            done();
-        }, 20);
-    });
+  class MockLocalizationSystem {
+    constructor() {}
+  }
+
+  class MockContext {
+    constructor() {
+      this._l10n = new MockLocalizationSystem(this);
+      this.services = new Map().set('nsi', new MockNsi(this));
+    }
+    localizationSystem() { return this._l10n; }
+  }
+
+
+  const validator = Rapid.validationSuspiciousName(new MockContext());
+
+  it('ignores feature with no tags', () => {
+    const n = Rapid.osmNode();
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores feature with no name', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores feature with a specific name', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'Lou\'s' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores feature with a specific name that includes a generic name', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'Lou\'s Store' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('ignores feature matching excludeNamed pattern in name-suggestion-index', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'famiglia cooperativa' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags feature matching a excludeGeneric pattern in name-suggestion-index', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'super mercado' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('suspicious_name');
+    expect(issue.subtype).to.eql('generic_name');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
+
+  it('flags feature matching a global exclude pattern in name-suggestion-index', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'store' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('suspicious_name');
+    expect(issue.subtype).to.eql('generic_name');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
+
+  it('flags feature with a name that is just a defining tag key', () => {
+    const n = Rapid.osmNode({ tags: { amenity: 'drinking_water', name: 'Amenity' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('suspicious_name');
+    expect(issue.subtype).to.eql('generic_name');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
+
+  it('flags feature with a name that is just a defining tag value', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'red_bicycle_emporium', name: 'Red Bicycle Emporium' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('suspicious_name');
+    expect(issue.subtype).to.eql('generic_name');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
+
+  it('ignores feature with a non-matching `not:name` tag', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'Lou\'s', 'not:name': 'Lous' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(0);
+  });
+
+  it('flags feature with a matching `not:name` tag', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'Lous', 'not:name': 'Lous' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('suspicious_name');
+    expect(issue.subtype).to.eql('not_name');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
+
+  it('flags feature with a matching a semicolon-separated `not:name` tag', () => {
+    const n = Rapid.osmNode({ tags: { shop: 'supermarket', name: 'Lous', 'not:name': 'Louis\';Lous;Louis\'s' }});
+    const issues = validator(n);
+    expect(issues).to.have.lengthOf(1);
+    const issue = issues[0];
+    expect(issue.type).to.eql('suspicious_name');
+    expect(issue.subtype).to.eql('not_name');
+    expect(issue.entityIds).to.have.lengthOf(1);
+    expect(issue.entityIds[0]).to.eql(n.id);
+  });
 
 });