From: Tom Hughes Date: Sun, 6 Apr 2025 08:57:55 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/5893' X-Git-Tag: live~80 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/190b601f6cefc42c90a6541f2e7fd78c3d2d5572?hp=5521fa6ba3e77b97146b959b46d7ee209bc08a2b Merge remote-tracking branch 'upstream/pull/5893' --- diff --git a/Dockerfile b/Dockerfile index 5df13d717..884d69ef1 100644 --- 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 03c774f04..6c8bdc025 100644 --- 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; };