Refactoring: port import flow

Logic/FeatureSource/Sources/LayoutSource.ts

@@ -10,6 +10,7 @@ import FeatureSourceMerger from "./FeatureSourceMerger"
 import DynamicGeoJsonTileSource from "../TiledFeatureSource/DynamicGeoJsonTileSource"
 import {BBox} from "../../BBox"
 import LocalStorageFeatureSource from "../TiledFeatureSource/LocalStorageFeatureSource"
+import FullNodeDatabaseSource from "../TiledFeatureSource/FullNodeDatabaseSource";
 
 /**
  * This source will fetch the needed data from various sources for the given layout.
@@ -27,7 +28,8 @@ export default class LayoutSource extends FeatureSourceMerger {
         featureSwitches: FeatureSwitchState,
         mapProperties: { bounds: Store<BBox>; zoom: Store<number> },
         backend: string,
-        isDisplayed: (id: string) => Store<boolean>
+        isDisplayed: (id: string) => Store<boolean>,
+        fullNodeDatabaseSource?: FullNodeDatabaseSource
     ) {
         const { bounds, zoom } = mapProperties
         // remove all 'special' layers
@@ -39,6 +41,7 @@ export default class LayoutSource extends FeatureSourceMerger {
             (l) =>
                 new LocalStorageFeatureSource(backend, l.id, 15, mapProperties, {
                     isActive: isDisplayed(l.id),
+                    maxAge: l.maxAgeOfCache
                 })
         )
 
@@ -55,7 +58,8 @@ export default class LayoutSource extends FeatureSourceMerger {
             bounds,
             zoom,
             backend,
-            featureSwitches
+            featureSwitches,
+            fullNodeDatabaseSource
         )
         const geojsonSources: FeatureSource[] = geojsonlayers.map((l) =>
             LayoutSource.setupGeojsonSource(l, mapProperties, isDisplayed(l.id))
@@ -96,7 +100,8 @@ export default class LayoutSource extends FeatureSourceMerger {
         bounds: Store<BBox>,
         zoom: Store<number>,
         backend: string,
-        featureSwitches: FeatureSwitchState
+        featureSwitches: FeatureSwitchState,
+        fullNodeDatabase: FullNodeDatabaseSource
     ): OsmFeatureSource | undefined {
         if (osmLayers.length == 0) {
             return undefined
@@ -121,8 +126,8 @@ export default class LayoutSource extends FeatureSourceMerger {
             bounds,
             backend,
             isActive,
-            patchRelations: true
-
+            patchRelations: true,
+            fullNodeDatabase
         })
     }
 

Logic/FeatureSource/Sources/OsmFeatureSource.ts

@@ -7,6 +7,7 @@ import { TagsFilter } from "../../Tags/TagsFilter"
 import { Feature } from "geojson"
 import FeatureSourceMerger from "../Sources/FeatureSourceMerger"
 import OsmObjectDownloader from "../../Osm/OsmObjectDownloader"
+import FullNodeDatabaseSource from "../TiledFeatureSource/FullNodeDatabaseSource";
 
 /**
  * If a tile is needed (requested via the UIEventSource in the constructor), will download the appropriate tile and pass it via 'handleTile'
@@ -16,9 +17,19 @@ export default class OsmFeatureSource extends FeatureSourceMerger {
     private readonly isActive: Store<boolean>
     private readonly _backend: string
     private readonly allowedTags: TagsFilter
+    private options: {
+        bounds: Store<BBox>
+        readonly allowedFeatures: TagsFilter
+        backend?: "https://openstreetmap.org/" | string
+        /**
+         * If given: this featureSwitch will not update if the store contains 'false'
+         */
+        isActive?: Store<boolean>,
+        patchRelations?: true | boolean,
+        fullNodeDatabase?: FullNodeDatabaseSource
+    };
 
     public readonly isRunning: UIEventSource<boolean> = new UIEventSource<boolean>(false)
-    public rawDataHandlers: ((osmJson: any, tileIndex: number) => void)[] = []
 
     private readonly _downloadedTiles: Set<number> = new Set<number>()
     private readonly _downloadedData: Feature[][] = []
@@ -35,9 +46,11 @@ export default class OsmFeatureSource extends FeatureSourceMerger {
          * If given: this featureSwitch will not update if the store contains 'false'
          */
         isActive?: Store<boolean>,
-        patchRelations?: true | boolean
+        patchRelations?: true | boolean,
+        fullNodeDatabase?: FullNodeDatabaseSource
     }) {
         super()
+        this.options = options;
         this._bounds = options.bounds
         this.allowedTags = options.allowedFeatures
         this.isActive = options.isActive ?? new ImmutableStore(true)
@@ -119,7 +132,7 @@ export default class OsmFeatureSource extends FeatureSourceMerger {
         return feature
     }
 
-    private async LoadTile(z, x, y): Promise<void> {
+    private async LoadTile(z: number, x: number, y: number): Promise<void> {
         console.log("OsmFeatureSource: loading ", z, x, y, "from", this._backend)
         if (z >= 22) {
             throw "This is an absurd high zoom level"
@@ -141,9 +154,7 @@ export default class OsmFeatureSource extends FeatureSourceMerger {
         try {
             const osmJson = await Utils.downloadJsonCached(url, 2000)
             try {
-                this.rawDataHandlers.forEach((handler) =>
-                    handler(osmJson, Tiles.tile_index(z, x, y))
-                )
+                this.options?.fullNodeDatabase?.handleOsmJson(osmJson, z, x, y)
                 let features = <Feature<any, { id: string }>[]>OsmToGeoJson(
                     osmJson,
                     // @ts-ignore
@@ -181,7 +192,7 @@ export default class OsmFeatureSource extends FeatureSourceMerger {
                 y,
                 "due to",
                 e,
-                "; retrying with smaller bounds"
+                e === "rate limited" ? "; stopping now" : "; retrying with smaller bounds"
             )
             if (e === "rate limited") {
                 return