control requesting polygons from API without hidden HTML field

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

diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index 577774b6ecdadff4d0e0e920834e9517fdaa81f0..5455f8e8f6dc542170c4569f4b63cff4cb8d25a9 100755 (executable)
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -12,11 +12,13 @@ function display_map_position(mouse_lat_lng) {
 
   var html_mouse = 'mouse position: -';
   if (mouse_lat_lng) {
 
   var html_mouse = 'mouse position: -';
   if (mouse_lat_lng) {

-    html_mouse = 'mouse position: ' + [mouse_lat_lng.lat.toFixed(5), mouse_lat_lng.lng.toFixed(5)].join(',');
+    html_mouse = 'mouse position: '
+                  + [mouse_lat_lng.lat.toFixed(5), mouse_lat_lng.lng.toFixed(5)].join(',');

   }
   var html_click = 'last click: -';
   if (last_click_latlng) {
   }
   var html_click = 'last click: -';
   if (last_click_latlng) {

-    html_click = 'last click: ' + [last_click_latlng.lat.toFixed(5), last_click_latlng.lng.toFixed(5)].join(',');
+    html_click = 'last click: '
+                  + [last_click_latlng.lat.toFixed(5), last_click_latlng.lng.toFixed(5)].join(',');

   }
 
   var html_center = 'map center: '
   }
 
   var html_center = 'map center: '


@@ -26,7 +28,13 @@ function display_map_position(mouse_lat_lng) {
   var html_zoom = 'map zoom: ' + map.getZoom();
   var html_viewbox = 'viewbox: ' + map_viewbox_as_string();
 
   var html_zoom = 'map zoom: ' + map.getZoom();
   var html_viewbox = 'viewbox: ' + map_viewbox_as_string();
 

-  $('#map-position-inner').html([html_center, html_zoom, html_viewbox, html_click, html_mouse].join('<br/>'));
+  $('#map-position-inner').html([
+    html_center,
+    html_zoom,
+    html_viewbox,
+    html_click,
+    html_mouse
+  ].join('<br/>'));

 
   var center_lat_lng = map.wrapLatLng(map.getCenter());
   var reverse_params = {
 
   var center_lat_lng = map.wrapLatLng(map.getCenter());
   var reverse_params = {


@@ -40,12 +48,14 @@ function display_map_position(mouse_lat_lng) {
   $('input#use_viewbox').trigger('change');
 }
 
   $('input#use_viewbox').trigger('change');
 }
 

-function init_map_on_search_page(is_reverse_search, nominatim_results, request_lat, request_lon, init_zoom) {
-  //
+function init_map_on_search_page(is_reverse_search, nominatim_results, request_lat,
+  request_lon, init_zoom) {
+
+  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,
     touchZoom: false
   });
     scrollWheelZoom: true, // !L.Browser.touch,
     touchZoom: false
   });


@@ -53,7 +63,8 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
 
   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);
 
   // console.log(Nominatim_Config);
   }).addTo(map);
 
   // console.log(Nominatim_Config);


@@ -63,7 +74,7 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
   var osm2 = new L.TileLayer(get_config_value('Map_Tile_URL'), {
     minZoom: 0,
     maxZoom: 13,
   var osm2 = new L.TileLayer(get_config_value('Map_Tile_URL'), {
     minZoom: 0,
     maxZoom: 13,

-    attribution: (get_config_value('Map_Tile_Attribution') || null)
+    attribution: attribution

   });
   new L.Control.MiniMap(osm2, { toggleDisplay: true }).addTo(map);
 
   });
   new L.Control.MiniMap(osm2, { toggleDisplay: true }).addTo(map);
 


