use external makefile for pgxs with cmake

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

diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index a3d5e77cba2ba1fa07f2b49c8bfbafb5a210bb4f..3e0aabd2370fba5b52627ed37bd64b7e8ec38b1c 100644 (file)
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -10,31 +10,23 @@ jQuery(document).on('ready', function(){
        $('#q').focus();
 
        map = new L.map('map', {
        $('#q').focus();
 
        map = new L.map('map', {

-                               // center: [nominatim_map_init.lat || 0, 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', {
-               noWrap: true // otherwise we end up with click coordinates like latitude -728
+       L.tileLayer(nominatim_map_init.tile_url, {
+               noWrap: true, // otherwise we end up with click coordinates like latitude -728

                // moved to footer
                // moved to footer

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

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

-       if ( nominatim_map_init.lat ){
-               map.setView([nominatim_map_init.lat || 0, nominatim_map_init.lon], nominatim_map_init.zoom);
+       map.setView([nominatim_map_init.lat, nominatim_map_init.lon], nominatim_map_init.zoom);

 
 

-               if ( is_reverse_search ){
-                       // not really a market, but the .circle 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);
-               }
-       } else {
-               map.setView([0,0],2);
+       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);

        }
 
 
        }
 
 


@@ -49,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');
        }
 


@@ -123,7 +117,7 @@ jQuery(document).on('ready', function(){
 
                        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/) ){
+                       if (result.astext && result.astext.match(/(POLY)|(LINE)/) ){

                                var layer = omnivore.wkt.parse(result.astext);
                                layerGroup.addLayer(layer);
                        }
                                var layer = omnivore.wkt.parse(result.astext);
                                layerGroup.addLayer(layer);
                        }


@@ -135,7 +129,7 @@ jQuery(document).on('ready', function(){
                else {
                        if ( is_reverse_search ){
                                // make sure the search coordinates are in the map view as well
                else {
                        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]});
+                               map.fitBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {padding: [50,50], maxZoom: map.getZoom()});

 
                                // better, but causes a leaflet warning
                                // map.panInsideBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {animate: false});
 
                                // better, but causes a leaflet warning
                                // map.panInsideBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {animate: false});


@@ -187,16 +181,18 @@ jQuery(document).on('ready', function(){
                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: false,
+                                       attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),

                                        scrollWheelZoom:    false,
                                        touchZoom:          false,
                                });
 
                                        scrollWheelZoom:    false,
                                        touchZoom:          false,
                                });
 

-               L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+
+               L.tileLayer(nominatim_map_init.tile_url, {

                        // moved to footer
                        // moved to footer

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

                }).addTo(map);
 
                }).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});
                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});