Merge pull request #1555 from mtmail/setup-escape-shell-args

[nominatim.git] / website / js / nominatim-ui.js

diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index c971d7451fe0f6029996777d9a3cdd8be236d65b..32e7cbda8fc3321b1fd4a6b0389b91bb900a764d 100644 (file)
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -17,7 +17,7 @@ function parse_and_normalize_geojson_string(raw_string){
     return parsed_geojson;
 }
 
-jQuery(document).on('ready', function(){
+jQuery(document).ready(function(){
 
     if ( !$('#search-page,#reverse-page').length ){ return; }
     
@@ -93,9 +93,9 @@ jQuery(document).on('ready', function(){
         $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('<br/>'));
 
         var reverse_params = {
-            // lat: map.getCenter().lat.toFixed(5),
-            // lon: map.getCenter().lng.toFixed(5),
-            // zoom: 2,
+            lat: map.getCenter().lat.toFixed(5),
+            lon: map.getCenter().lng.toFixed(5),
+            zoom: map.getZoom(),
             format: 'html'
         }
         $('#switch-to-reverse').attr('href', 'reverse.php?' + $.param(reverse_params));
@@ -143,7 +143,7 @@ jQuery(document).on('ready', function(){
         ].join(',');
     }
     function map_link_to_osm(){
-        return "http://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng;
+        return "https://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng;
     }
 
     function get_result_element(position){
@@ -249,6 +249,14 @@ jQuery(document).on('ready', function(){
             $('form input[name=lon]').val(lat);
             $('form').submit();
         });
+    } else {
+        var search_params = new URLSearchParams(location.search);
+        var viewbox = search_params.get('viewbox');
+        if (viewbox) {
+            var coords = viewbox.split(','); // <x1>,<y1>,<x2>,<y2>
+            var bounds = L.latLngBounds([coords[1], coords[0]], [coords[3], coords[2]]);
+            L.rectangle(bounds, {color: "#69d53e", weight: 3, dashArray: '5 5', opacity: 0.8, fill: false}).addTo(map);
+        }
     }
 
     highlight_result(0, false);
@@ -265,7 +273,31 @@ jQuery(document).on('ready', function(){
 });
 
 
-jQuery(document).on('ready', function(){
+jQuery(document).ready(function(){
+
+    if ( !$('#details-index-page').length ){ return; }
+
+    $('#form-by-type-and-id,#form-by-osm-url').on('submit', function(e){
+        e.preventDefault();
+
+        var val = $(this).find('input[type=edit]').val();
+        var matches = val.match(/^\s*([NWR])(\d+)\s*$/i);
+
+        if (!matches) {
+            matches = val.match(/\/(relation|way|node)\/(\d+)\s*$/);
+        }
+
+        if (matches) {
+            $(this).find('input[name=osmtype]').val(matches[1].charAt(0).toUpperCase());
+            $(this).find('input[name=osmid]').val(matches[2]);
+            $(this).get(0).submit();
+        } else {
+            alert('invalid input');
+        }
+    });
+});
+
+jQuery(document).ready(function(){
 
     if ( !$('#details-page').length ){ return; }
 
@@ -284,9 +316,6 @@ jQuery(document).on('ready', function(){
             attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
         }).addTo(map);
 
-        var osm2 = new L.TileLayer(nominatim_map_init.tile_url, {minZoom: 0, maxZoom: 13, attribution: (nominatim_map_init.tile_attribution || null )});
-        var miniMap = new L.Control.MiniMap(osm2, {toggleDisplay: true}).addTo(map);
-
         var layerGroup = new L.layerGroup().addTo(map);
 
         var circle = L.circleMarker([nominatim_result.lat,nominatim_result.lon], { radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75});
@@ -309,6 +338,8 @@ jQuery(document).on('ready', function(){
             map.setView([nominatim_result.lat,nominatim_result.lon],10);
         }
 
+        var osm2 = new L.TileLayer(nominatim_map_init.tile_url, {minZoom: 0, maxZoom: 13, attribution: (nominatim_map_init.tile_attribution || null )});
+        var miniMap = new L.Control.MiniMap(osm2, {toggleDisplay: true}).addTo(map);
 
 
 });