From: Tom Hughes Date: Sun, 17 Dec 2023 18:40:23 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4414' X-Git-Tag: live~1370 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/49dcfa4a3fdbaa08e4ef0ff2aba153c7ccdc6aa8?hp=cfefe11187fcd23ce5e8d1ac7f038beeb1de1d36 Merge remote-tracking branch 'upstream/pull/4414' --- diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png deleted file mode 100644 index e25617013..000000000 Binary files a/app/assets/images/sprite.png and /dev/null differ diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c3a31d834..6a6e45186 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -37,8 +37,7 @@ time[title] { vertical-align: top; width: 20px; height: 20px; - background: transparent image-url("sprite.png") no-repeat 0 0; - background-image: image-url("sprite.svg"); + background: transparent image-url("sprite.svg") no-repeat 0 0; text-indent: -9999px; overflow: hidden; } diff --git a/config/key.yml b/config/key.yml index 7ab95dcdc..a3b144e9b 100644 --- a/config/key.yml +++ b/config/key.yml @@ -1,13 +1,13 @@ mapnik: # transportation: roads.mss - - { min_zoom: 6, max_zoom: 19, name: motorway, image: motorway.png } - - { min_zoom: 6, max_zoom: 7, name: main_road, image: mainroad.png } - - { min_zoom: 8, max_zoom: 11, name: main_road, image: mainroad8.png } - - { min_zoom: 12, max_zoom: 19, name: main_road, image: mainroad12.png } - - { min_zoom: 13, max_zoom: 19, name: track, image: track.png } - - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png } - - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png } - - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png } + - { min_zoom: 6, name: motorway, image: motorway.png } + - { min_zoom: 6, name: main_road, image: mainroad.png } + - { min_zoom: 8, name: main_road, image: mainroad8.png } + - { min_zoom: 12, name: main_road, image: mainroad12.png } + - { min_zoom: 13, name: track, image: track.png } + - { min_zoom: 13, name: bridleway, image: bridleway.png } + - { min_zoom: 13, name: cycleway, image: cycleway.png } + - { min_zoom: 13, name: footway, image: footway.png } - { min_zoom: 8, name: rail, width: 52, height: 1, fill: "#787878" } - { min_zoom: 12, name: rail, image: rail12.svg } - { min_zoom: 18, name: rail, image: rail18.svg } @@ -19,55 +19,55 @@ mapnik: - { min_zoom: 14, name: tram_only, width: 52, height: 1, fill: "#6e6e6e" } - { min_zoom: 15, name: tram_only, image: tram15.svg } - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" } - - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png } - - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png } + - { min_zoom: 12, name: cable, image: cable.png } + - { min_zoom: 11, name: runway, image: runway.png } - { min_zoom: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss # administrative boundaries: admin.mss - { 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: 5, 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: 5, 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" } + - { min_zoom: 5, name: orchard, width: 26, height: 10, fill: "#bee5b5" } - { min_zoom: 12, name: orchard, width: 26, height: 10, fill: "#aedfa3" } - - { min_zoom: 5, max_zoom: 11, name: grass, width: 26, height: 10, fill: "#d7efc0" } + - { min_zoom: 5, name: grass, width: 26, height: 10, fill: "#d7efc0" } - { min_zoom: 12, name: grass, width: 26, height: 10, fill: "#cdebb0" } - - { min_zoom: 5, max_zoom: 11, name: farmland, width: 26, height: 10, fill: "#f1f3dd" } + - { min_zoom: 5, name: farmland, width: 26, height: 10, fill: "#f1f3dd" } - { min_zoom: 12, name: farmland, width: 26, height: 10, fill: "#eef0d5" } - - { min_zoom: 5, max_zoom: 11, name: heathland, width: 26, height: 10, fill: "#dee1b2" } + - { min_zoom: 5, name: heathland, width: 26, height: 10, fill: "#dee1b2" } - { min_zoom: 12, name: heathland, width: 26, height: 10, fill: "#d6d99f" } - - { min_zoom: 5, max_zoom: 11, name: scrubland, width: 26, height: 10, fill: "#d3dfbc" } + - { min_zoom: 5, name: scrubland, width: 26, height: 10, fill: "#d3dfbc" } - { min_zoom: 12, name: scrubland, width: 26, height: 10, fill: "#c8d7ab" } - - { min_zoom: 5, max_zoom: 11, name: bare_rock, width: 26, height: 10, fill: "#f1eae3" } + - { min_zoom: 5, name: bare_rock, width: 26, height: 10, fill: "#f1eae3" } - { min_zoom: 12, name: bare_rock, width: 26, height: 10, fill: "#eee5dc" } - - { min_zoom: 5, max_zoom: 11, name: sand, width: 26, height: 10, fill: "#f7edd1" } + - { min_zoom: 5, name: sand, width: 26, height: 10, fill: "#f7edd1" } - { min_zoom: 12, name: sand, width: 26, height: 10, fill: "#f5e9c6" } # landuse z8, z10: landcover.mss - { min_zoom: 10, name: park, width: 26, height: 10, fill: "#c8facc" } - { min_zoom: 10, name: golf, width: 26, height: 10, fill: "#def6c0" } - - { min_zoom: 8, max_zoom: 11, name: built_up, width: 26, height: 10, fill: "#d9d9d9" } + - { min_zoom: 8, name: built_up, width: 26, height: 10, fill: "#d9d9d9" } - { min_zoom: 12, max_zoom: 12, name: built_up, width: 26, height: 10, fill: "#dddddd" } - { min_zoom: 13, name: resident, width: 26, height: 10, fill: "#e0dfdf" } - { min_zoom: 13, name: retail, width: 26, height: 10, fill: "#ffd6d1" } - { min_zoom: 13, name: commercial, width: 26, height: 10, fill: "#f2dad9" } - { min_zoom: 13, name: industrial, width: 26, height: 10, fill: "#ebdbe8" } - - { min_zoom: 10, max_zoom: 11, name: farm, width: 26, height: 10, fill: "#f7e3c8" } + - { min_zoom: 10, name: farm, width: 26, height: 10, fill: "#f7e3c8" } - { min_zoom: 12, name: farm, width: 26, height: 10, fill: "#f5dcba" } - - { min_zoom: 10, max_zoom: 11, name: brownfield, width: 26, height: 10, fill: "#d2d2c3" } + - { min_zoom: 10, name: brownfield, width: 26, height: 10, fill: "#d2d2c3" } - { min_zoom: 12, name: brownfield, width: 26, height: 10, fill: "#c7c7b4" } - - { min_zoom: 10, max_zoom: 11, name: cemetery, width: 26, height: 10, fill: "#bbd5be" } + - { min_zoom: 10, name: cemetery, width: 26, height: 10, fill: "#bbd5be" } - { min_zoom: 12, name: cemetery, width: 26, height: 10, fill: "#aacbaf" } - - { min_zoom: 10, max_zoom: 11, name: allotments, width: 26, height: 10, fill: "#d4e6cc" } + - { min_zoom: 10, name: allotments, width: 26, height: 10, fill: "#d4e6cc" } - { min_zoom: 12, name: allotments, width: 26, height: 10, fill: "#c9e1bf" } - { min_zoom: 11, name: pitch, width: 26, height: 10, fill: "#88e0be" } - { 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: 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" } @@ -81,9 +81,9 @@ mapnik: - { 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 } + - { min_zoom: 15, name: private, image: private.png } + - { min_zoom: 15, name: destination, image: destination.png } + - { min_zoom: 12, name: construction, image: construction.png } cyclemap: - { min_zoom: 0, name: motorway, image: motorway.png } - { min_zoom: 12, name: motorway, image: motorway12.png } diff --git a/yarn.lock b/yarn.lock index 2eee9b212..f722b6a1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,10 +34,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.55.0": - version "8.55.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.55.0.tgz#b721d52060f369aa259cf97392403cb9ce892ec6" - integrity sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA== +"@eslint/js@8.56.0": + version "8.56.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" + integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== "@humanwhocodes/config-array@^0.11.13": version "0.11.13" @@ -229,14 +229,14 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8.0.0: - version "8.55.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.55.0.tgz#078cb7b847d66f2c254ea1794fa395bf8e7e03f8" - integrity sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA== + version "8.56.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" + integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.55.0" + "@eslint/js" "8.56.0" "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8"