Closes #5599 (literally)
### How has this been tested?
Adding a conditional breakpoint in the site.
You can view, comment on, or merge this pull request online at:
https://github.com/openstreetmap/openstreetmap-website/pull/5603
-- Commit Summary --
* Close directions popup with sidebar
--
@hlfan approved this pull request.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5602#pullrequestreview-2591805229
You are receiving this because you are subscribed to this thread.
Message ID:
__
@hlfan pushed 2 commits.
518936bdb6a406af4df829c3033819148ae6fd05 Remove parseFloat calls and
restructure
500f0e49b8f6c86ef86b952e6f96eccd1ed1545f Collect parseFloat/Int and
restructure mapParams
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5598/files/deb
@hlfan commented on this pull request.
>
-if (id.data("gpx")) {
- params.set("gpx", id.data("gpx"));
-} else if (hashParams.gpx) {
- params.set("gpx", hashParams.gpx);
-}
+ params.set("map", [
+(mapParams.object && hashArgs.center && hashArgs.zoom) || (id.data("lat")
@hlfan commented on this pull request.
> -
-if (mapParams.object) {
- params.set("id", mapParams.object.type + "/" + mapParams.object.id);
- mapParams = OSM.parseHash(location.hash);
- if (mapParams.center) {
-params.set("map", mapParams.zoom + "/" + mapParams.center.l
@nenad-vujicic commented on this pull request.
> + def note_description(author, description, user_id, user_ip)
+if !(user_id.nil? && user_ip.nil?) && !author.nil? && author.status ==
"deleted"
+ RichText.new("text", t("notes.show.description_when_author_is_deleted"))
+else
+
@nenad-vujicic pushed 4 commits.
a6d7c772e55e55d83ee696db0db9f3e41ac3116f Adds helper routine note_description
a16c1138e9c061f83accca1b433aeebaf882758f Replaces using description with
note_description
575538656733cc6a65f8f76292bd8931254da2a2 Removes note's author from RSS
2d0b7b6b874952a6759db
Affects `/profile/edit` pages.
You can view, comment on, or merge this pull request online at:
https://github.com/openstreetmap/openstreetmap-website/pull/5602
-- Commit Summary --
* Fix missing zoom argument of OSM.cropLocation in home location
-- File Changes --
M app/assets/javascri
@AntonKhorev commented on this pull request.
> +if params[:format] == "json"
+ render :html => @results.pluck(:name).join(", ")
It doesn't output json when `params[:format] == "json"`, does it? Did you
actually want plaintext?
--
Reply to this email directly or view it on GitHub:
ht
@AntonKhorev commented on this pull request.
> +
+
+
Why wouldn't you use a single flex container that puts weekday labels next to
the heatmap? No position absolute/relative, probably only one pixel value of
top padding for the labels to align them.
--
Reply to this email direct
@AntonKhorev commented on this pull request.
> @@ -237,11 +237,29 @@
<%= @user.description.to_html
%>
-<% if @heatmap_data.present? %>
-
-<%= tag.div(:id => "cal-heatmap", :data => { :heatmap =>
@heatmap_data.to_json }) %>
+
What does `class="small"` do?
--
Reply to this email di
@AntonKhorev commented on this pull request.
> +<% if @heatmap_data.present? %>
+
+<%= tag.div(:id => "cal-heatmap", :data => { :heatmap =>
@heatmap_data.to_json }) %>
+
+<% end %>
You overwrite this later almost entirely. I'd keep `if` because we will not
output the heatmap [under so
Diary and other user provided content frequently includes rather large external
images, which slows down page loading. We could force lazy loading of these
assets by adding a loading="lazy" attribute to img tags, as described here:
https://developer.mozilla.org/en-US/docs/Web/Performance/Lazy_lo
@AntonKhorev commented on this pull request.
> + <%= stylesheet_link_tag "heatmap" %>
+ <%= javascript_include_tag "heatmap" %>
The linked files don't exist yet. And the stylesheet won't exist later too.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/
@AntonKhorev commented on this pull request.
> + def note_description(author, description, user_id, user_ip)
+if !(user_id.nil? && user_ip.nil?) && !author.nil? && author.status ==
"deleted"
+ RichText.new("text", t("notes.show.description_when_author_is_deleted"))
+else
+ de
@kcne pushed 2 commits.
fde2ab967b45609d6d4186f00500b51b39f8c55d Add heatmap javascript logic, styles
and dependencies
7680971278a6941ebf3ce639aa1dd4b4c07767cc Add tests for heatmap data in
UsersController
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5402
Merged #5600 into master.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5600#event-16167247143
You are receiving this because you are subscribed to this thread.
Message ID:
___
rails-
Merged #5593 into master.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5593#event-16167247139
You are receiving this because you are subscribed to this thread.
Message ID:
___
rails-
Merged #5595 into master.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5595#event-16167247156
You are receiving this because you are subscribed to this thread.
Message ID:
___
rails-
@kcne commented on this pull request.
> +.heatmap-wrapper {
+ position: relative;
+ height: 130px;
+}
+
+.heatmap-labels {
+position: absolute;
+ top: 2px;
+ left: 17px;
+ padding-top: 21px;
+ z-index: 1;
+ overflow-y: hidden;
+}
+
+.heatmap {
+ margin-left: 50px;
+ height: 100%;
+ z-i
@tomhughes commented on this pull request.
> -
-if (mapParams.object) {
- params.set("id", mapParams.object.type + "/" + mapParams.object.id);
- mapParams = OSM.parseHash(location.hash);
- if (mapParams.center) {
-params.set("map", mapParams.zoom + "/" + mapParams.cent
@kcne commented on this pull request.
> + height: 100%;
+ z-index: 0;
I thought they did as precaution but they don't. Removed now and everything
works ok. Thank you.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5402#disc
@kcne commented on this pull request.
> + top: 2px;
+ left: 17px;
+ padding-top: 21px;
I had issues while making this work on UI with positioning. Fixed now, removed
padding top and relied on top property completely instead. Everything works
properly. Marking as resolved.
--
Reply to thi
@kcne commented on this pull request.
> + const translations = I18n.translations[locale] || I18n.translations.en;
+ const date = translations && translations.date;
+ const abbrMonthNames = date && date.abbr_month_names;
+
+ const months = abbrMonthNames || [];
+ return months[monthIndex + 1
@kcne commented on this pull request.
> + data: {
+source: heatmapData,
+type: "json",
+x: "date",
+y: "total_changes"
+ },
+ scale: {
+color: {
+ type: "threshold",
+ range: currentTheme === "dark" ? rangeColors :
Array.f
@kcne commented on this pull request.
> + type: "threshold",
+ range: currentTheme === "dark" ? rangeColors :
Array.from(rangeColors).reverse(),
+ domain: [10, 20, 30, 40]
+}
+ }
+}, [
+ [Tooltip, {
+text: (date, value) => getTooltipText(
@kcne commented on this pull request.
> //= link_tree ../../../vendor/assets/iD/iD/img
//= link_directory ../../../vendor/assets/iD/iD/data .json
//= link_directory ../../../vendor/assets/iD/iD/locales .json
//= link_directory ../../../vendor/assets/iD/iD/mapillary-js .css
//= link_director
@kcne pushed 4 commits.
b4abb7c36d77d8634bf116d6287ee698fa3e63ad Add heatmap data caching and query
for user contributions
754f79000ccce4a41eea7d2e09e1bc039b3feba7 Add heatmap container to user profile
view
183a14f2827d398b0465153b336204ad205981bb Add heatmap javascript logic, styles
and dep
Looks good to me, thanks.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5600#issuecomment-2631809543
You are receiving this because you are subscribed to this thread.
Message ID:
___
Looks good to me, thanks.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5595#issuecomment-2631802593
You are receiving this because you are subscribed to this thread.
Message ID:
___
Looks good to me, thanks.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5593#issuecomment-2631798816
You are receiving this because you are subscribed to this thread.
Message ID:
___
@kcne pushed 2 commits.
4347c00fb4b694a918dc9134c2f8f53d22392525 Add heatmap javascript logic, styles
and dependencies
ad50c87e692aa87a3644027fb519c494b191e735 Add tests for heatmap data in
UsersController
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5402
@nenad-vujicic approved this pull request.
Works great on my side and is aligned with what I'm trying to achieve. Thanks!
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5593#pullrequestreview-2590669374
You are receiving this b
1 Warning
:warning:
Number of updated lines of code is too large to
be in one PR. Perhaps it should be separated into two or more?
Generated by :no_entry_sign: https://danger.systems/";>Danger
--
Reply to this e
@kcne pushed 4 commits.
5969abfcaf1c424db763488dcf05738884750192 Add heatmap data caching and query
for user contributions
66834e32332adf773e8866f55452bd1379bdfa46 Add heatmap container to user profile
view
49b1c4192368f34bf891d64555af5900ad7a79ac Add heatmap javascript logic, styles
and dep
@nenad-vujicic commented on this pull request.
>def description
-comments.first.body
+if user_ip.nil? && user_id.nil?
+ comments.first.body
+else
+ RichText.new("text", super)
+end
end
> ... Why wouldn't you start with a helper?
Added helper routine, using help
@nenad-vujicic pushed 3 commits.
e40073a41ab4864c48a0211518226f10d6725ccd Adds helper routine note_description
f11a62a7d5cb1bc393e37507fdf7424edd1c3467 Replaces using description with
note_description
d88ddf0516e5022ef310171927158058be57b578 Removes note's author from RSS
--
View it on GitHu
@AntonKhorev pushed 1 commit.
f1a873e305c7ec0db7c01ce6ae2d625a14f41c0c Refactor api changeset discussion
tests
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5600/files/1ab50d43526e2164538d8bead9d32f20c32ae91e..f1a873e305c7ec0db7c01ce6ae2d625a14f41c0c
You are
@AntonKhorev pushed 1 commit.
1ab50d43526e2164538d8bead9d32f20c32ae91e Refactor api changeset discussion
tests
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5600/files/98bbf9c65c9c1f1e33ba2b3c52ba36fd3c75c624..1ab50d43526e2164538d8bead9d32f20c32ae91e
You are
Replaces lines like this
```ruby
assert_select
"osm>changeset>discussion>comment:nth-child(1)>@id",
comment1.id.to_s
```
with nested `assert_dom`s.
You can view, comment on, or merge this pull request online at:
https://github.com/openstreetmap/openstreetmap-website/pull/5600
-- Commit Summar
@hlfan commented on this pull request.
> @@ -68,9 +95,6 @@ module.exports = [
"no-lone-blocks": "error",
"no-lonely-if": "error",
"no-loop-func": "error",
- "no-mixed-operators": "error",
- "no-multiple-empty-lines": "error",
Now the JSON diff (replacing `(\w+)(?=
@hlfan approved this pull request.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5557#pullrequestreview-2590405179
You are receiving this because you are subscribed to this thread.
Message ID:
__
@nenad-vujicic pushed 6 commits.
690d392bd866a411bed93aded9b18f884bcfcc21 Adds optional using of notes records
9e70276e1997d22e7e4cf496b87157749bb9e468 Adds helper routine note_description
38fde849ca894f1d8f21118bf2c7730c76c178a2 Replaces using description with
note_description
ce61e316e367870
@HolgerJeromin commented on this pull request.
> @@ -68,9 +95,6 @@ module.exports = [
"no-lone-blocks": "error",
"no-lonely-if": "error",
"no-loop-func": "error",
- "no-mixed-operators": "error",
- "no-multiple-empty-lines": "error",
Good catch!
I readded it again
@HolgerJeromin pushed 1 commit.
0d6ac49a4880903c709091f0242bab0744b49a36 Move deprecated eslint rules to
stylistic plugin
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5557/files/ebd82fc2c69f15eb258398dc43cdc45a90ed2a7f..0d6ac49a4880903c709091f0242bab0744b49
@hlfan requested changes on this pull request.
> @@ -68,9 +95,6 @@ module.exports = [
"no-lone-blocks": "error",
"no-lonely-if": "error",
"no-loop-func": "error",
- "no-mixed-operators": "error",
- "no-multiple-empty-lines": "error",
Why has [this rule](//eslint.s
@hlfan commented on this pull request.
> }
var hash = OSM.parseHash(location.hash);
const loc = Cookies.get("_osm_location")?.split("|");
+function parseBounds({ minlon, minlat, maxlon, maxlat }) {
+ return L.latLngBounds([minlat, minlon], [maxlat, maxlon]);
+}
### URL
https://www.openstreetmap.org/directions
### How to reproduce the issue?
1. build a route
2. click on a segment in directions - a popup shows up

3. close the sidebar - the route is removed but the
@AntonKhorev commented on this pull request.
> }
var hash = OSM.parseHash(location.hash);
const loc = Cookies.get("_osm_location")?.split("|");
+function parseBounds({ minlon, minlat, maxlon, maxlat }) {
+ return L.latLngBounds([minlat, minlon], [maxlat, maxlon]);
+
@hlfan approved this pull request.
Thanks for catching that!
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5595#pullrequestreview-2590173409
You are receiving this because you are subscribed to this thread.
Message ID:
_
@hlfan pushed 1 commit.
1cec0586494e6c3f7c19596fa5e6e813a17e8522 Add eslint-plugin-erb to provide
linting of .js.erb files (#3)
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5559/files/87530daa135e258662dbbeea21d3bdb9e380cc75..1cec0586494e6c3f7c19596fa5e6e81
@hlfan pushed 1 commit.
1f47a294b9f2c2a514a11dc2262d1d0b365e Collect parseFloat/Int and
restructure mapParams
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5598/files/e5b853eb8738a0fbdbdef2cb3b9b5ef621f605ff..1f47a294b9f2c2a514a11dc2262d1d0b365e
You
@hlfan pushed 6 commits.
934c08bab0aea6ed70fe53b79a3586c05f6dacba Add early return
2b9477a412ea3f24acb5bbe53c4c7b95422cf6f9 Condense key passthrough
898c9e8ca54e74ca58839ce52637c7720feaeb5c Remove mapParams redefinition
f2b0dcde092829806dee820d3153ab3c778abcee Merge gpx parameter passthrough
2
When parsing isn't required, I removed the calls, otherwise, I tried to
bundle them so they get less in the way of things.
You can view, comment on, or merge this pull request online at:
https://github.com/openstreetmap/openstreetmap-website/pull/5598
-- Commit Summary --
* Remove parseFloa
Over the years this script has grown an increasing amount of technical debt. I
tried to remove some.
You can view, comment on, or merge this pull request online at:
https://github.com/openstreetmap/openstreetmap-website/pull/5597
-- Commit Summary --
* Add early return
* Condense key pass
### URL
https://www.openstreetmap.org/note/4574916#c10050110
### How to reproduce the issue?
If a note link contains comment id in the url hash, the map will not scroll to
the note marker.
For example open this link:
https://www.openstreetmap.org/note/4574916#c10050110
Instead of showing the
@HolgerJeromin pushed 1 commit.
ebd82fc2c69f15eb258398dc43cdc45a90ed2a7f Move deprecated eslint rules to
stylistic plugin
--
View it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5557/files/267183501e1bc9df671b3452d363389d19ccf5a1..ebd82fc2c69f15eb258398dc43cdc45a90ed2
@HolgerJeromin approved this pull request.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5595#pullrequestreview-2589632118
You are receiving this because you are subscribed to this thread.
Message ID:
__
See
https://github.com/openstreetmap/openstreetmap-website/pull/5592#discussion_r1938530806
In practice this should make no difference because lat/lon don't contain
any characters that need escaping. But there's still no reason for
attempting to escape them twice.
You can view, comment on, or m
Merged #5592 into master.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5592#event-16159434250
You are receiving this because you are subscribed to this thread.
Message ID:
___
rails-
Merged, thanks.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5594#issuecomment-2630278383
You are receiving this because you are subscribed to this thread.
Message ID:
___
rails-dev
Merged #5594 into master.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5594#event-16157884562
You are receiving this because you are subscribed to this thread.
Message ID:
___
rails-
62 matches
Mail list logo