Merge branch 'feature/android-capacitator' of github.com:pietervdvn/MapComplete into feature/android-capacitator

scripts/build.sh

@@ -24,6 +24,8 @@ else
   exit 1
 fi
 
+cp node_modules/name-suggestion-index/dist/nsi.json public/assets/data/nsi
+cp node_modules/name-suggestion-index/dist/wikidata.min.json public/assets/data/nsi
 
 export NODE_OPTIONS=--max-old-space-size=20000
 which vite

scripts/generateLayerOverview.ts

@@ -119,7 +119,7 @@ class AddIconSummary extends DesugaringStep<{ raw: LayerConfigJson; parsed: Laye
         const pointRendering: PointRenderingConfig = layerConfig.mapRendering.find((pr) =>
             pr.location.has("point")
         )
-        const defaultTags = layerConfig.GetBaseTags()
+        const defaultTags = layerConfig.baseTags
         fixed["_layerIcon"] = Utils.NoNull(
             (pointRendering?.marker ?? []).map((i) => {
                 const icon = i.icon?.GetRenderValue(defaultTags)?.txt

scripts/generateLayouts.ts

@@ -341,7 +341,7 @@ class GenerateLayouts extends Script {
             "https://pietervdvn.goatcounter.com",
             "https://api.panoramax.xyz",
             "https://panoramax.mapcomplete.org",
-            "https://data.velopark.be"
+            "https://data.velopark.be",
         ].concat(...(await this.eliUrls()))
 
         SpecialVisualizations.specialVisualizations.forEach((sv) => {

scripts/velopark/compare.ts

@@ -30,7 +30,7 @@ class Compare extends Script {
             Object.keys(osmParking.properties).concat(Object.keys(veloParking.properties))
         )
         for (const key of allKeys) {
-            if (["name", "numberOfLevels"].indexOf(key) >= 0) {
+            if (["name", "numberOfLevels", "id"].indexOf(key) >= 0) {
                 continue // We don't care about these tags
             }
             if (osmParking.properties[key] === veloParking.properties[key]) {
@@ -108,7 +108,19 @@ class Compare extends Script {
             distanceBins[bin] += 1
         }
 
-        fs.writeFileSync("report_diff.json", JSON.stringify({ diffs, distanceBins }, null, "  "))
+        fs.writeFileSync(
+            "report_diff.json",
+            JSON.stringify(
+                {
+                    diffs,
+                    distanceBins,
+                    binSize,
+                    "#binsize": "Every bin increases with this amount in meter",
+                },
+                null,
+                "  "
+            )
+        )
         console.log("Written report_diff.json")
     }
 

scripts/velopark/veloParkToGeojson.ts

@@ -256,7 +256,7 @@ class VeloParkToGeojson extends Script {
         VeloParkToGeojson.exportExtraAmenities(allVelopark)
         await VeloParkToGeojson.createDiff(allVelopark)
         console.log(
-            "Use vite-node scripts/velopark/compare.ts to compare the results and generate a diff file"
+            "Use \nvite-node scripts/velopark/compare.ts -- velopark_all_.geojson osm_with_velopark_link_.geojson\n to compare the results and generate a diff file"
         )
     }
 }