add moreURL/pagination feature

[nominatim-ui.git] / src / assets / js / detailpage.js

diff --git a/src/assets/js/detailpage.js b/src/assets/js/detailpage.js
index 73591feae2b3e0c5f51fd5f6cb6358454d78d7ec..919e19a4dcaa074a572d78c83548edb8308f0497 100644 (file)
--- a/src/assets/js/detailpage.js
+++ b/src/assets/js/detailpage.js
@@ -4,20 +4,22 @@
 
 
 function init_map_on_detail_page(lat, lon, geojson) {
 
 
 function init_map_on_detail_page(lat, lon, geojson) {

+  var attribution = get_config_value('Map_Tile_Attribution') || null;

   map = new L.map('map', {
     // center: [nominatim_map_init.lat, nominatim_map_init.lon],
     // zoom:   nominatim_map_init.zoom,
   map = new L.map('map', {
     // center: [nominatim_map_init.lat, nominatim_map_init.lon],
     // zoom:   nominatim_map_init.zoom,

-    attributionControl: (get_config_value('Map_Tile_Attribution') && get_config_value('Map_Tile_Attribution').length),
+    attributionControl: (attribution && attribution.length),

     scrollWheelZoom: true, // !L.Browser.touch,
     scrollWheelZoom: true, // !L.Browser.touch,

-    touchZoom: false,
+    touchZoom: false

   });
 
   L.tileLayer(get_config_value('Map_Tile_URL'), {
     // moved to footer
   });
 
   L.tileLayer(get_config_value('Map_Tile_URL'), {
     // moved to footer

-    attribution: (get_config_value('Map_Tile_Attribution') || null) // '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors'
+    // '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors'
+    attribution: attribution

   }).addTo(map);
 
   }).addTo(map);
 

-  var layerGroup = new L.layerGroup().addTo(map);
+  // var layerGroup = new L.layerGroup().addTo(map);

 
   var circle = L.circleMarker([lat, lon], {
     radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75
 
   var circle = L.circleMarker([lat, lon], {
     radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75


@@ -29,7 +31,7 @@ function init_map_on_detail_page(lat, lon, geojson) {
       // https://leafletjs.com/reference-1.0.3.html#path-option
       parse_and_normalize_geojson_string(geojson),
       {
       // https://leafletjs.com/reference-1.0.3.html#path-option
       parse_and_normalize_geojson_string(geojson),
       {

-        style: function (feature) {
+        style: function () {

           return { interactive: false, color: 'blue' };
         }
       }
           return { interactive: false, color: 'blue' };
         }
       }


@@ -40,15 +42,22 @@ function init_map_on_detail_page(lat, lon, geojson) {
     map.setView([lat, lon], 10);
   }
 
     map.setView([lat, lon], 10);
   }
 

-  var osm2 = new L.TileLayer(get_config_value('Map_Tile_URL'), { minZoom: 0, maxZoom: 13, attribution: (get_config_value('Map_Tile_Attribution') || null) });
-  var miniMap = new L.Control.MiniMap(osm2, { toggleDisplay: true }).addTo(map);
+  var osm2 = new L.TileLayer(
+    get_config_value('Map_Tile_URL'),
+    {
+      minZoom: 0,
+      maxZoom: 13,
+      attribution: (get_config_value('Map_Tile_Attribution') || null)
+    }
+  );
+  (new L.Control.MiniMap(osm2, { toggleDisplay: true })).addTo(map);

 }
 
 
 jQuery(document).ready(function () {
   if (!$('#details-page').length) { return; }
 
 }
 
 
 jQuery(document).ready(function () {
   if (!$('#details-page').length) { return; }
 

-  var search_params = new URLSearchParams(location.search);
+  var search_params = new URLSearchParams(window.location.search);

   // var place_id = search_params.get('place_id');
 
   var api_request_params = {
   // var place_id = search_params.get('place_id');
 
   var api_request_params = {


@@ -65,7 +74,7 @@ jQuery(document).ready(function () {
 
   if (api_request_params.place_id || (api_request_params.osmtype && api_request_params.osmid)) {
     fetch_from_api('details', api_request_params, function (aFeature) {
 
   if (api_request_params.place_id || (api_request_params.osmtype && api_request_params.osmid)) {
     fetch_from_api('details', api_request_params, function (aFeature) {

-      var context = { aPlace: aFeature, base_url: location.search };
+      var context = { aPlace: aFeature, base_url: window.location.search };

 
       render_template($('main'), 'detailspage-template', context);
       if (api_request_params.place_id) {
 
       render_template($('main'), 'detailspage-template', context);
       if (api_request_params.place_id) {