Merge branch 'master' into develop

scripts/generateLayouts.ts

@@ -1,24 +1,21 @@
-import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFile, writeFileSync } from "fs"
+import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFile, writeFileSync } from "fs";
-import Locale from "../src/UI/i18n/Locale"
+import Locale from "../src/UI/i18n/Locale";
-import Translations from "../src/UI/i18n/Translations"
+import Translations from "../src/UI/i18n/Translations";
-import { Translation } from "../src/UI/i18n/Translation"
+import { Translation } from "../src/UI/i18n/Translation";
-import all_known_layouts from "../src/assets/generated/known_themes.json"
+import all_known_layouts from "../src/assets/generated/known_themes.json";
-import { LayoutConfigJson } from "../src/Models/ThemeConfig/Json/LayoutConfigJson"
+import { LayoutConfigJson } from "../src/Models/ThemeConfig/Json/LayoutConfigJson";
-import LayoutConfig from "../src/Models/ThemeConfig/LayoutConfig"
+import LayoutConfig from "../src/Models/ThemeConfig/LayoutConfig";
-import xml2js from "xml2js"
+import xml2js from "xml2js";
-import ScriptUtils from "./ScriptUtils"
+import ScriptUtils from "./ScriptUtils";
-import { Utils } from "../src/Utils"
+import { Utils } from "../src/Utils";
-import SpecialVisualizations from "../src/UI/SpecialVisualizations"
+import SpecialVisualizations from "../src/UI/SpecialVisualizations";
-import Constants from "../src/Models/Constants"
+import Constants from "../src/Models/Constants";
-import {
+import { AvailableRasterLayers, RasterLayerPolygon } from "../src/Models/RasterLayers";
-    AvailableRasterLayers,
+import { ImmutableStore } from "../src/Logic/UIEventSource";
-    EditorLayerIndexProperties,
+import * as crypto from "crypto";
-    RasterLayerPolygon,
+import * as eli from "../src/assets/editor-layer-index.json";
-} from "../src/Models/RasterLayers"
+import * as eli_global from "../src/assets/global-raster-layers.json";
-import { ImmutableStore } from "../src/Logic/UIEventSource"
+
-import * as crypto from "crypto"
-import * as eli from "../src/assets/editor-layer-index.json"
-import dom from "svelte/types/compiler/compile/render_dom"
 const sharp = require("sharp")
 const template = readFileSync("theme.html", "utf8")
 const codeTemplate = readFileSync("src/index_theme.ts.template", "utf8")
@@ -219,7 +216,8 @@ function eliUrls(): string[] {
     }
     const urls: string[] = []
     const regex = /{switch:([^}]+)}/
-    for (const feature of eli.features) {
+    const rasterLayers = [...AvailableRasterLayers.vectorLayers, ...eli.features, ...eli_global.layers.map(properties => ({properties})) ]
+  for (const feature of rasterLayers) {
         const url = (<RasterLayerPolygon>feature).properties.url
         const match = url.match(regex)
         if (match) {
@@ -245,8 +243,6 @@ function generateCsp(
         ...Constants.defaultOverpassUrls,
         Constants.countryCoderEndpoint,
         Constants.nominatimEndpoint,
-        AvailableRasterLayers.maptilerCarto.properties.url,
-        AvailableRasterLayers.maptilerDefaultLayer.properties.url,
         "https://api.openstreetmap.org",
         "https://pietervdvn.goatcounter.com",
     ]

src/Models/RasterLayers.ts

@@ -1,41 +1,41 @@
-import { Feature, Polygon } from "geojson"
+import { Feature, Polygon } from "geojson";
-import * as editorlayerindex from "../assets/editor-layer-index.json"
+import * as editorlayerindex from "../assets/editor-layer-index.json";
-import * as globallayers from "../assets/global-raster-layers.json"
+import * as globallayers from "../assets/global-raster-layers.json";
-import { BBox } from "../Logic/BBox"
+import { BBox } from "../Logic/BBox";
-import { Store, Stores } from "../Logic/UIEventSource"
+import { Store, Stores } from "../Logic/UIEventSource";
-import { GeoOperations } from "../Logic/GeoOperations"
+import { GeoOperations } from "../Logic/GeoOperations";
-import { RasterLayerProperties } from "./RasterLayerProperties"
+import { RasterLayerProperties } from "./RasterLayerProperties";
 
 export class AvailableRasterLayers {
   public static EditorLayerIndex: (Feature<Polygon, EditorLayerIndexProperties> &
-        RasterLayerPolygon)[] = <any>editorlayerindex.features
+    RasterLayerPolygon)[] = <any>editorlayerindex.features;
   public static globalLayers: RasterLayerPolygon[] = globallayers.layers.map(
     (properties) =>
       <RasterLayerPolygon>{
         type: "Feature",
         properties,
-                geometry: BBox.global.asGeometry(),
+        geometry: BBox.global.asGeometry()
       }
-    )
+  );
   public static readonly osmCartoProperties: RasterLayerProperties = {
     id: "osm",
     name: "OpenStreetMap",
     url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
     attribution: {
       text: "OpenStreetMap",
-            url: "https://openStreetMap.org/copyright",
+      url: "https://openStreetMap.org/copyright"
     },
     best: true,
     max_zoom: 19,
     min_zoom: 0,
-        category: "osmbasedmap",
+    category: "osmbasedmap"
-    }
+  };
 
   public static readonly osmCarto: RasterLayerPolygon = {
     type: "Feature",
     properties: AvailableRasterLayers.osmCartoProperties,
-        geometry: BBox.global.asGeometry(),
+    geometry: BBox.global.asGeometry()
-    }
+  };
 
   public static readonly maptilerDefaultLayer: RasterLayerPolygon = {
     type: "Feature",
@@ -47,11 +47,11 @@ export class AvailableRasterLayers {
       type: "vector",
       attribution: {
         text: "Maptiler",
-                url: "https://www.maptiler.com/copyright/",
+        url: "https://www.maptiler.com/copyright/"
-            },
-        },
-        geometry: BBox.global.asGeometry(),
       }
