]> git.openstreetmap.org Git - rails.git/log
rails.git
11 months agoMerge remote-tracking branch 'upstream/pull/4410'
Tom Hughes [Fri, 15 Dec 2023 17:35:15 +0000 (17:35 +0000)]
Merge remote-tracking branch 'upstream/pull/4410'

11 months agoMerge remote-tracking branch 'upstream/pull/4408'
Tom Hughes [Fri, 15 Dec 2023 17:34:07 +0000 (17:34 +0000)]
Merge remote-tracking branch 'upstream/pull/4408'

11 months agoMerge remote-tracking branch 'upstream/pull/4404'
Tom Hughes [Fri, 15 Dec 2023 17:32:40 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4404'

11 months agoMerge remote-tracking branch 'upstream/pull/4406'
Tom Hughes [Fri, 15 Dec 2023 17:29:31 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/pull/4406'

11 months agoRemove max zoom from cyclemap map key
Anton Khorev [Fri, 15 Dec 2023 14:57:20 +0000 (17:57 +0300)]
Remove max zoom from cyclemap map key

11 months agoAdd pedestrian way to cyclemap map key
Anton Khorev [Fri, 15 Dec 2023 14:32:42 +0000 (17:32 +0300)]
Add pedestrian way to cyclemap map key

11 months agoRemove png sprites
Anton Khorev [Fri, 15 Dec 2023 13:58:13 +0000 (16:58 +0300)]
Remove png sprites

11 months agoAdd main road opnvkarte map key at z15
Anton Khorev [Fri, 15 Dec 2023 12:02:51 +0000 (15:02 +0300)]
Add main road opnvkarte map key at z15

11 months agoAdd main road opnvkarte map key
Anton Khorev [Fri, 15 Dec 2023 11:40:54 +0000 (14:40 +0300)]
Add main road opnvkarte map key

11 months agoKeep trailing semicolons in formatted tag values
Anton Khorev [Thu, 14 Dec 2023 15:08:06 +0000 (18:08 +0300)]
Keep trailing semicolons in formatted tag values

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Dec 2023 12:15:32 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoUpdate airport apron mapnik map key
Anton Khorev [Wed, 13 Dec 2023 13:22:13 +0000 (16:22 +0300)]
Update airport apron mapnik map key

11 months agoMerge remote-tracking branch 'upstream/pull/4398'
Tom Hughes [Tue, 12 Dec 2023 18:40:33 +0000 (18:40 +0000)]
Merge remote-tracking branch 'upstream/pull/4398'

11 months agoMerge remote-tracking branch 'upstream/pull/4397'
Tom Hughes [Tue, 12 Dec 2023 18:39:18 +0000 (18:39 +0000)]
Merge remote-tracking branch 'upstream/pull/4397'

11 months agoMerge remote-tracking branch 'upstream/pull/4396'
Tom Hughes [Tue, 12 Dec 2023 18:37:35 +0000 (18:37 +0000)]
Merge remote-tracking branch 'upstream/pull/4396'

11 months agoUpdate bundle
Tom Hughes [Tue, 12 Dec 2023 18:12:31 +0000 (18:12 +0000)]
Update bundle

11 months agoRun tests on ruby 3.2
Tom Hughes [Mon, 11 Dec 2023 17:18:34 +0000 (17:18 +0000)]
Run tests on ruby 3.2

11 months agoUse file_exists to provide File.exists? for ruby 3.2
Tom Hughes [Mon, 11 Dec 2023 17:17:28 +0000 (17:17 +0000)]
Use file_exists to provide File.exists? for ruby 3.2

This is needed for the oauth gem which uses it.

11 months agoUpdate tram mapnik map key
Anton Khorev [Mon, 11 Dec 2023 12:21:32 +0000 (15:21 +0300)]
Update tram mapnik map key

11 months agoUpdate light rail mapnik map key
Anton Khorev [Mon, 11 Dec 2023 12:09:54 +0000 (15:09 +0300)]
Update light rail mapnik map key

11 months agoSplit tram map key i18n string
Anton Khorev [Mon, 11 Dec 2023 12:04:34 +0000 (15:04 +0300)]
Split tram map key i18n string

11 months agoUpdate subway mapnik map key
Anton Khorev [Mon, 11 Dec 2023 11:50:13 +0000 (14:50 +0300)]
Update subway mapnik map key

11 months agoUpdate rail mapnik map key
Anton Khorev [Mon, 11 Dec 2023 11:46:35 +0000 (14:46 +0300)]
Update rail mapnik map key

11 months agoAdd reef mapnik map key
Anton Khorev [Mon, 11 Dec 2023 11:18:36 +0000 (14:18 +0300)]
Add reef mapnik map key

11 months agoAdd wetland mapnik map key
Anton Khorev [Mon, 11 Dec 2023 11:12:08 +0000 (14:12 +0300)]
Add wetland mapnik map key

11 months agoAdd intermittent waterbody mapnik map key
Anton Khorev [Mon, 11 Dec 2023 10:23:35 +0000 (13:23 +0300)]
Add intermittent waterbody mapnik map key

https://github.com/gravitystorm/openstreetmap-carto/blob/47a96cb6092198ba37992351a4059336ed58ae96/style/water.mss#L30

11 months agoUpdate tunnel and bridge mapnik map key
Anton Khorev [Mon, 11 Dec 2023 09:36:58 +0000 (12:36 +0300)]
Update tunnel and bridge mapnik map key

11 months agoUpdate peak mapnik map key
Anton Khorev [Mon, 11 Dec 2023 09:13:11 +0000 (12:13 +0300)]
Update peak mapnik map key

https://github.com/gravitystorm/openstreetmap-carto/blob/47a96cb6092198ba37992351a4059336ed58ae96/style/amenity-points.mss#L1384

11 months agoUpdate station mapnik map key
Anton Khorev [Mon, 11 Dec 2023 09:02:33 +0000 (12:02 +0300)]
Update station mapnik map key

https://github.com/gravitystorm/openstreetmap-carto/blob/47a96cb6092198ba37992351a4059336ed58ae96/style/stations.mss#L21

11 months agoUpdate major building mapnik map key
Anton Khorev [Mon, 11 Dec 2023 08:50:35 +0000 (11:50 +0300)]
Update major building mapnik map key

https://github.com/gravitystorm/openstreetmap-carto/blob/47a96cb6092198ba37992351a4059336ed58ae96/style/buildings.mss#L23

11 months agoUpdate societal amenities mapnik map key
Anton Khorev [Mon, 11 Dec 2023 08:32:02 +0000 (11:32 +0300)]
Update societal amenities mapnik map key

https://github.com/gravitystorm/openstreetmap-carto/blob/47a96cb6092198ba37992351a4059336ed58ae96/style/landcover.mss#L596

11 months agoMerge remote-tracking branch 'upstream/pull/4395'
Tom Hughes [Sun, 10 Dec 2023 18:50:00 +0000 (18:50 +0000)]
Merge remote-tracking branch 'upstream/pull/4395'

11 months agoMerge remote-tracking branch 'upstream/pull/4394'
Tom Hughes [Sun, 10 Dec 2023 18:49:20 +0000 (18:49 +0000)]
Merge remote-tracking branch 'upstream/pull/4394'

11 months agoUpdate bounded landuses
Anton Khorev [Fri, 8 Dec 2023 20:52:04 +0000 (23:52 +0300)]
Update bounded landuses

11 months agoUpdate landuse features
Anton Khorev [Fri, 8 Dec 2023 20:05:03 +0000 (23:05 +0300)]
Update landuse features

11 months agoAdd glacier images with borders
Anton Khorev [Fri, 8 Dec 2023 18:42:33 +0000 (21:42 +0300)]
Add glacier images with borders

11 months agoUpdate landcover features visible on z5
Anton Khorev [Fri, 8 Dec 2023 08:59:37 +0000 (11:59 +0300)]
Update landcover features visible on z5

11 months agoUpdate admin boundary color
Anton Khorev [Thu, 7 Dec 2023 10:59:39 +0000 (13:59 +0300)]
Update admin boundary color

11 months agoSort lowest zoom level features
Anton Khorev [Thu, 7 Dec 2023 10:46:31 +0000 (13:46 +0300)]
Sort lowest zoom level features

11 months agoAdd opnvkarte map key line widths on high zoom levels
Anton Khorev [Fri, 8 Dec 2023 10:48:31 +0000 (13:48 +0300)]
Add opnvkarte map key line widths on high zoom levels

11 months agoAllow to omit max_zoom if next map key entry has min_zoom
Anton Khorev [Fri, 8 Dec 2023 10:21:57 +0000 (13:21 +0300)]
Allow to omit max_zoom if next map key entry has min_zoom

11 months agoLoad map key data in controller
Anton Khorev [Fri, 8 Dec 2023 09:55:18 +0000 (12:55 +0300)]
Load map key data in controller

11 months agoMerge remote-tracking branch 'upstream/pull/4371'
Tom Hughes [Thu, 7 Dec 2023 16:19:23 +0000 (16:19 +0000)]
Merge remote-tracking branch 'upstream/pull/4371'

11 months agoMerge remote-tracking branch 'upstream/pull/4392'
Tom Hughes [Thu, 7 Dec 2023 16:06:22 +0000 (16:06 +0000)]
Merge remote-tracking branch 'upstream/pull/4392'

11 months agoAdd stop markers for opnvkarte map key
Anton Khorev [Tue, 28 Nov 2023 14:18:13 +0000 (17:18 +0300)]
Add stop markers for opnvkarte map key

11 months agoAdd high-zoom rail shape for opnvkarte map key
Anton Khorev [Tue, 28 Nov 2023 13:44:09 +0000 (16:44 +0300)]
Add high-zoom rail shape for opnvkarte map key

11 months agoAdd rail dash pattern for opnvkarte map key on zoom 11+
Anton Khorev [Mon, 27 Nov 2023 16:31:33 +0000 (19:31 +0300)]
Add rail dash pattern for opnvkarte map key on zoom 11+

11 months agoUpdate opnvkarte map key line widths up to 4px for different zooms
Anton Khorev [Mon, 27 Nov 2023 16:06:45 +0000 (19:06 +0300)]
Update opnvkarte map key line widths up to 4px for different zooms

11 months agoAdd transportation map key for opnvkarte
Anton Khorev [Sun, 26 Nov 2023 23:41:09 +0000 (02:41 +0300)]
Add transportation map key for opnvkarte

11 months agoAllow to omit zoom levels for map key entries
Anton Khorev [Sun, 26 Nov 2023 23:40:11 +0000 (02:40 +0300)]
Allow to omit zoom levels for map key entries

11 months agoResourceful routing for passwords
Andy Allan [Wed, 6 Dec 2023 18:41:00 +0000 (18:41 +0000)]
Resourceful routing for passwords

This also matches the routes used by devise

11 months agoUse path and url helpers for password links
Andy Allan [Wed, 6 Dec 2023 18:39:25 +0000 (18:39 +0000)]
Use path and url helpers for password links

11 months agoMerge remote-tracking branch 'upstream/pull/4391'
Tom Hughes [Wed, 6 Dec 2023 17:54:47 +0000 (17:54 +0000)]
Merge remote-tracking branch 'upstream/pull/4391'

11 months agoMerge remote-tracking branch 'upstream/pull/4390'
Tom Hughes [Wed, 6 Dec 2023 17:53:15 +0000 (17:53 +0000)]
Merge remote-tracking branch 'upstream/pull/4390'

11 months agoMerge remote-tracking branch 'upstream/pull/4389'
Tom Hughes [Wed, 6 Dec 2023 17:50:42 +0000 (17:50 +0000)]
Merge remote-tracking branch 'upstream/pull/4389'

11 months agoMerge remote-tracking branch 'upstream/pull/4388'
Tom Hughes [Wed, 6 Dec 2023 17:47:14 +0000 (17:47 +0000)]
Merge remote-tracking branch 'upstream/pull/4388'

11 months agoMigrate some sequences to use bigints
Andy Allan [Wed, 6 Dec 2023 14:42:40 +0000 (14:42 +0000)]
Migrate some sequences to use bigints

These primary keys were converted to bigints in migrations, but the
sequences were left unmentioned. If the original migrations are run on
postgresql 10.0+, then this leads to a mismatch in column types vs sequence
types. This migration fixes these mismatches.

If the original migrations were run on postgresql < 10, all sequences were
bigints anyway, and this migration is a no-op.

If the sequence is a bigint, then postgresql doesn't output that fact in the
statement dump.

Refs #4298

11 months agoRemove normalisation of immutable keyword
Andy Allan [Wed, 6 Dec 2023 13:55:11 +0000 (13:55 +0000)]
Remove normalisation of immutable keyword

This was no longer required after removing the database functions.

11 months agoRemove the references to plpgsql extension
Andy Allan [Wed, 6 Dec 2023 13:50:02 +0000 (13:50 +0000)]
Remove the references to plpgsql extension

This has been built-in since postgresql 9.0

11 months agoRemove the sequence type normalisation
Andy Allan [Wed, 29 Nov 2023 18:43:46 +0000 (18:43 +0000)]
Remove the sequence type normalisation

This can mask important matters with the definition of sequences

11 months agoRemove the timestamp normalisation
Andy Allan [Wed, 29 Nov 2023 16:01:07 +0000 (16:01 +0000)]
Remove the timestamp normalisation

The precision of the timestamps is controlled in our migrations,
and so any mismatch should be marked as an error.

The ar_internal_metadata is not controlled, but is timestamp(6) for
rails 6.0+ installations, and so this won't fail in CI.

11 months agoAdd comment for btree_gist to structure.sql
Andy Allan [Wed, 29 Nov 2023 15:10:01 +0000 (15:10 +0000)]
Add comment for btree_gist to structure.sql

Refs #4298

11 months agoFix new rubocop warnings
Tom Hughes [Tue, 5 Dec 2023 18:13:13 +0000 (18:13 +0000)]
Fix new rubocop warnings

11 months agoUpdate bundle
Tom Hughes [Tue, 5 Dec 2023 18:11:14 +0000 (18:11 +0000)]
Update bundle

11 months agoUse SecureRandom to generate user tokens
Tom Hughes [Mon, 4 Dec 2023 17:23:23 +0000 (17:23 +0000)]
Use SecureRandom to generate user tokens

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Dec 2023 12:24:02 +0000 (13:24 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoRemove unused .current from primary nav
Anton Khorev [Mon, 4 Dec 2023 02:10:41 +0000 (05:10 +0300)]
Remove unused .current from primary nav

11 months agoUpdate color of mapnik map key for lakes
Anton Khorev [Sun, 3 Dec 2023 22:58:23 +0000 (01:58 +0300)]
Update color of mapnik map key for lakes

11 months agoMerge remote-tracking branch 'upstream/pull/4384'
Tom Hughes [Sun, 3 Dec 2023 18:33:18 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/4384'

11 months agoMerge remote-tracking branch 'upstream/pull/4383'
Tom Hughes [Sun, 3 Dec 2023 18:32:54 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4383'

11 months agoMerge remote-tracking branch 'upstream/pull/4385'
Tom Hughes [Sun, 3 Dec 2023 18:32:34 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4385'

11 months agoBump eslint from 8.54.0 to 8.55.0
dependabot[bot] [Fri, 1 Dec 2023 23:08:06 +0000 (23:08 +0000)]
Bump eslint from 8.54.0 to 8.55.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.54.0...v8.55.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
11 months agoFix min zoom levels for some landcover mapnik map key features
Anton Khorev [Thu, 30 Nov 2023 23:39:14 +0000 (02:39 +0300)]
Fix min zoom levels for some landcover mapnik map key features

11 months agoMake mapnik map key for lakes visible on all zoom levels
Anton Khorev [Thu, 30 Nov 2023 23:10:14 +0000 (02:10 +0300)]
Make mapnik map key for lakes visible on all zoom levels

11 months agoMerge remote-tracking branch 'upstream/pull/4381'
Tom Hughes [Thu, 30 Nov 2023 17:56:24 +0000 (17:56 +0000)]
Merge remote-tracking branch 'upstream/pull/4381'

11 months agoFix mapnik map key for roads
Anton Khorev [Thu, 30 Nov 2023 16:12:34 +0000 (19:12 +0300)]
Fix mapnik map key for roads

The main changes are:
- no roads on zooms < 6
- no yellow-colored secondary highways without casing

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Nov 2023 12:18:45 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoMerge remote-tracking branch 'upstream/pull/4378'
Tom Hughes [Wed, 29 Nov 2023 12:49:32 +0000 (12:49 +0000)]
Merge remote-tracking branch 'upstream/pull/4378'

11 months agoUse 5 meter radius for input locations in Valhalla
Nils [Wed, 29 Nov 2023 12:06:41 +0000 (13:06 +0100)]
Use 5 meter radius for input locations in Valhalla

This will search for road segments within 5 meter radius of the input location and choose the best path from/to whichever segment gives the cheapest cost. It should be preferable in most scenarios compared to simply snapping to the closest segment.

I'll do the same PR for our web app at https://github.com/gis-ops/valhalla-app.

11 months agoMerge remote-tracking branch 'upstream/pull/4329'
Tom Hughes [Tue, 28 Nov 2023 22:21:50 +0000 (22:21 +0000)]
Merge remote-tracking branch 'upstream/pull/4329'

12 months agoMerge remote-tracking branch 'upstream/pull/4374'
Tom Hughes [Tue, 28 Nov 2023 18:43:45 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/4374'

12 months agoMerge remote-tracking branch 'upstream/pull/4373'
Tom Hughes [Tue, 28 Nov 2023 18:37:48 +0000 (18:37 +0000)]
Merge remote-tracking branch 'upstream/pull/4373'

12 months agoUpdate expected response for doorkeeper errors
Tom Hughes [Tue, 28 Nov 2023 18:35:11 +0000 (18:35 +0000)]
Update expected response for doorkeeper errors

12 months agoAllow FactoryBot to set primary key attributes
Tom Hughes [Tue, 28 Nov 2023 18:25:35 +0000 (18:25 +0000)]
Allow FactoryBot to set primary key attributes

We have at least model (Language) which does not use datbase
generated primary keys so we need to be able to set them.

https://github.com/thoughtbot/factory_bot_rails/pull/419

12 months agoUpdate bundle
Tom Hughes [Tue, 28 Nov 2023 18:18:17 +0000 (18:18 +0000)]
Update bundle

12 months agoMerge remote-tracking branch 'upstream/pull/4352'
Tom Hughes [Tue, 28 Nov 2023 18:11:40 +0000 (18:11 +0000)]
Merge remote-tracking branch 'upstream/pull/4352'

12 months agoStart summit mapnik map key at zoom 11
Anton Khorev [Mon, 27 Nov 2023 14:02:58 +0000 (17:02 +0300)]
Start summit mapnik map key at zoom 11

12 months agoStart dashed rail line mapnik map key at zoom 12
Anton Khorev [Mon, 27 Nov 2023 13:51:38 +0000 (16:51 +0300)]
Start dashed rail line mapnik map key at zoom 12

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Nov 2023 12:19:08 +0000 (13:19 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoMerge remote-tracking branch 'upstream/pull/4368'
Tom Hughes [Sun, 26 Nov 2023 19:01:20 +0000 (19:01 +0000)]
Merge remote-tracking branch 'upstream/pull/4368'

12 months agoMerge remote-tracking branch 'upstream/pull/4367'
Tom Hughes [Sun, 26 Nov 2023 18:57:16 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/4367'

12 months agoMerge remote-tracking branch 'upstream/pull/4366'
Tom Hughes [Sun, 26 Nov 2023 18:56:05 +0000 (18:56 +0000)]
Merge remote-tracking branch 'upstream/pull/4366'

12 months agoRead layers with available map key from config/key.yml
Anton Khorev [Fri, 24 Nov 2023 13:38:38 +0000 (16:38 +0300)]
Read layers with available map key from config/key.yml

12 months agoAdd tooltip to disabled html share button
Anton Khorev [Fri, 24 Nov 2023 13:00:45 +0000 (16:00 +0300)]
Add tooltip to disabled html share button

12 months agoDisable html share button for tracestracktopo layer
Anton Khorev [Fri, 24 Nov 2023 12:12:41 +0000 (15:12 +0300)]
Disable html share button for tracestracktopo layer

12 months agoDrop ACL check from notes#comment as we no longer allow anonymous comments
Tom Hughes [Thu, 23 Nov 2023 16:47:35 +0000 (16:47 +0000)]
Drop ACL check from notes#comment as we no longer allow anonymous comments

12 months agoPrevent unauthenticated users commenting on notes via the API
Tom Hughes [Thu, 23 Nov 2023 16:46:36 +0000 (16:46 +0000)]
Prevent unauthenticated users commenting on notes via the API

12 months agoRemove unused css for lists inside primary nav on narrow screens
Anton Khorev [Thu, 23 Nov 2023 16:52:51 +0000 (19:52 +0300)]
Remove unused css for lists inside primary nav on narrow screens

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Nov 2023 12:21:39 +0000 (13:21 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoMerge pull request #4296 from AntonKhorev/header-flex
Andy Allan [Wed, 22 Nov 2023 17:22:46 +0000 (17:22 +0000)]
Merge pull request #4296 from AntonKhorev/header-flex

Use flex container instead of floats in header