polygons.php: print total number of broken polygons

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

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

-                               attributionControl: false, // moved to page footer
+                               attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),

                                scrollWheelZoom:    !L.Browser.touch,
                                touchZoom:          false
                        });
 
                                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);

        }
 
 
        }
 
 


@@ -124,9 +117,13 @@ 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/) ){
-                               var layer = omnivore.wkt.parse(result.astext);
-                               layerGroup.addLayer(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 {
                                // var layer = L.rectangle(bounds, {color: "#ff7800", weight: 1} );
                        }
                        else {
                                // var layer = L.rectangle(bounds, {color: "#ff7800", weight: 1} );


@@ -188,25 +185,32 @@ 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});
                map.addLayer(circle);
 
                if ( nominatim_result.outlinestring ){
                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 outline = omnivore.wkt.parse(nominatim_result.outlinestring);
-                       map.addLayer(outline);
-                       map.fitBounds(outline.getBounds());
+
+                       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);
                }
                } else {
                        map.setView([nominatim_result.lat,nominatim_result.lon],10);
                }