+    },
+    geometry: BBox.global.asGeometry()
+  };
 
   public static readonly maptilerCarto: RasterLayerPolygon = {
     type: "Feature",
@@ -63,11 +63,11 @@ export class AvailableRasterLayers {
       type: "vector",
       attribution: {
         text: "Maptiler",
-                url: "https://www.maptiler.com/copyright/",
+        url: "https://www.maptiler.com/copyright/"
-            },
-        },
-        geometry: BBox.global.asGeometry(),
       }
+    },
+    geometry: BBox.global.asGeometry()
+  };
 
   public static readonly maptilerBackdrop: RasterLayerPolygon = {
     type: "Feature",
@@ -79,11 +79,11 @@ export class AvailableRasterLayers {
       type: "vector",
       attribution: {
         text: "Maptiler",
-                url: "https://www.maptiler.com/copyright/",
+        url: "https://www.maptiler.com/copyright/"
-            },
-        },
-        geometry: BBox.global.asGeometry(),
       }
+    },
+    geometry: BBox.global.asGeometry()
+  };
   public static readonly americana: RasterLayerPolygon = {
     type: "Feature",
     properties: {
@@ -94,45 +94,47 @@ export class AvailableRasterLayers {
       type: "vector",
       attribution: {
         text: "Americana",
-                url: "https://github.com/ZeLonewolf/openstreetmap-americana/",
+        url: "https://github.com/ZeLonewolf/openstreetmap-americana/"
-            },
-        },
-        geometry: BBox.global.asGeometry(),
       }
+    },
+    geometry: BBox.global.asGeometry()
+  };
+
+  public static readonly vectorLayers = [
+    AvailableRasterLayers.maptilerDefaultLayer,
+    AvailableRasterLayers.osmCarto,
+    AvailableRasterLayers.maptilerCarto,
+    AvailableRasterLayers.maptilerBackdrop,
+    AvailableRasterLayers.americana
+  ];
 
   public static layersAvailableAt(
     location: Store<{ lon: number; lat: number }>
   ): Store<RasterLayerPolygon[]> {
     const availableLayersBboxes = Stores.ListStabilized(
       location.mapD((loc) => {
-                const lonlat: [number, number] = [loc.lon, loc.lat]
+        const lonlat: [number, number] = [loc.lon, loc.lat];
         return AvailableRasterLayers.EditorLayerIndex.filter((eliPolygon) =>
           BBox.get(eliPolygon).contains(lonlat)
-                )
+        );
       })
-        )
+    );
     const available = Stores.ListStabilized(
       availableLayersBboxes.map((eliPolygons) => {
-                const loc = location.data
+        const loc = location.data;
-                const lonlat: [number, number] = [loc.lon, loc.lat]
+        const lonlat: [number, number] = [loc.lon, loc.lat];
         const matching: RasterLayerPolygon[] = eliPolygons.filter((eliPolygon) => {
           if (eliPolygon.geometry === null) {
-                        return true // global ELI-layer
+            return true; // global ELI-layer
           }
-                    return GeoOperations.inside(lonlat, eliPolygon)
+          return GeoOperations.inside(lonlat, eliPolygon);
+        });
+        matching.push(...AvailableRasterLayers.globalLayers);
+        matching.unshift(...AvailableRasterLayers.vectorLayers);
+        return matching;
       })
-                matching.push(...AvailableRasterLayers.globalLayers)
+    );
-                matching.unshift(
+    return available;
-                    AvailableRasterLayers.maptilerDefaultLayer,
-                    AvailableRasterLayers.osmCarto,
-                    AvailableRasterLayers.maptilerCarto,
-                    AvailableRasterLayers.maptilerBackdrop,
-                    AvailableRasterLayers.americana
-                )
-                return matching
-            })
-        )
-        return available
   }
 }
 
