From: Tom Hughes Date: Tue, 12 Dec 2023 18:40:33 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4398' X-Git-Tag: live~1386 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/75042a04a1e2dec2c821de14237a6b4d5a95382a?hp=7e8af1e33acb323ef4ba7c6adb0510159af5ccc6 Merge remote-tracking branch 'upstream/pull/4398' --- diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2588a737f..f2fa6763a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: ubuntu: [20.04, 22.04] - ruby: ['3.0', '3.1'] + ruby: ['3.0', '3.1', '3.2'] runs-on: ubuntu-${{ matrix.ubuntu }} env: RAILS_ENV: test diff --git a/Gemfile b/Gemfile index 98b035188..8dd0576d1 100644 --- a/Gemfile +++ b/Gemfile @@ -41,6 +41,9 @@ gem "argon2" # Support brotli compression for assets gem "sprockets-exporters_pack" +# Restore File.exists? for oauth gem +gem "file_exists" + # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" gem "activerecord-import" diff --git a/Gemfile.lock b/Gemfile.lock index 212cdb73e..7d97c6de7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,7 +83,7 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) @@ -95,7 +95,7 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.863.0) + aws-partitions (1.864.0) aws-sdk-core (3.190.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -169,7 +169,7 @@ GEM sprockets-rails tilt date (3.3.4) - debug_inspector (1.1.0) + debug_inspector (1.2.0) deep_merge (1.2.2) delayed_job (4.1.11) activesupport (>= 3.0, < 8.0) @@ -244,6 +244,7 @@ GEM rake ffi-libarchive (1.1.13) ffi (~> 1.0) + file_exists (0.2.0) frozen_record (0.27.0) activemodel fspath (3.1.2) @@ -334,7 +335,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) mutex_m (0.2.0) - net-imap (0.4.7) + net-imap (0.4.8) date net-protocol net-pop (0.1.2) @@ -477,7 +478,7 @@ GEM rouge (4.2.0) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.58.0) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -519,7 +520,7 @@ GEM google-protobuf (~> 3.23) rake (>= 13.0.0) secure_headers (6.5.0) - selenium-webdriver (4.15.0) + selenium-webdriver (4.16.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -610,6 +611,7 @@ DEPENDENCIES factory_bot_rails faraday ffi-libarchive + file_exists frozen_record gd2-ffij (>= 0.4.0) htmlentities diff --git a/app/assets/images/key/mapnik/bridge.png b/app/assets/images/key/mapnik/bridge.png deleted file mode 100644 index d388d7b81..000000000 Binary files a/app/assets/images/key/mapnik/bridge.png and /dev/null differ diff --git a/app/assets/images/key/mapnik/bridge.svg b/app/assets/images/key/mapnik/bridge.svg new file mode 100644 index 000000000..4096e8166 --- /dev/null +++ b/app/assets/images/key/mapnik/bridge.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/images/key/mapnik/building.png b/app/assets/images/key/mapnik/building.png deleted file mode 100644 index bc074feeb..000000000 Binary files a/app/assets/images/key/mapnik/building.png and /dev/null differ diff --git a/app/assets/images/key/mapnik/building15.svg b/app/assets/images/key/mapnik/building15.svg new file mode 100644 index 000000000..cc0507340 --- /dev/null +++ b/app/assets/images/key/mapnik/building15.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/mapnik/building16.svg b/app/assets/images/key/mapnik/building16.svg new file mode 100644 index 000000000..6ff2210a5 --- /dev/null +++ b/app/assets/images/key/mapnik/building16.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/mapnik/intermittent_water.svg b/app/assets/images/key/mapnik/intermittent_water.svg new file mode 100644 index 000000000..ab728ce25 --- /dev/null +++ b/app/assets/images/key/mapnik/intermittent_water.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/assets/images/key/mapnik/reef.png b/app/assets/images/key/mapnik/reef.png new file mode 100644 index 000000000..713ac868e Binary files /dev/null and b/app/assets/images/key/mapnik/reef.png differ diff --git a/app/assets/images/key/mapnik/school.png b/app/assets/images/key/mapnik/school.png deleted file mode 100644 index 50f30a2f3..000000000 Binary files a/app/assets/images/key/mapnik/school.png and /dev/null differ diff --git a/app/assets/images/key/mapnik/school.svg b/app/assets/images/key/mapnik/school.svg new file mode 100644 index 000000000..b7600bf2c --- /dev/null +++ b/app/assets/images/key/mapnik/school.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/mapnik/station.png b/app/assets/images/key/mapnik/station.png deleted file mode 100644 index 6c36e3c61..000000000 Binary files a/app/assets/images/key/mapnik/station.png and /dev/null differ diff --git a/app/assets/images/key/mapnik/summit.png b/app/assets/images/key/mapnik/summit.png deleted file mode 100644 index 9dbfcd360..000000000 Binary files a/app/assets/images/key/mapnik/summit.png and /dev/null differ diff --git a/app/assets/images/key/mapnik/summit.svg b/app/assets/images/key/mapnik/summit.svg new file mode 100644 index 000000000..e9c831c7f --- /dev/null +++ b/app/assets/images/key/mapnik/summit.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/mapnik/tunnel.png b/app/assets/images/key/mapnik/tunnel.png deleted file mode 100644 index 4c52ff4fe..000000000 Binary files a/app/assets/images/key/mapnik/tunnel.png and /dev/null differ diff --git a/app/assets/images/key/mapnik/tunnel.svg b/app/assets/images/key/mapnik/tunnel.svg new file mode 100644 index 000000000..05cd7e713 --- /dev/null +++ b/app/assets/images/key/mapnik/tunnel.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/images/key/mapnik/wetland.png b/app/assets/images/key/mapnik/wetland.png new file mode 100644 index 000000000..d13748bc8 Binary files /dev/null and b/app/assets/images/key/mapnik/wetland.png differ diff --git a/config/key.yml b/config/key.yml index 4e7b29c19..f64ab8b37 100644 --- a/config/key.yml +++ b/config/key.yml @@ -26,8 +26,11 @@ mapnik: - { name: admin, width: 52, height: 2, fill: "#8d618b88" } # landcover z5: landcover.mss, water.mss - { name: lake, width: 26, height: 10, fill: "#aad3df" } + - { name: intermittent_water, image: intermittent_water.svg } - { min_zoom: 5, max_zoom: 9, name: glacier, image: glacier5.svg } - { min_zoom: 10, name: glacier, image: glacier10.svg } + - { min_zoom: 10, name: reef, image: reef.png } + - { min_zoom: 10, name: wetland, image: wetland.png } - { min_zoom: 5, max_zoom: 11, name: forest, width: 26, height: 10, fill: "#bddab1" } - { min_zoom: 12, name: forest, width: 26, height: 10, fill: "#add19e" } - { min_zoom: 5, max_zoom: 11, name: orchard, width: 26, height: 10, fill: "#bee5b5" } @@ -65,13 +68,19 @@ mapnik: - { min_zoom: 11, name: centre, width: 26, height: 10, fill: "#dffce2" } - { min_zoom: 10, name: reserve, image: reserve.svg } # admin.mss - { min_zoom: 8, name: military, image: military.svg } + - { min_zoom: 13, name: school, image: school.svg } + # buildings: buildings.mss + - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" } + - { min_zoom: 15, name: building, image: building15.svg } + - { min_zoom: 16, name: building, image: building16.svg } + # stations: stations.mss + - { min_zoom: 12, name: station, width: 4, height: 4, fill: "#7981b0" } + - { min_zoom: 13, name: station, width: 6, height: 6, fill: "#7981b0" } + - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" } # other - - { min_zoom: 12, max_zoom: 19, name: school, image: school.png } - - { min_zoom: 12, max_zoom: 19, name: building, image: building.png } - - { min_zoom: 12, max_zoom: 19, name: station, image: station.png } - - { min_zoom: 11, max_zoom: 19, name: summit, image: summit.png } - - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png } - - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png } + - { min_zoom: 11, name: summit, image: summit.svg } # amenity-points.mss + - { min_zoom: 13, name: tunnel, image: tunnel.svg } # roads.mss + - { min_zoom: 13, name: bridge, image: bridge.svg } # roads.mss - { min_zoom: 15, max_zoom: 19, name: private, image: private.png } - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png } - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png } diff --git a/config/locales/en.yml b/config/locales/en.yml index 3499244b6..31563243a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2335,7 +2335,10 @@ en: lake: - Lake - reservoir + intermittent_water: "Intermittent waterbody" glacier: "Glacier" + reef: "Reef" + wetland: "Wetland" farm: "Farm" brownfield: "Brownfield site" cemetery: "Cemetery" @@ -2347,6 +2350,7 @@ en: school: - School - university + - hospital building: "Significant building" station: "Railway station" summit: