diff --git a/README.md b/README.md index 8ee2f93..d4c0f87 100644 --- a/README.md +++ b/README.md @@ -348,9 +348,9 @@ To navigate your way around the source code, this list may help. * `/webassets` - Root for static files served by the web server * `/webassets/apidocs` - Contains the OpenAPI spec (`openapi.yml`) * `/webassets/css` - CSS files used by the web front-end -* `/webassets/fa` - a copy of the FontAwesome library * `/webassets/img` - image files used by the web front-end * `/webassets/js` - JavaScript used by the web front-end +* `/webassets/vendor` - Third-party libraries (CSS, JS, fonts and images) *Miscellaneous* @@ -383,11 +383,13 @@ As well as being my work, I have also gratefully received feature patches from S The project contains GeoJSON files for CQ and ITU zones, in the `/datafiles/` directory. These are MIT-licenced and, to my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet. -The project contains a self-hosted copy of Font Awesome's free library, in the `/webassets/fa/` directory. This is subject to Font Awesome's licence and is not covered by the overall licence declared in the `LICENSE` file. This approach was taken in preference to using their hosted kits due to the popularity of this project exceeding the page view limit for their free hosted offering. - The project contains a set of flag icons generated using the "Noto Color Emoji" font on a Debian system, in the `/webassets/img/flags/` directory. -The software uses a number of Python libraries as listed in `requirements.txt`, and a number of JavaScript libraries such as jQuery, Leaflet and Bootstrap. This project would not have been possible without these libraries, so many thanks to their developers. +The software uses a number of Python libraries as listed in `requirements.txt`, and a number of JavaScript libraries. This project would not have been possible without these libraries, so many thanks to their developers. + +### Third Party Libraries + +A number of third-party libraries are self-hosted in the `/webassets/vendor/` directory. These files are subject to their own licences and are not covered by the overall licence declared in the `LICENSE` file. Particular thanks go to country-files.com for providing country lookup data for amateur radio, to K0SWE for [this JSON-formatted DXCC data](https://github.com/k0swe/dxcc-json/), and to the developers of `pyhamtools` for making it easy to use country-files.com data as well as QRZ.com and Clublog lookup. diff --git a/templates/about.html b/templates/about.html index 05b888d..89a06bc 100644 --- a/templates/about.html +++ b/templates/about.html @@ -69,7 +69,6 @@
This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.
- {% end %} \ No newline at end of file diff --git a/templates/add_spot.html b/templates/add_spot.html index 07f1b50..8862307 100644 --- a/templates/add_spot.html +++ b/templates/add_spot.html @@ -69,8 +69,7 @@ - - + {% end %} \ No newline at end of file diff --git a/templates/alerts.html b/templates/alerts.html index b832e4b..2cbc692 100644 --- a/templates/alerts.html +++ b/templates/alerts.html @@ -70,8 +70,7 @@ - - + {% end %} \ No newline at end of file diff --git a/templates/api_only_home.html b/templates/api_only_home.html index 28625c2..a550f80 100644 --- a/templates/api_only_home.html +++ b/templates/api_only_home.html @@ -1,6 +1,6 @@ {% extends "skeleton.html" %} {% block head_extra %} - + {% end %} {% block body %}
New OneMap | Map data © contributors, Singapore Land Authority'
+ },
+ variants: {
+ Default: 'Default',
+ Night: 'Night',
+ Original: 'Original',
+ Grey: 'Grey',
+ LandLot: 'LandLot'
+ }
+ },
+ USGS: {
+ url: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}',
+ options: {
+ maxZoom: 20,
+ attribution: 'Tiles courtesy of the U.S. Geological Survey'
+ },
+ variants: {
+ USTopo: {},
+ USImagery: {
+ url: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryOnly/MapServer/tile/{z}/{y}/{x}'
+ },
+ USImageryTopo: {
+ url: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryTopo/MapServer/tile/{z}/{y}/{x}'
+ }
+ }
+ },
+ WaymarkedTrails: {
+ url: 'https://tile.waymarkedtrails.org/{variant}/{z}/{x}/{y}.png',
+ options: {
+ maxZoom: 18,
+ attribution: 'Map data: {attribution.OpenStreetMap} | Map style: © waymarkedtrails.org (CC-BY-SA)'
+ },
+ variants: {
+ hiking: 'hiking',
+ cycling: 'cycling',
+ mtb: 'mtb',
+ slopes: 'slopes',
+ riding: 'riding',
+ skating: 'skating'
+ }
+ },
+ OpenAIP: {
+ url: 'https://{s}.tile.maps.openaip.net/geowebcache/service/tms/1.0.0/openaip_basemap@EPSG%3A900913@png/{z}/{x}/{y}.{ext}',
+ options: {
+ attribution: 'openAIP Data (CC-BY-NC-SA)',
+ ext: 'png',
+ minZoom: 4,
+ maxZoom: 14,
+ tms: true,
+ detectRetina: true,
+ subdomains: '12'
+ }
+ },
+ OpenSnowMap: {
+ url: 'https://tiles.opensnowmap.org/{variant}/{z}/{x}/{y}.png',
+ options: {
+ minZoom: 9,
+ maxZoom: 18,
+ attribution: 'Map data: {attribution.OpenStreetMap} & ODbL, © www.opensnowmap.org CC-BY-SA'
+ },
+ variants: {
+ pistes: 'pistes',
+ }
+ },
+ AzureMaps: {
+ url:
+ 'https://atlas.microsoft.com/map/tile?api-version={apiVersion}'+
+ '&tilesetId={variant}&x={x}&y={y}&zoom={z}&language={language}'+
+ '&subscription-key={subscriptionKey}',
+ options: {
+ attribution: 'See https://docs.microsoft.com/en-us/rest/api/maps/render-v2/get-map-tile for details.',
+ apiVersion: '2.0',
+ variant: 'microsoft.imagery',
+ subscriptionKey: '