@@ -150,22 +152,22 @@ export class RasterLayerUtils {
     preferredCategory: string,
     ignoreLayer?: RasterLayerPolygon
   ): RasterLayerPolygon {
-        let secondBest: RasterLayerPolygon = undefined
+    let secondBest: RasterLayerPolygon = undefined;
     for (const rasterLayer of available) {
       if (rasterLayer === ignoreLayer) {
-                continue
+        continue;
       }
-            const p = rasterLayer.properties
+      const p = rasterLayer.properties;
       if (p.category === preferredCategory) {
         if (p.best) {
-                    return rasterLayer
+          return rasterLayer;
         }
         if (!secondBest) {
-                    secondBest = rasterLayer
+          secondBest = rasterLayer;
         }
       }
     }
-        return secondBest
+    return secondBest;
   }
 }
 
@@ -181,11 +183,11 @@ export interface EditorLayerIndexProperties extends RasterLayerProperties {
   /**
    * The name of the imagery source
    */
-    readonly name: string
+  readonly name: string;
   /**
    * Whether the imagery name should be translated
    */
-    readonly i18n?: boolean
+  readonly i18n?: boolean;
   readonly type:
     | "tms"
     | "wms"
@@ -193,7 +195,7 @@ export interface EditorLayerIndexProperties extends RasterLayerProperties {
     | "scanex"
     | "wms_endpoint"
     | "wmts"
-        | "vector" /* Vector is not actually part of the ELI-spec, we add it for vector layers */
+    | "vector"; /* Vector is not actually part of the ELI-spec, we add it for vector layers */
   /**
    * A rough categorisation of different types of layers. See https://github.com/osmlab/editor-layer-index/blob/gh-pages/CONTRIBUTING.md#categories for a description of the individual categories.
    */
@@ -205,53 +207,53 @@ export interface EditorLayerIndexProperties extends RasterLayerProperties {
     | "historicphoto"
     | "qa"
     | "elevation"
-        | "other"
+    | "other";
   /**
    * A URL template for imagery tiles
    */
-    readonly url: string
+  readonly url: string;
-    readonly min_zoom?: number
+  readonly min_zoom?: number;
-    readonly max_zoom?: number
+  readonly max_zoom?: number;
   /**
    * explicit/implicit permission by the owner for use in OSM
    */
-    readonly permission_osm?: "explicit" | "implicit" | "no"
+  readonly permission_osm?: "explicit" | "implicit" | "no";
   /**
    * A URL for the license or permissions for the imagery
    */
-    readonly license_url?: string
+  readonly license_url?: string;
   /**
    * A URL for the privacy policy of the operator or false if there is no existing privacy policy for tis imagery.
    */
-    readonly privacy_policy_url?: string | boolean
+  readonly privacy_policy_url?: string | boolean;
   /**
    * A unique identifier for the source; used in imagery_used changeset tag
    */
-    readonly id: string
+  readonly id: string;
   /**
    * A short English-language description of the source
    */
-    readonly description?: string
+  readonly description?: string;
   /**
    * The ISO 3166-1 alpha-2 two letter country code in upper case. Use ZZ for unknown or multiple.
    */
-    readonly country_code?: string
+  readonly country_code?: string;
   /**
    * Whether this imagery should be shown in the default world-wide menu
    */
-    readonly default?: boolean
+  readonly default?: boolean;
   /**
    * Whether this imagery is the best source for the region
    */
-    readonly best?: boolean
+  readonly best?: boolean;
   /**
    * The age of the oldest imagery or data in the source, as an RFC3339 date or leading portion of one
    */
-    readonly start_date?: string
+  readonly start_date?: string;
   /**
    * The age of the newest imagery or data in the source, as an RFC3339 date or leading portion of one
    */
-    readonly end_date?: string
+  readonly end_date?: string;
   /**
    * HTTP header to check for information if the tile is invalid
    */
@@ -261,61 +263,61 @@ export interface EditorLayerIndexProperties extends RasterLayerProperties {
      * via the `patternProperty` "^.*$".
      */
     [k: string]: string[] | null
-    }
+  };
   /**
    * 'true' if tiles are transparent and can be overlaid on another source
    */
-    readonly overlay?: boolean & string
+  readonly overlay?: boolean & string;
-    readonly available_projections?: string[]
+  readonly available_projections?: string[];
   readonly attribution?: {
     readonly url?: string
     readonly text?: string
     readonly html?: string
     readonly required?: boolean
-    }
+  };
   /**
    * A URL for an image, that can be displayed in the list of imagery layers next to the name
    */
-    readonly icon?: string
+  readonly icon?: string;
   /**
    * A link to an EULA text that has to be accepted by the user, before the imagery source is added. Can contain {lang} to be replaced by a current user language wiki code (like FR:) or an empty string for the default English text.
    */
-    readonly eula?: string
+  readonly eula?: string;
   /**
    * A URL for an image, that is displayed in the mapview for attribution
    */
-    readonly "logo-image"?: string
+  readonly "logo-image"?: string;
   /**
    * Customized text for the terms of use link (default is "Background Terms of Use")
    */
-    readonly "terms-of-use-text"?: string
+  readonly "terms-of-use-text"?: string;
   /**
    * Specify a checksum for tiles, which aren't real tiles. `type` is the digest type and can be MD5, SHA-1, SHA-256, SHA-384 and SHA-512, value is the hex encoded checksum in lower case. To create a checksum save the tile as file and upload it to e.g. https://defuse.ca/checksums.htm.
    */
-    readonly "no-tile-checksum"?: string
+  readonly "no-tile-checksum"?: string;
   /**
    * header-name attribute specifies a header returned by tile server, that will be shown as `metadata-key` attribute in Show Tile Info dialog
    */
-    readonly "metadata-header"?: string
+  readonly "metadata-header"?: string;
   /**
    * Set to `true` if imagery source is properly aligned and does not need imagery offset adjustments. This is used for OSM based sources too.
    */
-    readonly "valid-georeference"?: boolean
+  readonly "valid-georeference"?: boolean;
   /**
    * Size of individual tiles delivered by a TMS service
    */
-    readonly "tile-size"?: number
+  readonly "tile-size"?: number;
   /**
    * Whether tiles status can be accessed by appending /status to the tile URL and can be submitted for re-rendering by appending /dirty.
    */
-    readonly "mod-tile-features"?: string
+  readonly "mod-tile-features"?: string;
   /**
    * HTTP headers to be sent to server. It has two attributes header-name and header-value. May be specified multiple times.
    */
   readonly "custom-http-headers"?: {
     readonly "header-name"?: string
     readonly "header-value"?: string
-    }
+  };
   /**
    * Default layer to open (when using WMS_ENDPOINT type). Contains list of layer tag with two attributes - name and style, e.g. `"default-layers": ["layer": { name="Basisdata_NP_Basiskart_JanMayen_WMTS_25829" "style":"default" } ]` (not allowed in `mirror` attribute)
    */
@@ -326,17 +328,17 @@ export interface EditorLayerIndexProperties extends RasterLayerProperties {
       [k: string]: unknown
     }
     [k: string]: unknown
-    }[]
+  }[];
   /**
    * format to use when connecting tile server (when using WMS_ENDPOINT type)
    */
-    readonly format?: string
+  readonly format?: string;
   /**
    * If `true` transparent tiles will be requested from WMS server
    */
-    readonly transparent?: boolean & string
+  readonly transparent?: boolean & string;
   /**
    * minimum expiry time for tiles in seconds. The larger the value, the longer entry in cache will be considered valid
    */
-    readonly "minimum-tile-expire"?: number
+  readonly "minimum-tile-expire"?: number;
 }