New configuration paths (#89)

* remove lib/config_reader.js, replace config.js with config.defaults.js
* Assume README is part of release, add screenshot

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1850544cd62b10fd9f22162025864cd7ebeeb7bc..fe8d44cdadcc963080edcca0caac043801bd3df0 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
           yarn build
           export VERSION=${GITREF/*v/}
           mkdir nominatim-ui-${VERSION}
           yarn build
           export VERSION=${GITREF/*v/}
           mkdir nominatim-ui-${VERSION}

-          mv dist LICENSE README.md nominatim-ui-${VERSION}/
+          mv dist LICENSE README.md screenshot.png nominatim-ui-${VERSION}/

           mkdir artifacts
           tar czf artifacts/nominatim-ui-${VERSION}.tar.gz nominatim-ui-${VERSION}
           zip -qr artifacts/nominatim-ui-${VERSION}.zip nominatim-ui-${VERSION}
           mkdir artifacts
           tar czf artifacts/nominatim-ui-${VERSION}.tar.gz nominatim-ui-${VERSION}
           zip -qr artifacts/nominatim-ui-${VERSION}.zip nominatim-ui-${VERSION}

diff --git a/.gitignore b/.gitignore
index 434259e837d6ec824a5e709ffb22784a9dae3c65..0f8d259b79109c1358cd540fca8c99c0375bbb0c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 .DS_Store

-dist/config.js
+dist/theme/config.theme.js
+dist/build/bundle.*

 node_modules
 node_modules

diff --git a/CHANGES.md b/CHANGES.md
index 6234a436c70c1f7f8184259d5b11cb85189606fa..df3b598b5dacf6483dd31e6a974ad8d3ca48372b 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 # CHANGES
 
 # CHANGES
 

+* unreleased
+    * Add theming
+    * Replace config.js with config.default.js and theme/config.theme.js
+

 * version 2.3.0 - 2021-02-19
 
     * New top-level navigation: Search, Reverse, Search-by-id
 * version 2.3.0 - 2021-02-19
 
     * New top-level navigation: Search, Reverse, Search-by-id

diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index e11ae1721307932fbe2b0854df23ce28d352cb33..e8c56e3b08d4c10c8be20cfe0ecdd3ecaa4344d0 100644 (file)
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -1,10 +1,13 @@
 # Developing Nominatim-UI
 
 # Developing Nominatim-UI
 

+[![Continuous Integration](https://github.com/osm-search/nominatim-ui/actions/workflows/ci.yml/badge.svg)](https://github.com/osm-search/nominatim-ui/actions/workflows/ci.yml)
+

 ## Background
 
 The user interface used to be included in the geocoder. Thus the
 first version avoid being a redesign and still uses some of the
 ## Background
 
 The user interface used to be included in the geocoder. Thus the
 first version avoid being a redesign and still uses some of the

-same configuration values.
+same configuration values. Version 2 was a full refactor using
+Svelte. Version 3 added theme and easier configuration.

 
 Uses [svelte](https://svelte.dev/) framework,
 [leaflet](https://leafletjs.com/) for map interaction,
 
 Uses [svelte](https://svelte.dev/) framework,
 [leaflet](https://leafletjs.com/) for map interaction,

diff --git a/README.md b/README.md
index 8eb100fd16ba180f6942532589beffad70ff8e7d..1d4d018e9df329272937e277d09c9cba317b76c5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,52 +2,41 @@
 
 Debugging user interface for [Nominatim](https://nominatim.org/)
 ([source](https://github.com/osm-search/Nominatim/)) geocoder.
 
 Debugging user interface for [Nominatim](https://nominatim.org/)
 ([source](https://github.com/osm-search/Nominatim/)) geocoder.

-The frontend runs standalone as website and will requests data
-from a separate Nominatim API (either on the same server or
-remote).

 
 

-For technical details see [CONTRIBUTE.md](CONTRIBUTE.md) file.
+The frontend runs standalone as website and will request data
+from a separate Nominatim API running on http://localhost:80/nominatim/ (configurable, see below).
+
+Download a stable release from [https://github.com/osm-search/nominatim-ui/releases]().
+For technical background, how to develop and create a release see [CONTRIBUTE.md](CONTRIBUTE.md) file at [https://github.com/osm-search/nominatim-ui/]().

 
 ![Screenshot](screenshot.png)
 
 ## Starting the frontend
 
 
 ![Screenshot](screenshot.png)
 
 ## Starting the frontend
 

-* You can open the `dist` directory in your browser.
+You can either
+
+* open the `dist` directory in your browser.

 
 

-* If you have python installed (part of the Nominatim server installation):
+* if you have Python installed (part of the Nominatim API server installation):

 
    1. `cd dist`
    2. start webserver `python3 -m http.server 8765` 
 
    1. `cd dist`
    2. start webserver `python3 -m http.server 8765` 

-   3. open http://localhost:8765/ in your browser
+   3. open [http://localhost:8765/]() in your browser

 
 

-* Start a webserver using ([Big list of http static server one-liners](https://gist.github.com/willurd/5720255)) or configure Apache, nginx or other webservers to serve the `dist` directory.
+* start a webserver using ([Big list of http static server one-liners](https://gist.github.com/willurd/5720255)) or configure Apache, nginx or other webservers to serve the `dist` directory.

 
 
 ## Configuration
 
 
 
 ## Configuration
 

-Create a `dist/config.js` file, you can use `dist/config.example.js` as basis (just copy it). All settings are optional. Usually you want to set the `Nominatim_API_Endpoint` value at least.
-
-Defaults:
-
-| setting | default |
-|---|---|
-| `Nominatim_API_Endpoint` | http://localhost/nominatim/ (port 80) |
-| `Images_Base_Url` | images in [mapicons](dist/mapicons) |
-| `Search_AreaPolygons` | yes, print boundaries of search results on map |
-| `Reverse_Default_Search_Zoom` | 18 (house-number level) |
-| `Map_Default_Lat`, `Map_Default_Lon`, `Map_Default_Zoom` | display whole world |
-| `Map_Tile_URL` | load from openstreetmap.org |
-| `Map_Tile_Attribution` | [OpenStreetMap](https://openstreetmap.org/copyright) obviously |
-
-
-## Theming
+Defaults are set in `dist/config.default.js`.
+You can overwrite settings in `dist/config.theme.js`, for example:

 
 

-You can customize parts of the website by overwriting files in `dist/theme/`
+```javascript
+  Nominatim_Config.Nominatim_API_Endpoint = 'http://my-server:1234/';
+```

 
 

-   * Set a `Page_Title` in the configuration
-   * Logo
-   * Content of Welcome and About&Help page
-   * Additional CSS styling
+The `dist/theme/` directory also contains files make it easy to set a different
+logo image, colors, welcome and help text.

 
 ## License
 
 
 ## License
 

diff --git a/dist/about.html b/dist/about.html
index 79182597a522d780090e70c21ad0074fc02ac5d9..99aa904a971efe3bc8dd458cf6882623ce4e9013 100644 (file)
--- a/dist/about.html
+++ b/dist/about.html
@@ -6,13 +6,14 @@
 
   <title>Nominatim Demo</title>
 
 
   <title>Nominatim Demo</title>
 

-  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194">
+  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32">

 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 
 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 

-  <script src='config.js'></script>
+  <script src='config.defaults.js'></script>
+  <script src='theme/config.theme.js'></script>

   <script defer src='build/bundle.js'></script>
 </head>
 
   <script defer src='build/bundle.js'></script>
 </head>
 

diff --git a/dist/config.defaults.js b/dist/config.defaults.js
new file mode 100644 (file)
index 0000000..9ab6f3a
--- /dev/null
+++ b/dist/config.defaults.js
@@ -0,0 +1,27 @@
+// You can overwrite any defaults in dist/theme/config.theme.js
+
+let Nominatim_Config = {
+  Page_Title: 'Nominatim Demo',
+
+  // Where Nominatim API runs. Remember to add port if needed and trailing slash.
+  Nominatim_API_Endpoint: 'http://localhost/nominatim/',
+
+  // relative path or full URL
+  Images_Base_Url: 'mapicons/',
+
+  // If the API should return polygons to be displayed on the map
+  Search_AreaPolygons: true,
+
+  // ---- MAP ----
+  Reverse_Default_Search_Zoom: 18,
+  Map_Default_Lat: 20.0,
+  Map_Default_Lon: 0.0,
+  Map_Default_Zoom: 2,
+
+  // For what {x}, {y} etc stand for see
+  // https://leafletjs.com/reference-1.6.0.html#tilelayer
+  Map_Tile_URL: 'https://{s}.tile.osm.org/{z}/{x}/{y}.png',
+
+  // Can be text or HTML. To hide set to ''
+  Map_Tile_Attribution: '<a href="https://osm.org/copyright">OpenStreetMap contributors</a>'
+};

diff --git a/dist/config.example.js b/dist/config.example.js
deleted file mode 100644 (file)
index e3b8a3e..0000000
--- a/dist/config.example.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// The app loads an optional file config.js
-//
-// You can use this file as base for config.js (just copy or rename it), all
-// keys are optional.
-
-var Nominatim_Config = [];
-
-// Where Nominatim API runs. Remember to add port if needed and trailing slash.
-// Nominatim_Config['Nominatim_API_Endpoint'] = 'http://localhost/nominatim/';
-
-// Nominatim_Config['Images_Base_Url'] = '/mapicons/';
-
-// If the API should return polygons to be displayed on the map
-// Nominatim_Config['Search_AreaPolygons'] = 1;
-// Nominatim_Config['Reverse_Default_Search_Zoom'] = 18;
-
-// ---- MAP ----
-// For what {x}, {y} etc stand for see
-// https://leafletjs.com/reference-1.6.0.html#tilelayer
-// Nominatim_Config['Map_Tile_URL'] = 'https://{s}.tile.osm.org/{z}/{x}/{y}.png';
-
-// Can be text or HTML. To hide set to ''
-// Nominatim_Config['Map_Tile_Attribution'] = '<a href="https://osm.org/copyright">OpenStreetMap contributors</a>';
-
-// Nominatim_Config['Map_Default_Lat'] = 20.0;
-// Nominatim_Config['Map_Default_Lon'] = 0.0;
-// Nominatim_Config['Map_Default_Zoom'] = 2;
-
-// ---- BRANDING ----
-// Nominatim_Config['Page_Title'] = 'Nominatim Demo';

diff --git a/dist/deletable.html b/dist/deletable.html
index 79182597a522d780090e70c21ad0074fc02ac5d9..99aa904a971efe3bc8dd458cf6882623ce4e9013 100644 (file)
--- a/dist/deletable.html
+++ b/dist/deletable.html
@@ -6,13 +6,14 @@
 
   <title>Nominatim Demo</title>
 
 
   <title>Nominatim Demo</title>
 

-  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194">
+  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32">

 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 
 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 

-  <script src='config.js'></script>
+  <script src='config.defaults.js'></script>
+  <script src='theme/config.theme.js'></script>

   <script defer src='build/bundle.js'></script>
 </head>
 
   <script defer src='build/bundle.js'></script>
 </head>
 

diff --git a/dist/details.html b/dist/details.html
index 79182597a522d780090e70c21ad0074fc02ac5d9..99aa904a971efe3bc8dd458cf6882623ce4e9013 100644 (file)
--- a/dist/details.html
+++ b/dist/details.html
@@ -6,13 +6,14 @@
 
   <title>Nominatim Demo</title>
 
 
   <title>Nominatim Demo</title>
 

-  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194">
+  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32">

 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 
 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 

-  <script src='config.js'></script>
+  <script src='config.defaults.js'></script>
+  <script src='theme/config.theme.js'></script>

   <script defer src='build/bundle.js'></script>
 </head>
 
   <script defer src='build/bundle.js'></script>
 </head>
 

diff --git a/dist/polygons.html b/dist/polygons.html
index 79182597a522d780090e70c21ad0074fc02ac5d9..99aa904a971efe3bc8dd458cf6882623ce4e9013 100644 (file)
--- a/dist/polygons.html
+++ b/dist/polygons.html
@@ -6,13 +6,14 @@
 
   <title>Nominatim Demo</title>
 
 
   <title>Nominatim Demo</title>
 

-  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194">
+  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32">

 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 
 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 

-  <script src='config.js'></script>
+  <script src='config.defaults.js'></script>
+  <script src='theme/config.theme.js'></script>

   <script defer src='build/bundle.js'></script>
 </head>
 
   <script defer src='build/bundle.js'></script>
 </head>
 

diff --git a/dist/reverse.html b/dist/reverse.html
index 79182597a522d780090e70c21ad0074fc02ac5d9..99aa904a971efe3bc8dd458cf6882623ce4e9013 100644 (file)
--- a/dist/reverse.html
+++ b/dist/reverse.html
@@ -6,13 +6,14 @@
 
   <title>Nominatim Demo</title>
 
 
   <title>Nominatim Demo</title>
 

-  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194">
+  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32">

 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 
 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 

-  <script src='config.js'></script>
+  <script src='config.defaults.js'></script>
+  <script src='theme/config.theme.js'></script>

   <script defer src='build/bundle.js'></script>
 </head>
 
   <script defer src='build/bundle.js'></script>
 </head>
 

diff --git a/dist/search.html b/dist/search.html
index 79182597a522d780090e70c21ad0074fc02ac5d9..99aa904a971efe3bc8dd458cf6882623ce4e9013 100644 (file)
--- a/dist/search.html
+++ b/dist/search.html
@@ -6,13 +6,14 @@
 
   <title>Nominatim Demo</title>
 
 
   <title>Nominatim Demo</title>
 

-  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="theme/favicon-194x194.png" sizes="194x194">
+  <link rel="icon" type="image/png" href="theme/favicon-32x32.png" sizes="32x32">

 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 
 
   <link rel='stylesheet' href='build/bundle.css'>
   <link rel='stylesheet' href='theme/style.css'>
 

-  <script src='config.js'></script>
+  <script src='config.defaults.js'></script>
+  <script src='theme/config.theme.js'></script>

   <script defer src='build/bundle.js'></script>
 </head>
 
   <script defer src='build/bundle.js'></script>
 </head>
 

diff --git a/src/components/Header.svelte b/src/components/Header.svelte
index 777d8b8a81be8ba44efcaf35d94dc0c31ac98503..4e6359a2a7e11fcde699752ce7690c86c20fd9cb 100644 (file)
--- a/src/components/Header.svelte
+++ b/src/components/Header.svelte
@@ -5,9 +5,9 @@
   import Error from './Error.svelte';
 
   import { page } from '../lib/stores.js';
   import Error from './Error.svelte';
 
   import { page } from '../lib/stores.js';

-  import { get_config_value } from '../lib/config_reader.js';

 
   $: view = $page.tab;
 
   $: view = $page.tab;

+  $: page_title = Nominatim_Config.Page_Title;

 </script>
 
 <style>
 </script>
 
 <style>


@@ -56,7 +56,7 @@
     <div class="navbar-brand">
       <PageLink page="search">
         <img alt="logo" id="theme-logo" src="theme/logo.png" />
     <div class="navbar-brand">
       <PageLink page="search">
         <img alt="logo" id="theme-logo" src="theme/logo.png" />

-        <h1>{get_config_value('Page_Title')}</h1>
+        <h1>{page_title}</h1>

       </PageLink>
     </div>
     <!-- Toggler (hamburger button) -->
       </PageLink>
     </div>
     <!-- Toggler (hamburger button) -->

diff --git a/src/components/Map.svelte b/src/components/Map.svelte
index d77b81ddb17983bad5c39f63fb513d8ccbd55ec7..b3b9e833e6d7e9b5912a91975952b2b8a369ffa8 100644 (file)
--- a/src/components/Map.svelte
+++ b/src/components/Map.svelte
@@ -6,7 +6,6 @@
   import 'leaflet-minimap/dist/Control.MiniMap.min.css';
 
   import { get } from 'svelte/store';
   import 'leaflet-minimap/dist/Control.MiniMap.min.css';
 
   import { get } from 'svelte/store';

-  import { get_config_value } from '../lib/config_reader.js';

   import { map_store } from '../lib/stores.js';
   import MapPosition from '../components/MapPosition.svelte';
 
   import { map_store } from '../lib/stores.js';
   import MapPosition from '../components/MapPosition.svelte';
 


@@ -17,24 +16,24 @@
   let dataLayers = [];
 
   function createMap(container) {
   let dataLayers = [];
 
   function createMap(container) {

-    const attribution = get_config_value('Map_Tile_Attribution') || null;
+    const attribution = Nominatim_Config.Map_Tile_Attribution;

     let map = new L.map(container, {
       attributionControl: (attribution && attribution.length),
       scrollWheelZoom: true, // !L.Browser.touch,
       touchZoom: false,
       center: [
     let map = new L.map(container, {
       attributionControl: (attribution && attribution.length),
       scrollWheelZoom: true, // !L.Browser.touch,
       touchZoom: false,
       center: [

-        get_config_value('Map_Default_Lat'),
-        get_config_value('Map_Default_Lon')
+        Nominatim_Config.Map_Default_Lat,
+        Nominatim_Config.Map_Default_Lon

       ],
       ],

-      zoom: get_config_value('Map_Default_Zoom')
+      zoom: Nominatim_Config.Map_Default_Zoom

     });
 
     });
 

-    L.tileLayer(get_config_value('Map_Tile_URL'), {
+    L.tileLayer(Nominatim_Config.Map_Tile_URL, {

       attribution: attribution
     }).addTo(map);
 
     if (display_minimap) {
       attribution: attribution
     }).addTo(map);
 
     if (display_minimap) {

-      let osm2 = new L.TileLayer(get_config_value('Map_Tile_URL'), {
+      let osm2 = new L.TileLayer(Nominatim_Config.Map_Tile_URL, {

         minZoom: 0,
         maxZoom: 13,
         attribution: attribution
         minZoom: 0,
         maxZoom: 13,
         attribution: attribution

diff --git a/src/components/MapIcon.svelte b/src/components/MapIcon.svelte
index 8bdbe3b4071be345bc6e6fdf07b4c50d7d8461b0..46c01a21b37be3651041a0a26c6b0ea0035e8518 100644 (file)
--- a/src/components/MapIcon.svelte
+++ b/src/components/MapIcon.svelte
@@ -1,12 +1,11 @@
 <script>
 
   export let aPlace;
 <script>
 
   export let aPlace;

-  import { get_config_value } from '../lib/config_reader.js';

 
   let sIcon = getIcon(aPlace.category, aPlace.type);
 
   let title = 'icon for ' + aPlace.category + ' ' + aPlace.type;
 
   let sIcon = getIcon(aPlace.category, aPlace.type);
 
   let title = 'icon for ' + aPlace.category + ' ' + aPlace.type;

-  let url = get_config_value('Images_Base_Url') + sIcon + '.p.20.png';
+  let url = Nominatim_Config.Images_Base_Url + sIcon + '.p.20.png';

 
   function getIcon(category, type) {
     // equivalent to PHP Nominatim::ClassTypes::getIcon
 
   function getIcon(category, type) {
     // equivalent to PHP Nominatim::ClassTypes::getIcon

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index 93363e4f5ff3c45cfb465030947b888e0bd50f39..a44a30e19e690b504cc368e3f203e7cbf4785d5e 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -1,8 +1,5 @@
-
-import { get_config_value } from './config_reader.js';

 import { last_api_request_url_store, error_store } from './stores.js';
 
 import { last_api_request_url_store, error_store } from './stores.js';
 

-

 function api_request_progress(status) {
   var loading_el = document.getElementById('loading');
   if (!loading_el) return; // might not be on page yet
 function api_request_progress(status) {
   var loading_el = document.getElementById('loading');
   if (!loading_el) return; // might not be on page yet


@@ -43,14 +40,14 @@ export async function fetch_content_into_element(url, dom_element) {
   await fetch(url)
     .then(response => response.text())
     .then(html => {
   await fetch(url)
     .then(response => response.text())
     .then(html => {

-      html = html.replace('Nominatim_API_Endpoint', get_config_value('Nominatim_API_Endpoint'));
+      html = html.replace('Nominatim_API_Endpoint', Nominatim_Config.Nominatim_API_Endpoint);

       dom_element.innerHTML = html;
       fetch_content_cache[url] = html;
     });
 }
 
 function generate_nominatim_api_url(endpoint_name, params) {
       dom_element.innerHTML = html;
       fetch_content_cache[url] = html;
     });
 }
 
 function generate_nominatim_api_url(endpoint_name, params) {

-  return get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?'
+  return Nominatim_Config.Nominatim_API_Endpoint + endpoint_name + '.php?'

          + Object.keys(clean_up_parameters(params)).map((k) => {
            return encodeURIComponent(k) + '=' + encodeURIComponent(params[k]);
          }).join('&');
          + Object.keys(clean_up_parameters(params)).map((k) => {
            return encodeURIComponent(k) + '=' + encodeURIComponent(params[k]);
          }).join('&');


@@ -70,7 +67,7 @@ function clean_up_parameters(params) {
 }
 
 export function update_html_title(title) {
 }
 
 export function update_html_title(title) {

-  document.title = [title, get_config_value('Page_Title')]
+  document.title = [title, Nominatim_Config.Page_Title]

     .filter((val) => val && val.length > 1)
     .join(' | ');
 }
     .filter((val) => val && val.length > 1)
     .join(' | ');
 }

diff --git a/src/lib/config_reader.js b/src/lib/config_reader.js
deleted file mode 100644 (file)
index 30a8a1b..0000000
--- a/src/lib/config_reader.js
+++ /dev/null
@@ -1,23 +0,0 @@
-module.exports.get_config_value = get_config_value;
-
-
-const Nominatim_Config_Defaults = {
-  Nominatim_API_Endpoint: 'http://localhost/nominatim/',
-  Images_Base_Url: 'mapicons/',
-  Search_AreaPolygons: 1,
-  Reverse_Default_Search_Zoom: 18,
-  Map_Default_Lat: 20.0,
-  Map_Default_Lon: 0.0,
-  Map_Default_Zoom: 2,
-  Map_Tile_URL: 'https://{s}.tile.osm.org/{z}/{x}/{y}.png',
-  Map_Tile_Attribution: '<a href="https://osm.org/copyright">OpenStreetMap contributors</a>',
-  Page_Title: 'Nominatim Demo'
-};
-
-function get_config_value(str, default_val) {
-  var value = ((typeof Nominatim_Config !== 'undefined')
-               && (typeof Nominatim_Config[str] !== 'undefined'))
-    ? Nominatim_Config[str]
-    : Nominatim_Config_Defaults[str];
-  return (typeof value !== 'undefined' ? value : default_val);
-}

diff --git a/src/pages/ReversePage.svelte b/src/pages/ReversePage.svelte
index 9f3bacb496a2fa19c76ac6e1ef1f1e2931af0648..b43750fe46d680ae7600686fcb6e35ae15842bbc 100644 (file)
--- a/src/pages/ReversePage.svelte
+++ b/src/pages/ReversePage.svelte
@@ -1,6 +1,5 @@
 <script>
   import { page, results_store } from '../lib/stores.js';
 <script>
   import { page, results_store } from '../lib/stores.js';

-  import { get_config_value } from '../lib/config_reader.js';

   import { fetch_from_api, update_html_title } from '../lib/api_utils.js';
 
   import Header from '../components/Header.svelte';
   import { fetch_from_api, update_html_title } from '../lib/api_utils.js';
 
   import Header from '../components/Header.svelte';


@@ -20,7 +19,7 @@
       lon: search_params.get('lon'),
       zoom: (search_params.get('zoom') > 1
         ? Number(search_params.get('zoom'))
       lon: search_params.get('lon'),
       zoom: (search_params.get('zoom') > 1
         ? Number(search_params.get('zoom'))

-        : Number(get_config_value('Reverse_Default_Search_Zoom'))),
+        : Number(Nominatim_Config.Reverse_Default_Search_Zoom)),

       format: 'jsonv2'
     };
 
       format: 'jsonv2'
     };
 

diff --git a/src/pages/SearchPage.svelte b/src/pages/SearchPage.svelte
index 802034fce6845e28c2e59e470eeb3c54bba687dd..6f10f74e2c085a6591d41656e29331eff42f31a6 100644 (file)
--- a/src/pages/SearchPage.svelte
+++ b/src/pages/SearchPage.svelte
@@ -1,6 +1,5 @@
 <script>
   import { page, results_store } from '../lib/stores.js';
 <script>
   import { page, results_store } from '../lib/stores.js';

-  import { get_config_value } from '../lib/config_reader.js';

   import { fetch_from_api, update_html_title } from '../lib/api_utils.js';
 
   import Header from '../components/Header.svelte';
   import { fetch_from_api, update_html_title } from '../lib/api_utils.js';
 
   import Header from '../components/Header.svelte';


@@ -23,7 +22,7 @@
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),

-      polygon_geojson: get_config_value('Search_AreaPolygons', false) ? 1 : 0,
+      polygon_geojson: Nominatim_Config.Search_AreaPolygons ? 1 : 0,

       viewbox: search_params.get('viewbox'),
       bounded: search_params.get('bounded'),
       dedupe: search_params.get('dedupe'),
       viewbox: search_params.get('viewbox'),
       bounded: search_params.get('bounded'),
       dedupe: search_params.get('dedupe'),