for search,details in format=HTML return geometry in geojson, not wkt. No longer need leaflet-omnivore plugin

lib/template/details-html.php

@@ -241,7 +241,7 @@
         echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
         $aPlace = array(
-                'outlinestring' => $aPointDetails['outlinestring'],
+                'asgeojson' => $aPointDetails['asgeojson'],
                 'lon' => $aPointDetails['lon'],
                 'lat' => $aPointDetails['lat'],
         );

lib/template/includes/html-footer.php

@@ -10,5 +10,4 @@
 <script src="js/jquery.min.js"></script>
 <script src="js/bootstrap.min.js"></script>
 <script src="js/leaflet.min.js"></script>
-<script src="js/leaflet-omnivore.min.js"></script>
 <script src="js/nominatim-ui.js"></script>

lib/template/search-html.php

@@ -17,8 +17,8 @@
         <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm">Search</button>
             <?php if (CONST_Search_AreaPolygons) { ?>
-                <!-- <input type="checkbox" value="1" name="polygon" <?php if ($bAsText) echo "checked='checked'"; ?>/> Highlight -->
+                <!-- <input type="checkbox" value="1" name="polygon_geojson" <?php if ($bAsGeoJSON) echo "checked='checked'"; ?>/> Highlight -->
-                <input type="hidden" value="1" name="polygon" />
+                <input type="hidden" value="1" name="polygon_geojson" />
             <?php } ?>
             <input type="hidden" name="viewbox" value="<?php echo $sViewBox; ?>" />
             <div class="checkbox-inline">

website/details.php

@@ -99,10 +99,10 @@ $sSQL .= "    CASE ";
 $sSQL .= "       WHEN importance = 0 OR importance IS NULL THEN 0.75-(rank_search::float/40) ";
 $sSQL .= "       ELSE importance ";
 $sSQL .= "       END as calculated_importance, ";
-$sSQL .= "    ST_AsText(CASE ";
+$sSQL .= "    ST_AsGeoJSON(CASE ";
 $sSQL .= "                WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ";
 $sSQL .= "                ELSE geometry ";
-$sSQL .= "                END) as outlinestring";
+$sSQL .= "                END) as asgeojson";
 $sSQL .= " FROM placex ";
 $sSQL .= " WHERE place_id = $iPlaceID";
 

website/js/nominatim-ui.js

@@ -1,6 +1,22 @@
 var map;
 var last_click_latlng;
 
+function parse_and_normalize_geojson_string(raw_string){
+    // normalize places the geometry into a featurecollection, similar to
+    // https://github.com/mapbox/geojson-normalize
+    var parsed_geojson = {
+        type: "FeatureCollection",
+        features: [
+            {
+                type: "Feature",
+                geometry: JSON.parse(raw_string),
+                properties: {}
+            }
+        ]
+    };
+    return parsed_geojson;
+}
+
 jQuery(document).on('ready', function(){
 
     if ( !$('#search-page,#reverse-page').length ){ return; }
@@ -159,12 +175,18 @@ 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);
-            if (result.astext && result.astext.match(/(POLY)|(LINE)/) ){
+
-                var geojson_layer = L.geoJson(null, {
+            if (result.asgeojson && result.asgeojson.match(/(Polygon)|(Line)/) ){
-                    // http://leafletjs.com/reference.html#geojson-style
+
-                    style: function(feature) { return { clickable: false, color: 'blue' }; }
+                var geojson_layer = L.geoJson(
-                });
+                    parse_and_normalize_geojson_string(result.asgeojson),
-                omnivore.wkt.parse(result.astext,null,geojson_layer);
+                    {
+                        // http://leafletjs.com/reference-1.0.3.html#path-option
+                        style: function(feature) {
+                            return { interactive: false, color: 'blue' }; 
+                        }
+                    }
+                );
                 layerGroup.addLayer(geojson_layer);
             }
             else {
@@ -252,14 +274,18 @@ jQuery(document).on('ready', function(){
         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 ){
+        if ( nominatim_result.asgeojson ){
 
-            var geojson_layer = L.geoJson(null, {
+            var geojson_layer = L.geoJson(
-                // http://leafletjs.com/reference.html#geojson-style
+                parse_and_normalize_geojson_string(nominatim_result.asgeojson),
-                style: function(feature) { return { clickable: false, color: 'blue' }; }
+                {
-            });
+                    // http://leafletjs.com/reference-1.0.3.html#path-option
-            omnivore.wkt.parse(nominatim_result.outlinestring,null,geojson_layer);
+                    style: function(feature) {
-            layerGroup.addLayer(geojson_layer);
+                        return { interactive: false, color: 'blue' }; 
+                    }
+                }
+            );
+            map.addLayer(geojson_layer);
             map.fitBounds(geojson_layer.getBounds());
         } else {
             map.setView([nominatim_result.lat,nominatim_result.lon],10);

website/search.php

@@ -30,8 +30,8 @@ $sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2
 
 // Show / use polygons
 if ($sOutputFormat == 'html') {
-    $oGeocode->setIncludePolygonAsText($oParams->getBool('polygon'));
+    $oGeocode->setIncludePolygonAsGeoJSON($oParams->getBool('polygon_geojson'));
-    $bAsText = false;
+    $bAsGeoJSON = false;
 } else {
     $bAsPoints = $oParams->getBool('polygon');
     $bAsGeoJSON = $oParams->getBool('polygon_geojson');