apdevelop
diff --git a/‎Docs/demo-page.png
101 KB b/‎Docs/demo-page.png
101 KB
diff --git a/‎README.md
+1-2 b/‎README.md
+1-2
diff --git a/‎Src/TileMapService/TileSources/HttpTileSource.cs
+1 b/‎Src/TileMapService/TileSources/HttpTileSource.cs
+1
diff --git a/‎Src/TileMapService/TileSources/LocalFilesTileSource.cs
+1 b/‎Src/TileMapService/TileSources/LocalFilesTileSource.cs
+1
diff --git a/‎Src/TileMapService/TileSources/PostGISTileSource.cs
+1 b/‎Src/TileMapService/TileSources/PostGISTileSource.cs
+1
diff --git a/‎Src/TileMapService/TileSources/RasterTileSource.cs
+1 b/‎Src/TileMapService/TileSources/RasterTileSource.cs
+1
diff --git a/‎Src/TileMapService/appsettings.json
+2-1 b/‎Src/TileMapService/appsettings.json
+2-1
diff --git a/‎Src/TileMapService/wwwroot/index.html
+30-6 b/‎Src/TileMapService/wwwroot/index.html
+30-6
@@ -47,7 +47,7 @@ Using
 * [SkiaSharp](https://github.com/mono/SkiaSharp) for raster images processing.
 * [BitMiracle.LibTiff.NET](https://github.com/BitMiracle/libtiff.net) for reading source GeoTIFF files and creating output TIFF images.
 * [Npgsql](https://github.com/npgsql/npgsql) .NET data provider for PostgreSQL.
-* [Leaflet](https://github.com/Leaflet) for map demo page.
+* [OpenLayers](https://github.com/OpenLayers) with [OpenLayers LayerSwitcher](https://github.com/walkermatt/ol-layerswitcher) for displaying layers.
 * [NUnit](https://nunit.org/) for tests.
 
 ### Configuration file
@@ -82,7 +82,6 @@ Some improvements can be made for better using this application in real environm
 * Flexible settings of tile sources.
 * Configuration Web API / Web UI with authentication.
 * WMS and Vector Tiles (mvt) client in Web UI.
-* .NET 8 project and solution.
 * Compare with reference implementations (servers and clients).
 * Using metatiles for better tiles quality.
 * Include test dataset(s) created from free data.
 
@@ -86,6 +86,7 @@ async Task ITileSource.InitAsync()
                 Format = this.configuration.Format, // TODO: from source service/layer capabilities
                 Title = title,
                 Abstract = this.configuration.Abstract, // TODO: from source layer capabilities
+                Attribution = this.configuration.Attribution,
                 Tms = tms,
                 Srs = srs,
                 Location = this.configuration.Location,
 
@@ -85,6 +85,7 @@ Task ITileSource.InitAsync()
                 Format = this.configuration.Format, // TODO: from file properties (extension)
                 Title = title,
                 Abstract = this.configuration.Abstract,
+                Attribution = this.configuration.Attribution,
                 Tms = this.configuration.Tms ?? false, // Default is tms=false for file storage
                 Srs = srs,
                 Location = this.configuration.Location,
 
@@ -49,6 +49,7 @@ Task ITileSource.InitAsync()
                 Format = ImageFormats.MapboxVectorTile,
                 Title = title,
                 Abstract = this.configuration.Abstract,
+                Attribution = this.configuration.Attribution,
                 Tms = this.configuration.Tms ?? true,
                 Srs = Utils.SrsCodes.EPSG3857,
                 Location = this.configuration.Location,
 
@@ -73,6 +73,7 @@ Task ITileSource.InitAsync()
                 Format = ImageFormats.Png, // TODO: ? multiple output formats ?
                 Title = title,
                 Abstract = this.configuration.Abstract,
+                Attribution = this.configuration.Attribution,
                 Tms = false,
                 Srs = U.SrsCodes.EPSG3857, // TODO: only EPSG:3857 'output' SRS currently supported
                 Location = this.configuration.Location,
 
@@ -81,6 +81,7 @@
       "id": "osm",
       "format": "png",
       "title": "OSM",
+      "attribution": "OSM",
       "location": "https://tile.openstreetmap.de/{z}/{x}/{y}.png"
     },
     {
@@ -157,7 +158,7 @@
       "id": "geotiff2",
       "minzoom": 16,
       "maxzoom": 24,
-      "title": "geotiff",
+      "title": "geotiff2",
       "abstract": "Tiles from single GeoTIFF image",
       "location": "d:\\SQLDB\\GeoTIFF\\longxi.tif"
     }
 
@@ -3,7 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>Tile Map Service</title>
-    <link rel="stylesheet" href="leaflet.css" />
+    <script src="ol.js"></script>
+    <script src="ol-layerswitcher.js"></script>
+    <link rel="stylesheet" href="ol.css">
+    <link rel="stylesheet" href="ol-layerswitcher.css" />
     <style>
         html, body {
             height: 100%;
@@ -12,14 +15,35 @@
             margin: 0;
             background-color: white;
         }
+
+        /* OpenLayers LayerSwitcher styling */
+        .layer-switcher {
+            top: 0.5em;
+        }
+
+            .layer-switcher ul {
+                margin: 0 0.2em;
+            }
+
+            .layer-switcher li input {
+                left: 0;
+            }
+
+            .layer-switcher li label {
+                padding-left: 1.6em;
+                padding-right: 0;
+                font-size: 12px;
+                font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+            }
+
+            .layer-switcher.shown.layer-switcher-activation-mode-click > button {
+                display: none;
+            }
     </style>
 </head>
 <body>
-    <script src="leaflet.js" type="text/javascript"></script>
-    <script src="leaflet.gridlayer.tilegrid.js" type="text/javascript"></script>
-
-    <div id="mapMercator" style="height: 50%; min-height: 50%;"></div>
-    <div id="mapGeodetic" style="height: 50%; min-height: 50%;"></div>
+    <div id="mapOL3857" style="height: 60%;"></div>
+    <div id="mapOL4326" style="height: 40%;"></div>
 
     <script src="index.js" type="text/javascript"></script>
 </body>