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

diff --git a/Dockerfile b/Dockerfile
index 5df13d717e9cd655eec5c639315e282061725b43..884d69ef1e452f8ddafb0d08084b62d3f128de2c 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,10 +42,10 @@ RUN mkdir -p /app
 WORKDIR /app
 
 # Install Ruby packages
-ADD Gemfile Gemfile.lock /app/
+COPY Gemfile Gemfile.lock /app/
 RUN bundle install
 
 # Install NodeJS packages using yarn
-ADD package.json yarn.lock /app/
-ADD bin/yarn /app/bin/
+COPY package.json yarn.lock /app/
+COPY bin/yarn /app/bin/
 RUN bundle exec bin/yarn install

diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js
index 03c774f041da010d0df1ebff91c74f63e32c87f6..6c8bdc02591fc9d03a322aeb564232f17a39289a 100644 (file)
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -2,21 +2,6 @@ OSM.initializeDataLayer = function (map) {
   let dataLoader, loadedBounds;
   const dataLayer = map.dataLayer;
 
-  dataLayer.setStyle({
-    way: {
-      weight: 3,
-      color: "#000000",
-      opacity: 0.4
-    },
-    area: {
-      weight: 3,
-      color: "#ff0000"
-    },
-    node: {
-      color: "#00ff00"
-    }
-  });
-
   dataLayer.isWayArea = function () {
     return false;
   };