Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor embed.js.erb with layers.yml #5571

Closed
wants to merge 10,000 commits into from
Closed
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
954eafd
Move create note callback to button click handler
AntonKhorev Dec 31, 2024
9d8ca8b
Pass location instead of marker to createNote()
AntonKhorev Dec 31, 2024
ae5b781
Rename updateMarker() to addCreatedNoteMarker()
AntonKhorev Dec 25, 2024
18f3adb
Remove unused return value of addCreatedNoteMarker()
AntonKhorev Dec 25, 2024
dc59b37
Add new note marker to root map layer instead of noteLayer
AntonKhorev Dec 25, 2024
f1835c9
Move new note page.pushstate/popstate next to page.load
AntonKhorev Dec 25, 2024
4ea6077
Convert newHalo() to addHalo() and removeHalo()
AntonKhorev Dec 25, 2024
6cc3125
Add addNewNoteMarker() and removeNewNoteMarker() functions
AntonKhorev Dec 25, 2024
5542858
Call removeNewNoteMarker() only from page.unload()
AntonKhorev Dec 25, 2024
17ab002
Remove active class from addNoteButton only in page.unload()
AntonKhorev Dec 25, 2024
feb7af2
Let page.load proceed when zoomed out, disabling submit
AntonKhorev Dec 25, 2024
5603309
Decrease new note marker opacity when zoomed out
AntonKhorev Dec 25, 2024
27aa2ed
Move new note marker to click location
AntonKhorev Dec 25, 2024
eaa5f58
Merge remote-tracking branch 'upstream/pull/5443'
tomhughes Jan 1, 2025
d38f648
Merge remote-tracking branch 'upstream/pull/5451'
tomhughes Jan 1, 2025
f0b8498
Remove commit parameter from diary controller test
AntonKhorev Jan 2, 2025
6f4b06d
Remove test_logout_removes_session_token
AntonKhorev Jan 2, 2025
d57033f
Use resourceful route for new message
AntonKhorev Jan 2, 2025
fc13e29
Localisation updates from https://translatewiki.net.
translatewiki Jan 2, 2025
b93b03f
Merge remote-tracking branch 'upstream/pull/5455'
tomhughes Jan 2, 2025
402d7b9
Merge remote-tracking branch 'upstream/pull/5456'
tomhughes Jan 2, 2025
7286ad0
Merge remote-tracking branch 'upstream/pull/5457'
tomhughes Jan 2, 2025
0016c6f
Use resourceful route for message reply
AntonKhorev Jan 2, 2025
f7b0e87
Remove "expired unread" short block status
AntonKhorev Jan 2, 2025
13994ca
Use resourceful routes for user new/create actions
AntonKhorev Jan 2, 2025
615a669
Convert Auth.providers into array
AntonKhorev Jan 3, 2025
eec5cad
Rename Account module to Accounts
AntonKhorev Jan 3, 2025
a6b8cf3
Merge remote-tracking branch 'upstream/pull/5454'
tomhughes Jan 3, 2025
44ec0e0
Merge remote-tracking branch 'upstream/pull/5458'
tomhughes Jan 3, 2025
c8c13e7
Merge remote-tracking branch 'upstream/pull/5460'
tomhughes Jan 3, 2025
95b919c
Merge remote-tracking branch 'upstream/pull/5461'
tomhughes Jan 3, 2025
cb80bd3
Add OldElementsController base class
AntonKhorev Jan 4, 2025
ccf7130
Move element version actions template to old elements directory
AntonKhorev Jan 4, 2025
c992d51
Move browse history template to old elements directory
AntonKhorev Jan 4, 2025
dda0fb6
Move history_title_html locale string to old_elements
AntonKhorev Jan 4, 2025
27d8235
Move redacted version locale strings to old_elements
AntonKhorev Jan 4, 2025
3350789
Show outbox after sending new message
AntonKhorev Jan 4, 2025
201796c
Fix options passed by allow_thirdparty_images
AntonKhorev Jan 4, 2025
11b887c
Allow thirdparty images on failed diary comment saves
AntonKhorev Jan 5, 2025
7a99295
Remove zoomend listener on history unload
AntonKhorev Jan 5, 2025
b816f5b
Remove 'center' argument of addChangeset()
AntonKhorev Jan 5, 2025
bb4720f
Move changeset data to a helper
AntonKhorev Jan 5, 2025
0b0569f
Write details attribute to changeset page
AntonKhorev Jan 5, 2025
c887f1d
Use details attribute to render changeset bounding box
AntonKhorev Jan 5, 2025
af9d4f2
Merge remote-tracking branch 'upstream/pull/5465'
tomhughes Jan 5, 2025
3faf9a7
Merge remote-tracking branch 'upstream/pull/5469'
tomhughes Jan 5, 2025
cdcf15e
Merge remote-tracking branch 'upstream/pull/5470'
tomhughes Jan 5, 2025
6e44415
Merge remote-tracking branch 'upstream/pull/5471'
tomhughes Jan 5, 2025
231177a
Merge remote-tracking branch 'upstream/pull/5464'
tomhughes Jan 5, 2025
97b14ce
Update leaflet-osm to latest upstream version
tomhughes Jan 5, 2025
68e5507
Make browse not found pages consistent
AntonKhorev Jan 6, 2025
7e8fd5d
Check deactivates_at to report if block was read after its end date
AntonKhorev Jan 6, 2025
e6b0afc
Merge remote-tracking branch 'upstream/pull/5475'
tomhughes Jan 6, 2025
f946797
Merge remote-tracking branch 'upstream/pull/5476'
tomhughes Jan 6, 2025
937d461
Update arguments of data overlay interestingNode()
AntonKhorev Jan 7, 2025
70012ab
Update redefinition of interestingNode to match leaflet-osm
tomhughes Jan 7, 2025
1ca2c28
Merge remote-tracking branch 'upstream/pull/5477'
tomhughes Jan 7, 2025
3df14c5
Report deactivates_at as block read date
AntonKhorev Jan 7, 2025
e74273d
Add ElementsController base class
AntonKhorev Jan 6, 2025
23488f2
Move browse/feature template to elements/show
AntonKhorev Jan 6, 2025
045f0ac
Update bundle
tomhughes Jan 7, 2025
65bbd32
Merge remote-tracking branch 'upstream/pull/5478'
tomhughes Jan 7, 2025
3c5e89e
Merge remote-tracking branch 'upstream/pull/5479'
tomhughes Jan 7, 2025
c20160d
Merge remote-tracking branch 'upstream/pull/5459'
tomhughes Jan 7, 2025
c7da54d
Bump leaflet.locatecontrol from 0.83.0 to 0.83.1
dependabot[bot] Jan 7, 2025
dcbfe85
Merge remote-tracking branch 'upstream/pull/5480'
tomhughes Jan 8, 2025
14b33b9
Restrict version of dry-schema for ruby 3.1.2 compatibility
gravitystorm Jan 8, 2025
2c1428c
Merge remote-tracking branch 'upstream/pull/5483'
tomhughes Jan 8, 2025
44843c1
Remove slashes from body css classes
AntonKhorev Jan 4, 2025
2d77633
Update documentation to avoid erb_lint deprecations
gravitystorm Jan 8, 2025
606b5c1
Use resourceful routes for terms view/accept/decline
AntonKhorev Jan 4, 2025
fa51bcb
Merge pull request #5462 from AntonKhorev/user-terms-resource
gravitystorm Jan 8, 2025
d877cd1
Merge remote-tracking branch 'upstream/pull/5486'
tomhughes Jan 8, 2025
6c0366d
Move trace descriptions out of success/failure sentences in emails
AntonKhorev Jan 9, 2025
55e3f90
Show diary entry after creation
gravitystorm Jan 8, 2025
45abfe4
Merge branch 'pull/5484'
AntonKhorev Jan 9, 2025
a6c6f26
Merge remote-tracking branch 'upstream/pull/5487'
tomhughes Jan 9, 2025
0535615
Bump eslint from 9.17.0 to 9.18.0
dependabot[bot] Jan 10, 2025
be8d769
Move number of points to file details in gpx emails
AntonKhorev Jan 11, 2025
4c73b26
Rename gpx description template to details
AntonKhorev Jan 11, 2025
5d79f12
Merge remote-tracking branch 'upstream/pull/5491'
tomhughes Jan 12, 2025
5d76ec0
Merge remote-tracking branch 'upstream/pull/5492'
tomhughes Jan 12, 2025
16bdcac
Added description, user_id, user_ip columns to notes
nenad-vujicic Jan 13, 2025
0f2df0b
display an encouragement to contribute after many anonymous notes
etienneJr Jan 12, 2025
1732325
Merge branch 'anonymous-notes-counter'
AntonKhorev Jan 13, 2025
f745cae
Test that encouragement appears after 10 anonymous notes
AntonKhorev Jan 13, 2025
fe214ad
Test that anonymous note encouragement disappears after login
AntonKhorev Jan 13, 2025
03c7b18
Test that anonymous note encouragement disappears after signup
AntonKhorev Jan 13, 2025
e9fd07a
Test that encouragement disappears after verified email signup
AntonKhorev Jan 13, 2025
2b7a480
Modify the way Friends are added
nertc Jan 14, 2025
be11f20
Refactor friendships controller and model
nertc Jan 14, 2025
f99bf8a
Remove references to OAuth 1 client_application model
AntonKhorev Jan 14, 2025
f3fc4cd
Added description and author_id methods to Note
nenad-vujicic Jan 13, 2025
59f15a9
Update bundle
tomhughes Jan 14, 2025
473aff0
Fix new rubocop warnings
tomhughes Jan 14, 2025
9e67c26
Merge remote-tracking branch 'upstream/pull/5498'
tomhughes Jan 14, 2025
914fff9
Merge remote-tracking branch 'upstream/pull/5495'
tomhughes Jan 14, 2025
9d7e597
Install add/remove event listeners directly on note layer
AntonKhorev Jan 14, 2025
22d6454
Bump qs from 6.13.1 to 6.14.0
dependabot[bot] Jan 14, 2025
2c19c21
Changed note's first comment body to description
nenad-vujicic Jan 14, 2025
11e0444
Added unit tests for new Note methods
nenad-vujicic Jan 13, 2025
699b680
Merge pull request #5501 from openstreetmap/dependabot/npm_and_yarn/q…
gravitystorm Jan 15, 2025
b8a1a90
Merge pull request #5449 from AntonKhorev/edit-preferences
gravitystorm Jan 15, 2025
f32aea6
Merge pull request #5433 from AntonKhorev/user-routes-api-namespace
gravitystorm Jan 15, 2025
aba6b55
Removed unused translations in preferences.show
nenad-vujicic Jan 15, 2025
8db2ff2
Use resourceful route for user status
AntonKhorev Dec 23, 2024
eb8416b
Bump osm-community-index from 5.9.0 to 5.9.1
dependabot[bot] Jan 15, 2025
ddba8fb
Merge branch 'pull/5503'
AntonKhorev Jan 16, 2025
b45eb03
Localisation updates from https://translatewiki.net.
translatewiki Jan 16, 2025
87e7f88
Remove account terms code unreachable for unregistered users
AntonKhorev Jan 16, 2025
702a861
Merge remote-tracking branch 'upstream/pull/5502'
tomhughes Jan 16, 2025
dfc843e
Merge remote-tracking branch 'upstream/pull/5506'
tomhughes Jan 16, 2025
283e7b9
Merge remote-tracking branch 'upstream/pull/5494'
tomhughes Jan 16, 2025
0ab8d95
Merge remote-tracking branch 'upstream/pull/5499'
tomhughes Jan 16, 2025
bde5fb4
Merge remote-tracking branch 'upstream/pull/5500'
tomhughes Jan 16, 2025
70afbd0
Bump allowed ECMAScript version to 2021 (ES12)
tomhughes Jan 16, 2025
3eccf65
Merge branch 'pull/5261'
AntonKhorev Jan 17, 2025
835756e
Fix missing translation of Follow links on dashboard
AntonKhorev Jan 17, 2025
84a9d71
Use form with normal-sized button on follows show pages
AntonKhorev Jan 17, 2025
297e837
Adds validating of notes foreign key
nenad-vujicic Jan 13, 2025
8f25c09
Merge pull request #5509 from AntonKhorev/restore-follows-form
gravitystorm Jan 17, 2025
d6238e8
Merge pull request #5508 from AntonKhorev/fix-dashboard-follow
gravitystorm Jan 17, 2025
4370fe4
Merge pull request #5437 from AntonKhorev/user-status-resource
gravitystorm Jan 17, 2025
bc630bc
Rename friends_with to follows
tomhughes Jan 17, 2025
256637f
Remove trailing whitespace from translation
tomhughes Jan 17, 2025
3fcdeba
Rename friendship_notification to follow_notification
tomhughes Jan 17, 2025
b5006ac
Drop rubocop exclusions that weren't doing anything
tomhughes Jan 17, 2025
5eb4c7c
Rename friends rate limit as follows
tomhughes Jan 17, 2025
42d622b
Rename friends as followings
tomhughes Jan 17, 2025
9c744ab
Remove "Public editing" line from settings page
AntonKhorev Jan 18, 2025
8809e1f
Merge remote-tracking branch 'upstream/pull/5510'
tomhughes Jan 18, 2025
8312ddf
Merge remote-tracking branch 'upstream/pull/5513'
tomhughes Jan 18, 2025
01d8dba
Allow map layers to specify an alternate tile set for dark mode
hlfan Jan 16, 2025
4241d49
Disable dark mode filtering by default
hlfan Jan 16, 2025
e066ed3
Use the dark version of TransportMap in dark mode
hlfan Jan 16, 2025
09aa3cc
Merge remote-tracking branch 'upstream/pull/5507'
tomhughes Jan 18, 2025
2074e9d
Merge branch 'pull/5512'
AntonKhorev Jan 18, 2025
82fb1bf
Replace lookup_friend with lookup_user in FollowsController
AntonKhorev Jan 18, 2025
1be8415
Use resourceful routes for api tracepoints
AntonKhorev Jan 18, 2025
2626c76
Add regexp constraints to trace ids
AntonKhorev Jan 18, 2025
f2a0f53
Create traces feed resource
AntonKhorev Jan 18, 2025
df1a9bb
Simplify diary_comments_path calls in tests
AntonKhorev Jan 18, 2025
899795a
Rename diary_comments_path to user_diary_comments_path
AntonKhorev Jan 18, 2025
6f71b37
Change user's diary comments path to match model name
AntonKhorev Jan 18, 2025
0829229
Create diary_comments resources for users
AntonKhorev Jan 18, 2025
43d6010
Add tabbed navigation to user's diary comments page
AntonKhorev Jan 18, 2025
9fbe52d
Create user comments controller base class
AntonKhorev Jan 19, 2025
420d9da
Create changeset_comments resources for users
AntonKhorev Jan 19, 2025
e096cc3
Include message_read attribute in api output of messages to self
AntonKhorev Jan 19, 2025
e86745f
Merge remote-tracking branch 'upstream/pull/5515'
tomhughes Jan 19, 2025
fdb3a7a
Merge remote-tracking branch 'upstream/pull/5516'
tomhughes Jan 19, 2025
fb7762f
Merge remote-tracking branch 'upstream/pull/5517'
tomhughes Jan 19, 2025
af880d1
Merge remote-tracking branch 'upstream/pull/5520'
tomhughes Jan 19, 2025
ebeef28
Enable I18n fallback for the embed page
tomhughes Jan 20, 2025
4470cb8
Merge pull request #5421 from tomhughes/ecma-version
gravitystorm Jan 20, 2025
79933db
Merge branch 'pull/5527'
AntonKhorev Jan 20, 2025
aafcd95
Test fallback locale on embed page
AntonKhorev Jan 20, 2025
18fd80e
Consistent usage of layer information in _osm_location cookie
mmd-osm Jan 21, 2025
268e51d
Update bundle
tomhughes Jan 21, 2025
50c5f44
Merge remote-tracking branch 'upstream/pull/5528'
tomhughes Jan 21, 2025
bd577d7
Merge remote-tracking branch 'upstream/pull/5518'
tomhughes Jan 21, 2025
6b7f644
Preload parent objects for user comments
tomhughes Jan 21, 2025
ebe7cf8
Add indexes on user+id to changeset and diary comments
tomhughes Jan 21, 2025
9f0d846
Merge branch 'pull/5530'
AntonKhorev Jan 21, 2025
7b19ba5
Merge branch 'pull/5531'
AntonKhorev Jan 21, 2025
8455b7c
Set needs_view by default for new blocks
AntonKhorev Jan 21, 2025
0edac40
Use a custom cop to check controller action names
gravitystorm Oct 16, 2024
322c6c3
Use flash.now for messages to be shown during this request
gravitystorm Jan 22, 2025
84a3a41
Create changeset subscription resource
AntonKhorev Jan 22, 2025
405559c
Merge remote-tracking branch 'upstream/pull/5534'
tomhughes Jan 22, 2025
aabe881
Merge remote-tracking branch 'upstream/pull/5532'
tomhughes Jan 22, 2025
c2b39a6
Merge remote-tracking branch 'upstream/pull/5529'
tomhughes Jan 22, 2025
b0cf194
Merge remote-tracking branch 'upstream/pull/5535'
tomhughes Jan 22, 2025
e310767
Merge remote-tracking branch 'upstream/pull/5533'
tomhughes Jan 22, 2025
b77c9f8
Create trace data resource
AntonKhorev Jan 23, 2025
f2903b8
Initialize I18n and OSM as soon as application.js loads
AntonKhorev Jan 23, 2025
3f62d67
Localisation updates from https://translatewiki.net.
translatewiki Jan 23, 2025
ef648a5
Add user transient attribute to oauth_access_token factory
AntonKhorev Jan 23, 2025
54c2787
Add user transient attribute to oauth_access_grant factory
AntonKhorev Jan 23, 2025
af0da1f
Merge remote-tracking branch 'upstream/pull/5541'
tomhughes Jan 23, 2025
8cf77a2
Merge remote-tracking branch 'upstream/pull/5537'
tomhughes Jan 23, 2025
cc3bccb
Create message read_mark resource
AntonKhorev Jan 23, 2025
3490eb5
Remove unused css classes from inbox table
AntonKhorev Jan 23, 2025
fafed5f
Create message mute resource
AntonKhorev Jan 23, 2025
9d34712
Remove RuboCop action names exception for messages controller
AntonKhorev Jan 23, 2025
74854f8
Remove doorkeeper_token branch from web deny_access
AntonKhorev Jan 24, 2025
47a8907
Move scope_enabled? to ApiController
AntonKhorev Jan 24, 2025
47d55a2
Simplify write_notes scope check in api notes controller
AntonKhorev Jan 24, 2025
01b5ed5
Create api map resource
AntonKhorev Jan 24, 2025
6b06be5
Fix some eslint errors (quotes, spacing and parseInt radix) on .js.er…
gravitystorm Jan 24, 2025
ff05871
Merge remote-tracking branch 'upstream/pull/5548'
tomhughes Jan 24, 2025
7d2ee0a
Merge remote-tracking branch 'upstream/pull/5542'
tomhughes Jan 24, 2025
959bc55
Merge remote-tracking branch 'upstream/pull/5543'
tomhughes Jan 24, 2025
605d7a5
Merge remote-tracking branch 'upstream/pull/5544'
tomhughes Jan 24, 2025
49e2572
Merge remote-tracking branch 'upstream/pull/5545'
tomhughes Jan 24, 2025
87e995b
Added error handling for data layer
mmd-osm Jan 24, 2025
6a9f585
Bump eslint from 9.18.0 to 9.19.0
dependabot[bot] Jan 24, 2025
96cbabe
Bump coverallsapp/github-action from 2.3.4 to 2.3.5
dependabot[bot] Jan 24, 2025
afa2e6f
Merge remote-tracking branch 'upstream/pull/5552'
tomhughes Jan 26, 2025
1770006
Merge remote-tracking branch 'upstream/pull/5553'
tomhughes Jan 26, 2025
6ef11b2
Merge remote-tracking branch 'upstream/pull/5536'
tomhughes Jan 26, 2025
6485930
Merge remote-tracking branch 'upstream/pull/5538'
tomhughes Jan 26, 2025
6316745
Merge remote-tracking branch 'upstream/pull/5551'
tomhughes Jan 26, 2025
d76b7a5
Update leaflet-osm to latest upstream version
tomhughes Jan 26, 2025
776459a
Drop ES6 polyfill
tomhughes Jan 26, 2025
22b0022
Drop IE specific favicon support
tomhughes Jan 26, 2025
dae7a00
Use baselayerchange/overlaylayerchange instead of layeradd/layerremov…
deevroman Jan 7, 2025
c7adb87
Merge branch 'pull/5474'
AntonKhorev Jan 27, 2025
a7da2a5
Remove layersAdded variable from map.updateLayers()
AntonKhorev Jan 27, 2025
558e05c
Close button for loading error alert
deevroman Jan 27, 2025
c4eda60
Increase the limit when a warning about a large number of objects is …
deevroman Jan 27, 2025
7c47cde
Merge remote-tracking branch 'upstream/pull/5561'
tomhughes Jan 27, 2025
8cab3c4
Merge remote-tracking branch 'upstream/pull/5562'
tomhughes Jan 27, 2025
0a6d1a8
DataLayer to consume JSON format responses
mmd-osm Jan 27, 2025
eb8543d
Bump coverallsapp/github-action from 2.3.5 to 2.3.6
dependabot[bot] Jan 27, 2025
fda8783
Remove IE conditional compilation that limited max features
AntonKhorev Jan 28, 2025
52fea99
Remove unused max_features parameter from feature warning
AntonKhorev Jan 28, 2025
475a3fd
Merge branch 'pull/5556'
AntonKhorev Jan 28, 2025
6874294
Removed author_{id, ip} methods from Note model
nenad-vujicic Jan 28, 2025
d7bdd03
Update bundle
tomhughes Jan 28, 2025
58e99ba
Merge remote-tracking branch 'upstream/pull/5564'
tomhughes Jan 28, 2025
ea8e6a9
Merge remote-tracking branch 'upstream/pull/5565'
tomhughes Jan 28, 2025
eaa0540
Merge remote-tracking branch 'upstream/pull/5566'
tomhughes Jan 28, 2025
f01cbc6
Merge remote-tracking branch 'upstream/pull/5560'
tomhughes Jan 28, 2025
b17f254
Merge remote-tracking branch 'upstream/pull/5568'
tomhughes Jan 28, 2025
09e802b
Merge remote-tracking branch 'upstream/pull/5563'
tomhughes Jan 28, 2025
b30b13b
Refactor embed.js.erb with layers.yml
hlfan Jan 29, 2025
4683f6a
Consolidate options destructuring
hlfan Jan 29, 2025
8b2e6b8
Add Sprockets directive
hlfan Jan 29, 2025
1a23bfa
Show reporting user on issues screen
nertc Jan 29, 2025
4f4808a
Don't remove-readd standard layer when layerParam is not empty in map…
AntonKhorev Jan 29, 2025
807d3aa
Remove unnecessary wrapper divs from data layer error message
AntonKhorev Jan 29, 2025
b00dc40
Abort loading when data layer is removed
AntonKhorev Jan 29, 2025
db08587
Show only description as a marker tooltip in note layer
AntonKhorev Jan 29, 2025
b7c171d
Abort loading when note layer is removed
AntonKhorev Jan 29, 2025
0cd18eb
Merge branch 'pull/4990'
AntonKhorev Jan 29, 2025
547fbf6
Select user ids from reports using pluck
AntonKhorev Jan 29, 2025
a6622e7
Merge remote-tracking branch 'upstream/pull/5573'
tomhughes Jan 29, 2025
af71ec5
Merge remote-tracking branch 'upstream/pull/5574'
tomhughes Jan 29, 2025
101642a
Merge remote-tracking branch 'upstream/pull/5576'
tomhughes Jan 29, 2025
66f519d
Merge remote-tracking branch 'upstream/pull/5577'
tomhughes Jan 29, 2025
02ac7ab
Merge remote-tracking branch 'upstream/pull/5578'
tomhughes Jan 29, 2025
68481fe
Merge remote-tracking branch 'upstream/pull/5575'
tomhughes Jan 29, 2025
36ce71f
Improve formatting
hlfan Jan 30, 2025
50e5d49
Refactor embed.js.erb with layers.yml
hlfan Jan 29, 2025
9eaaeb3
Merge branch 'embed-unified-layers' of https://github.com/hlfan/opens…
Jan 30, 2025
4d1e5e8
Remove other whitespace in layerId too
Jan 30, 2025
68ec170
Merge branch 'embed-unified-layers' of https://github.com/hlfan/opens…
Jan 30, 2025
b5e3494
Refactor embed.js.erb with layers.yml (rebased)
hlfan Jan 29, 2025
d02a92d
Merge branch 'embed-unified-layers' of https://github.com/hlfan/opens…
Feb 1, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
docker-db-data
log
tmp
docker-cache
.travis.yml
.git
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
30 changes: 30 additions & 0 deletions .erb_lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
linters:
AllowedScriptType:
enabled: true
disallow_inline_scripts: true
Rubocop:
enabled: true
rubocop_config:
inherit_from:
- .rubocop.yml
Layout/InitialIndentation:
Enabled: false
Layout/LineLength:
Enabled: false
Layout/TrailingEmptyLines:
Enabled: false
Layout/TrailingWhitespace:
Enabled: false
Lint/UselessAssignment:
Enabled: false
Naming/FileName:
Enabled: false
Style/FrozenStringLiteralComment:
Enabled: false
SelfClosingTag:
enabled: false
SpaceInHtmlTag:
enabled: true
exclude:
- '**/vendor/**'
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: A Bug
description: Something has gone wrong when you were using the website.
# title:
# labels:
# assignees:
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: url
attributes:
label: URL
description: Please share the URL where the issue can be seen.
placeholder: https://www.openstreetmap.org/...
validations:
required: false
- type: textarea
id: steps-reproduce
attributes:
label: How to reproduce the issue?
description: Please share the steps to reproduce the issue.
placeholder: 1. ..., 2. ..., 3. ...
validations:
required: false
- type: textarea
attributes:
label: Screenshot(s) or anything else?
description: Please add screenshots or additional information to help us understand your issue.
placeholder:
validations:
required: false
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
blank_issues_enabled: true
contact_links:
- name: There is an issue with a translation
url: https://wiki.openstreetmap.org/wiki/Website_internationalization#How_to_translate
about: Please read about how to use Translatewiki to correct translations
- name: There is an issue with the default map layer shown on the front page
url: https://github.com/gravitystorm/openstreetmap-carto
about: Please share your feedback with the OpenStreetMap-Carto team
- name: There is an issue with the iD editor used on the Edit tab
url: https://github.com/openstreetmap/iD
about: Please share your feedback with the iD team
- name: There is an issue with the search results
url: https://github.com/osm-search/Nominatim
about: Please share your feedback with the Nominatim team
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: 'Feature, Idea, Question'
description: You want to request a feature, share an idea or have a question.
# title:
# labels:
# assignees:
body:
- type: textarea
id: problem
attributes:
label: Problem
description: Please describe the problem or use case that is the cause for your feature request or idea.
placeholder:
validations:
required: false
- type: textarea
id: idea
attributes:
label: Description
description: Please describe your feature request, idea or question.
placeholder:
validations:
required: false
- type: textarea
attributes:
label: Screenshots
description: Please add screenshots or mockups if they can help us understand your request/idea/question.
placeholder:
validations:
required: false
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: "npm"
versioning-strategy: "increase-if-necessary"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
13 changes: 13 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!--
Please read the contributing guidelines before making a PR:
https://github.com/openstreetmap/openstreetmap-website/blob/master/CONTRIBUTING.md

