Improve slice script, formatting

scripts/generateCache.ts

@@ -24,6 +24,7 @@ import {GeoOperations} from "../Logic/GeoOperations";
 import SimpleMetaTaggers from "../Logic/SimpleMetaTagger";
 import FilteringFeatureSource from "../Logic/FeatureSource/Sources/FilteringFeatureSource";
 import Loc from "../Models/Loc";
+
 ScriptUtils.fixUtils()
 
 function createOverpassObject(theme: LayoutConfig, relationTracker: RelationsTracker, backend: string) {
@@ -182,6 +183,7 @@ function sliceToTiles(allFeatures: FeatureSource, theme: LayoutConfig, relations
 
     const indexedFeatures: Map<string, any> = new Map<string, any>()
     let indexisBuilt = false;
+
     function buildIndex() {
         for (const ff of allFeatures.features.data) {
             const f = ff.feature
@@ -227,7 +229,6 @@ function sliceToTiles(allFeatures: FeatureSource, theme: LayoutConfig, relations
             });
 
 
-
         while (SimpleMetaTaggers.country.runningTasks.size > 0) {
             console.log("Still waiting for ", SimpleMetaTaggers.country.runningTasks.size, " features which don't have a country yet")
             await ScriptUtils.sleep(1)
@@ -376,8 +377,6 @@ async function main(args: string[]) {
     const lon1 = Number(args[6])
 
 
-
-
     const tileRange = Tiles.TileRangeBetween(zoomlevel, lat0, lon0, lat1, lon1)
 
     if (tileRange.total === 0) {

scripts/generateLayerOverview.ts

@@ -6,7 +6,8 @@ import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
 import Constants from "../Models/Constants";
 import {
     DesugaringContext,
-    PrepareLayer, PrepareTheme,
+    PrepareLayer,
+    PrepareTheme,
     ValidateLayer,
     ValidateThemeAndLayers
 } from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
@@ -94,6 +95,32 @@ class LayerOverviewUtils {
         return dict;
     }
 
+    main(_: string[]) {
+
+        const licensePaths = new Set<string>()
+        for (const i in licenses) {
+            licensePaths.add(licenses[i].path)
+        }
+
+        const sharedLayers = this.buildLayerIndex(licensePaths);
+        const sharedThemes = this.buildThemeIndex(licensePaths, sharedLayers)
+
+        writeFileSync("./assets/generated/known_layers_and_themes.json", JSON.stringify({
+            "layers": Array.from(sharedLayers.values()),
+            "themes": Array.from(sharedThemes.values())
+        }))
+
+        writeFileSync("./assets/generated/known_layers.json", JSON.stringify(Array.from(sharedLayers.values())))
+
+        writeFileSync('./assets/themes/mapcomplete-changes/icons-mapping.txt', JSON.stringify(
+            Array.from(sharedThemes.values()).map(th => ({
+                if: "theme=" + th.id,
+                then: th.icon
+            }))
+        ))
+
+
+    }
 
     private buildLayerIndex(knownImagePaths: Set<string>): Map<string, LayerConfigJson> {
         // First, we expand and validate all builtin layers. These are written to assets/generated/layers
@@ -126,7 +153,6 @@ class LayerOverviewUtils {
         return sharedLayers;
     }
 
-
     private buildThemeIndex(knownImagePaths: Set<string>, sharedLayers: Map<string, LayerConfigJson>): Map<string, LayoutConfigJson> {
         console.log("   ---------- VALIDATING BUILTIN THEMES ---------")
         const themeFiles = ScriptUtils.getThemeFiles();
@@ -160,24 +186,6 @@ class LayerOverviewUtils {
         return fixed;
 
     }
-
-    main(_: string[]) {
-
-        const licensePaths = new Set<string>()
-        for (const i in licenses) {
-            licensePaths.add(licenses[i].path)
-        }
-
-        const sharedLayers = this.buildLayerIndex(licensePaths);
-        const sharedThemes = this.buildThemeIndex(licensePaths, sharedLayers)
-
-        writeFileSync("./assets/generated/known_layers_and_themes.json", JSON.stringify({
-            "layers": Array.from(sharedLayers.values()),
-            "themes": Array.from(sharedThemes.values())
-        }))
-
-        writeFileSync("./assets/generated/known_layers.json", JSON.stringify(Array.from(sharedLayers.values())))
-    }
 }
 
 new LayerOverviewUtils().main(process.argv)

scripts/slice.ts

@@ -3,6 +3,7 @@ import TiledFeatureSource from "../Logic/FeatureSource/TiledFeatureSource/TiledF
 import StaticFeatureSource from "../Logic/FeatureSource/Sources/StaticFeatureSource";
 import * as readline from "readline";
 import ScriptUtils from "./ScriptUtils";
+import {Utils} from "../Utils";
 
 /**
  * This script slices a big newline-delimeted geojson file into tiled geojson 
@@ -103,16 +104,23 @@ async function main(args: string[]) {
 
     let allFeatures: any [];
     if (inputFile.endsWith(".geojson")) {
+        console.log("Detected geojson")
         allFeatures = await readFeaturesFromGeoJson(inputFile)
     } else {
+        console.log("Loading as newline-delimited features")
         allFeatures = await readFeaturesFromLineDelimitedJsonFile(inputFile)
     }
+    allFeatures = Utils.NoNull(allFeatures)
 
 
     console.log("Loaded all", allFeatures.length, "points")
 
     const keysToRemove = ["STRAATNMID", "GEMEENTE", "POSTCODE"]
     for (const f of allFeatures) {
+        if(f.properties === null){
+            console.log("Got a feature without properties!", f)
+            continue
+        }
         for (const keyToRm of keysToRemove) {
             delete f.properties[keyToRm]
         }