mark checkpoint_segments parameter as deprecated

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

diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index 862dfce82a6b019a7f3c129e23f5cc048664673c..31044d02ec524ede44751205f1ea5c10a5314919 100644 (file)
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -2,20 +2,33 @@ var map;
 var last_click_latlng;
 
 jQuery(document).on('ready', function(){
 var last_click_latlng;
 
 jQuery(document).on('ready', function(){

+
+       if ( !$('#search-page,#reverse-page').length ){ return; }
+       
+       var is_reverse_search = !!( $('#reverse-page').length );
+

        $('#q').focus();
 
        map = new L.map('map', {
        $('#q').focus();
 
        map = new L.map('map', {

-                               center: [nominatim_map_init.lat, nominatim_map_init.lon],
-                               zoom:   nominatim_map_init.zoom,
-                               attributionControl: false,
-                               scrollWheelZoom:    false,
-                               touchZoom:          false,
+                               attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),
+                               scrollWheelZoom:    !L.Browser.touch,
+                               touchZoom:          false

                        });
 
                        });
 

-       L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
-//             attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+       L.tileLayer(nominatim_map_init.tile_url, {
+               noWrap: true, // otherwise we end up with click coordinates like latitude -728
+               // moved to footer
+               attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'

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

+       map.setView([nominatim_map_init.lat, nominatim_map_init.lon], nominatim_map_init.zoom);
+
+       if ( is_reverse_search ){
+               // We don't need a marker, but an L.circle instance changes radius once you zoom in/out
+               var cm = L.circleMarker([nominatim_map_init.lat,nominatim_map_init.lon], { radius: 5, weight: 2, fillColor: '#ff7800', color: 'red', opacity: 0.75, clickable: false});
+               cm.addTo(map);
+       }
+

 
 
        function display_map_position(mouse_lat_lng){
 
 
        function display_map_position(mouse_lat_lng){


@@ -28,9 +41,11 @@ jQuery(document).on('ready', function(){
                        map.getCenter().lat.toFixed(5) + ',' + map.getCenter().lng.toFixed(5) +
                        " <a target='_blank' href='" + map_link_to_osm() + "'>view on osm.org</a>";
 
                        map.getCenter().lat.toFixed(5) + ',' + map.getCenter().lng.toFixed(5) +
                        " <a target='_blank' href='" + map_link_to_osm() + "'>view on osm.org</a>";
 

+               html_zoom = "map zoom: " + map.getZoom();
+

                html_viewbox = "viewbox: " + map_viewbox_as_string();
 
                html_viewbox = "viewbox: " + map_viewbox_as_string();
 

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

                $('input#use_viewbox').trigger('change');
        }
 
                $('input#use_viewbox').trigger('change');
        }
 


@@ -77,7 +92,7 @@ jQuery(document).on('ready', function(){
                return L.marker([result.lat,result.lon], {riseOnHover:true,title:result.name });
        }
        function circle_for_result(result){
                return L.marker([result.lat,result.lon], {riseOnHover:true,title:result.name });
        }
        function circle_for_result(result){

-               return L.circleMarker([result.lat,result.lon], { radius: 50, weight: 1, fillColor: '#F0F7FF', color: 'red', opacity: 0.75});
+               return L.circleMarker([result.lat,result.lon], { radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75, clickable: !is_reverse_search});

        }
 
        var layerGroup = new L.layerGroup().addTo(map);
        }
 
        var layerGroup = new L.layerGroup().addTo(map);


@@ -91,44 +106,51 @@ jQuery(document).on('ready', function(){
 
                layerGroup.clearLayers();
 
 
                layerGroup.clearLayers();
 

+               if (result.lat){
+                       var circle = circle_for_result(result);
+                       circle.on('click', function(){
+                               highlight_result(position);
+                       });
+                       layerGroup.addLayer(circle);                    
+               }

                if (result.aBoundingBox){
 
                if (result.aBoundingBox){
 

-                       console.log('bounding box, maybe polygon', result);

                        var bounds = [[result.aBoundingBox[0]*1,result.aBoundingBox[2]*1], [result.aBoundingBox[1]*1,result.aBoundingBox[3]*1]];
                        map.fitBounds(bounds);
                        var bounds = [[result.aBoundingBox[0]*1,result.aBoundingBox[2]*1], [result.aBoundingBox[1]*1,result.aBoundingBox[3]*1]];
                        map.fitBounds(bounds);

-                       if (result.astext && result.astext.match(/POLY/) ){
-                               var layer = omnivore.wkt.parse(result.astext);
-                               layerGroup.addLayer(layer);
-                               // layer.addTo(map);
-                               // addedLayers.push(layer);
+                       if (result.astext && result.astext.match(/(POLY)|(LINE)/) ){
+                               var geojson_layer = L.geoJson(null, {
+                                       // http://leafletjs.com/reference.html#geojson-style
+                                       style: function(feature) { return { clickable: false, color: 'blue' }; }
+                               });
+                               omnivore.wkt.parse(result.astext,null,geojson_layer);
+                               layerGroup.addLayer(geojson_layer);

                        }
                        else {
                        }
                        else {

-                               var layer = L.rectangle(bounds, {color: "#ff7800", weight: 1} );
-                               layerGroup.addLayer(layer);
+                               // var layer = L.rectangle(bounds, {color: "#ff7800", weight: 1} );
+                               // layerGroup.addLayer(layer);

                        }
                }
                else {
                        }
                }
                else {

-                       // console.log('lat,lon,zoom');
-                       map.panTo([result.lat,result.lon], result.zoom || nominatim_map_init.zoom);
-                       var circle = circle_for_result(result);
-                       circle.on('click', function(){
-                               highlight_result(i);
-                       });
-                       layerGroup.addLayer(layer);
+                       if ( is_reverse_search ){
+                               // make sure the search coordinates are in the map view as well
+                               map.fitBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {padding: [50,50], maxZoom: map.getZoom()});

 
 

-                       // circle.addTo(map);
+                               // better, but causes a leaflet warning
+                               // map.panInsideBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {animate: false});
+                       }
+                       else {
+                               map.panTo([result.lat,result.lon], result.zoom || nominatim_map_init.zoom);
+                       }

                }
 
                }
 

-               var crosshairIcon = L.icon({
-                       iconUrl:     'images/crosshair.png',
-                       iconSize:    [12, 12],
-                       iconAnchor:  [6, 6],
-               });
-               var crossMarker = new L.Marker([result.lat,result.lon], { icon: crosshairIcon, clickable: false});
-               layerGroup.addLayer(crossMarker);
+               // var crosshairIcon = L.icon({
+               //      iconUrl:     'images/crosshair.png',
+               //      iconSize:    [12, 12],
+               //      iconAnchor:  [6, 6],
+               // });
+               // var crossMarker = new L.Marker([result.lat,result.lon], { icon: crosshairIcon, clickable: false});
+               // layerGroup.addLayer(crossMarker);

 
 

-               // crossMarker.addTo(map);
-               // addedLayers.push(crossMarker);

 
 
                if (bool_focus){
 
 
                if (bool_focus){


@@ -136,16 +158,64 @@ jQuery(document).on('ready', function(){
                }
        }
 
                }
        }
 

-       $.each(nominatim_results, function(i, result){
-
-       });
-

 
        $('.result').on('click', function(e){
                highlight_result($(this).data('position'), true);
        });
 
 
        $('.result').on('click', function(e){
                highlight_result($(this).data('position'), true);
        });
 

+       if ( is_reverse_search ){
+               map.on('click', function(e){
+                       $('form input[name=lat]').val( e.latlng.lat);
+                       $('form input[name=lon]').val( e.latlng.lng);
+                       $('form').submit();
+               });
+       }
+

        highlight_result(0, false);
 
 
 });
        highlight_result(0, false);
 
 
 });

+
+
+jQuery(document).on('ready', function(){
+
+       if ( !$('#details-page').length ){ return; }
+
+
+               map = new L.map('map', {
+                                       // center: [nominatim_map_init.lat, nominatim_map_init.lon],
+                                       // zoom:   nominatim_map_init.zoom,
+                                       attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),
+                                       scrollWheelZoom:    false,
+                                       touchZoom:          false,
+                               });
+
+
+               L.tileLayer(nominatim_map_init.tile_url, {
+                       // moved to footer
+                       attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+               }).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});
+               map.addLayer(circle);
+
+               if ( nominatim_result.outlinestring ){
+
+                       var geojson_layer = L.geoJson(null, {
+                               // http://leafletjs.com/reference.html#geojson-style
+                               style: function(feature) { return { clickable: false, color: 'blue' }; }
+                       });
+                       omnivore.wkt.parse(nominatim_result.outlinestring,null,geojson_layer);
+                       layerGroup.addLayer(geojson_layer);
+                       map.fitBounds(geojson_layer.getBounds());
+               } else {
+                       map.setView([nominatim_result.lat,nominatim_result.lon],10);
+               }
+
+
+
+});
+