@@ -105,12 +116,14 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
     onAdd: function (/* map */) {
       var container = L.DomUtil.create('div', 'my-custom-control');
 
     onAdd: function (/* map */) {
       var container = L.DomUtil.create('div', 'my-custom-control');
 

-      $(container).text('show map bounds').addClass('leaflet-bar btn btn-sm btn-default').on('click', function (e) {
-        e.preventDefault();
-        e.stopPropagation();
-        $('#map-position').show();
-        $(container).hide();
-      });
+      $(container).text('show map bounds')
+        .addClass('leaflet-bar btn btn-sm btn-outline-secondary')
+        .on('click', function (e) {
+          e.preventDefault();
+          e.stopPropagation();
+          $('#map-position').show();
+          $(container).hide();
+        });

       $('#map-position-close a').on('click', function (e) {
         e.preventDefault();
         e.stopPropagation();
       $('#map-position-close a').on('click', function (e) {
         e.preventDefault();
         e.stopPropagation();


@@ -130,7 +143,9 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
 
   function update_viewbox_field() {
     // hidden HTML field
 
   function update_viewbox_field() {
     // hidden HTML field

-    $('input[name=viewbox]').val($('input#use_viewbox').prop('checked') ? map_viewbox_as_string() : '');
+    $('input[name=viewbox]')
+      .val($('input#use_viewbox')
+        .prop('checked') ? map_viewbox_as_string() : '');

   }
 
   map.on('move', function () {
   }
 
   map.on('move', function () {


@@ -155,8 +170,19 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
     update_viewbox_field();
   });
 
     update_viewbox_field();
   });
 

-
-
+  $("input[name='query-selector']").click(function () {
+    var query_val = $("input[name='query-selector']:checked").val();
+    if (query_val === 'simple') {
+      $('div.form-group-simple').removeClass('hidden');
+      $('div.form-group-structured').addClass('hidden');
+      $('.form-group-structured').find('input:text').val('');
+    } else if (query_val === 'structured') {
+      console.log('here');
+      $('div.form-group-simple').addClass('hidden');
+      $('div.form-group-structured').removeClass('hidden');
+      $('.form-group-simple').find('input:text').val('');
+    }
+  });

 
   function get_result_element(position) {
     return $('.result').eq(position);
 
   function get_result_element(position) {
     return $('.result').eq(position);


@@ -281,9 +307,6 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
 
 
 
 
 
 

-
-
-

 jQuery(document).ready(function () {
   //
   if (!$('#search-page,#reverse-page').length) { return; }
 jQuery(document).ready(function () {
   //
   if (!$('#search-page,#reverse-page').length) { return; }


@@ -309,7 +332,9 @@ jQuery(document).ready(function () {
     api_request_params = {
       lat: search_params.get('lat'),
       lon: search_params.get('lon'),
     api_request_params = {
       lat: search_params.get('lat'),
       lon: search_params.get('lon'),

-      zoom: (search_params.get('zoom') > 1 ? search_params.get('zoom') : get_config_value('Reverse_Default_Search_Zoom')),
+      zoom: (search_params.get('zoom') > 1
+        ? search_params.get('zoom')
+        : get_config_value('Reverse_Default_Search_Zoom')),

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


@@ -317,7 +342,9 @@ jQuery(document).ready(function () {
       // aPlace: aPlace,
       fLat: api_request_params.lat,
       fLon: api_request_params.lon,
       // aPlace: aPlace,
       fLat: api_request_params.lat,
       fLon: api_request_params.lon,

-      iZoom: (search_params.get('zoom') > 1 ? api_request_params.zoom : get_config_value('Reverse_Default_Search_Zoom'))
+      iZoom: (search_params.get('zoom') > 1
+        ? api_request_params.zoom
+        : get_config_value('Reverse_Default_Search_Zoom'))

     };
 
     update_html_title();
     };
 
     update_html_title();


@@ -332,7 +359,10 @@ jQuery(document).ready(function () {
         context.aPlace = aPlace;
 
         render_template($('main'), 'reversepage-template', context);
         context.aPlace = aPlace;
 
         render_template($('main'), 'reversepage-template', context);

-        update_html_title('Reverse result for ' + api_request_params.lat + ',' + api_request_params.lon);
+        update_html_title('Reverse result for '
+                            + api_request_params.lat
+                            + ','
+                            + api_request_params.lon);

 
         init_map_on_search_page(
           is_reverse_search,
 
         init_map_on_search_page(
           is_reverse_search,


@@ -359,25 +389,56 @@ jQuery(document).ready(function () {
   } else {
     api_request_params = {
       q: search_params.get('q'),
   } else {
     api_request_params = {
       q: search_params.get('q'),

-      polygon_geojson: search_params.get('polygon_geojson') ? 1 : 0,
+      street: search_params.get('street'),
+      city: search_params.get('city'),
+      county: search_params.get('county'),
+      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,

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

+      exclude_place_ids: search_params.get('exclude_place_ids'),

       format: 'jsonv2'
     };
 
     context = {
       format: 'jsonv2'
     };
 
     context = {

-      // aSearchResults: aResults,

       sQuery: api_request_params.q,
       sViewBox: search_params.get('viewbox'),
       sQuery: api_request_params.q,
       sViewBox: search_params.get('viewbox'),

-      env: Nominatim_Config,
-      sMoreURL: ''
+      env: {}

     };
 
     };
 

-    if (api_request_params.q) {
+    if (api_request_params.street || api_request_params.city || api_request_params.county
+      || api_request_params.state || api_request_params.country || api_request_params.postalcode) {
+      context.hStructured = {
+        street: api_request_params.street,
+        city: api_request_params.city,
+        county: api_request_params.county,
+        state: api_request_params.state,
+        country: api_request_params.country,
+        postalcode: api_request_params.postalcode
+      };
+    }
+
+    if (api_request_params.q || context.hStructured) {

 
       fetch_from_api('search', api_request_params, function (aResults) {
 
         context.aSearchResults = aResults;
 
 
       fetch_from_api('search', api_request_params, function (aResults) {
 
         context.aSearchResults = aResults;
 

+        if (aResults.length >= 10) {
+          var aExcludePlaceIds = [];
+          if (search_params.has('exclude_place_ids')) {
+            aExcludePlaceIds.search_params.get('exclude_place_ids').split(',');
+          }
+          for (var i = 0; i < aResults.length; i += 1) {
+            aExcludePlaceIds.push(aResults[i].place_id);
+          }
+
+          var parsed_url = new URLSearchParams(window.location.search);
+          parsed_url.set('exclude_place_ids', aExcludePlaceIds.join(','));
+          context.sMoreURL = '?' + parsed_url.toString();
+        }
+

         render_template($('main'), 'searchpage-template', context);
         update_html_title('Result for ' + api_request_params.q);
 
         render_template($('main'), 'searchpage-template', context);
         update_html_title('Result for ' + api_request_params.q);