Pay particular attention to the section on how to present PRs:
https://github.com/openstreetmap/openstreetmap-website/blob/master/CONTRIBUTING.md#pull-requests
-->

### Description
<!--Describe your changes in detail. If you have made changes to the UI, include screenshots. If your PR addresses a Github issue, please link to it.-->

### How has this been tested?
<!--Explain the steps you took to test your code.-->
35 changes: 35 additions & 0 deletions .github/workflows/danger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Danger

on:
pull_request_target:
types: [opened, synchronize]

permissions:
pull-requests: write
statuses: write

jobs:
danger:
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1
rubygems: 3.4.10
bundler-cache: true
- name: Create base branch
run: |
git fetch ${{ github.event.pull_request.base.repo.clone_url }} ${{ github.event.pull_request.base.sha }}:danger_base
- name: Create head branch
run: |
git fetch ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.event.pull_request.head.sha }}:danger_head
- name: Danger
env:
DANGER_GITHUB_BEARER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
bundle exec danger --verbose
41 changes: 41 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Docker
on:
- push
- pull_request
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true
jobs:
test:
name: Docker
runs-on: ubuntu-22.04
steps:
- name: Checkout source
uses: actions/checkout@v4
- name: Poke config
run: |
cp config/example.storage.yml config/storage.yml
cp config/docker.database.yml config/database.yml
touch config/settings.local.yml
- name: Build Docker Image
run: |
docker compose build
- name: Start Docker Compose
run: |
docker compose up -d
sleep 15 # let the DB warm up a little
- name: Prepare Database
run: |
docker compose run --rm web bundle exec rails db:migrate
docker compose run --rm web bundle exec rails i18n:js:export
docker compose run --rm web bundle exec rails assets:precompile
docker compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
- name: Test Basic Website
run: |
curl -siL http://127.0.0.1:3000 | egrep '^HTTP/1.1 200 OK'
curl -siL http://127.0.0.1:3000 | grep 'OpenStreetMap is the free wiki world map'
curl -siL http://127.0.0.1:3000/api/0.6/node/1 | grep 'Null Island'
- name: Test Complete Suite
run: |
docker compose run --rm web bundle exec rails db:test:prepare
docker compose run --rm web bundle exec rails test:all
103 changes: 103 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
name: Lint
on:
- push
- pull_request
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true
env:
os: ubuntu-22.04
ruby: '3.1'
jobs:
rubocop:
name: RuboCop
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby }}
rubygems: 3.4.10
bundler-cache: true
- name: Run rubocop
run: bundle exec rubocop --format fuubar
erblint:
name: ERB Lint
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby }}
rubygems: 3.4.10
bundler-cache: true
- name: Run erblint
run: bundle exec erb_lint .
eslint:
name: ESLint
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby }}
rubygems: 3.4.10
bundler-cache: true
- name: Cache node modules
uses: actions/cache@v4
with:
path: node_modules
key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-${{ env.os }}-
- name: Install node modules
run: bundle exec bin/yarn install
- name: Create dummy database configuration
run: cp config/example.database.yml config/database.yml
- name: Run eslint
run: bundle exec rails eslint
brakeman:
name: Brakeman
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby }}
rubygems: 3.4.10
bundler-cache: true
- name: Run brakeman
run: bundle exec brakeman -q
annotate_models:
env:
RAILS_ENV: test
name: Rails Annotate Models
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby }}
rubygems: 3.4.10
bundler-cache: true
- name: Setup database
run: |
sudo systemctl start postgresql
sudo -u postgres createuser -s $(id -un)
createdb openstreetmap
cp config/github.database.yml config/database.yml
bundle exec rails db:schema:load
- name: Run Annotate Models
run: bundle exec rails annotate_models
- name: Fail if model annotations are out of date
run: git diff --exit-code
Loading