Merge remote-tracking branch 'upstream/pull/3655'

[rails.git] / app / assets / javascripts / index / browse.js

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 779a21d6986819423be701353b7ff9959797d2bf..8ef859d855b96650d0a579b49cc7693d6922f8a2 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,6 +1,5 @@
 OSM.initializeBrowse = function (map) {
   var browseBounds;
 OSM.initializeBrowse = function (map) {
   var browseBounds;

-  var selectedLayer;

   var dataLayer = map.dataLayer;
 
   dataLayer.setStyle({
   var dataLayer = map.dataLayer;
 
   dataLayer.setStyle({


@@ -51,10 +50,11 @@ OSM.initializeBrowse = function (map) {
     $("#browse_status").html(
       $("<div>")
         .append(
     $("#browse_status").html(
       $("<div>")
         .append(

+          $("<button type='button' class='btn-close float-end mt-1'>")
+            .click(cancel),

           $("<h2>")
             .text(I18n.t("browse.start_rjs.load_data"))
           $("<h2>")
             .text(I18n.t("browse.start_rjs.load_data"))

-            .prepend($("<span class='icon close'></span>").click(cancel)))
-        .append(
+            .prepend(),

           $("<div>")
             .append(
               $("<p class='alert alert-warning clearfix'></p>")
           $("<div>")
             .append(
               $("<p class='alert alert-warning clearfix'></p>")


@@ -92,7 +92,6 @@ OSM.initializeBrowse = function (map) {
       url: url,
       success: function (xml) {
         dataLayer.clearLayers();
       url: url,
       success: function (xml) {
         dataLayer.clearLayers();

-        selectedLayer = null;

 
         var features = dataLayer.buildFeatures(xml);
 
 
         var features = dataLayer.buildFeatures(xml);
 


@@ -112,24 +111,16 @@ OSM.initializeBrowse = function (map) {
           displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
         }
 
           displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
         }
 

+        if (map._objectLayer) {
+          map._objectLayer.bringToFront();
+        }
+

         dataLoader = null;
       }
     });
   }
 
   function onSelect(layer) {
         dataLoader = null;
       }
     });
   }
 
   function onSelect(layer) {

-    // Unselect previously selected feature
-    if (selectedLayer) {
-      selectedLayer.setStyle(selectedLayer.originalStyle);
-    }
-
-    // Redraw in selected style
-    layer.originalStyle = { color: layer.options.color, weight: layer.options.weight };
-    layer.setStyle({ color: "#0000ff", weight: 8 });
-

     OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id);
     OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id);

-
-    // Stash the currently drawn feature
-    selectedLayer = layer;

   }
 };
   }
 };