Skip to content

Commit

Permalink
Merge branch 'master' of github.com:hiddewie/OpenRailwayMap-vector in…
Browse files Browse the repository at this point in the history
…to dark-mode
  • Loading branch information
hiddewie committed Dec 7, 2024
2 parents 35e2599 + da39662 commit 1bfbc76
Show file tree
Hide file tree
Showing 265 changed files with 3,567 additions and 1,313 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
!features
!import/sql
!import/docker-startup.sh
!import/tags.lua.js
!import/openrailwaymap.lua
!data/import
!martin
Expand Down
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,21 @@ loading_gauges:

Open a pull request where you provide details about the new loading gauge. Ensure the pull request contains references to documentation and places on the map where the loading gauge exists.

## I want to visualize a new track class on the map

Edit the file [`features/track_class.yaml`](https://github.com/hiddewie/OpenRailwayMap-vector/edit/master/features/track_class.yaml).

The file contains a list of track classes, each with a value (the value of the `railway:track_class` tag) and a color.

Add a new entry at a certain place in the list. The value is the `railway:track_class` tag value. For example:
```yaml
track_classes:
- { value: 'Z', color: 'blue' }
# ...
```

Open a pull request where you provide details about the new track class. Ensure the pull request contains references to documentation and places on the map where the track class exists.

## I want to improve the user interface

The HTML, Javascript and CSS of the user interface are located in the [proxy](https://github.com/hiddewie/OpenRailwayMap-vector/tree/master/proxy) directory.
Expand Down
21 changes: 21 additions & 0 deletions SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,24 @@ Run tests against the tiles:
```shell
hurl --test --verbose --variable base_url=http://localhost:3000 tiles/test/tiles.hurl
```

## Development

### Code generation

The YAML files in the `features` directory are templated into SQL and Lua code.

You can view the generated files:
```shell
docker build --target build-signals --tag build-signals --file import/Dockerfile . \
&& docker run --rm --entrypoint cat build-signals /build/signals_with_azimuth.sql | less

docker build --target build-lua --tag build-lua --file import/Dockerfile . \
&& docker run --rm --entrypoint cat build-lua /build/tags.lua | less

docker build --target build-styles --tag build-styles --file proxy.Dockerfile . \
&& docker run --rm --entrypoint ls build-styles

docker build --target build-styles --tag build-styles --file proxy.Dockerfile . \
&& docker run --rm --entrypoint cat build-styles standard.json | jq . | less
```
8 changes: 6 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,19 @@ services:
depends_on:
db:
condition: service_healthy
volumes:
- ./martin:/config
environment:
- DATABASE_URL=postgresql://postgres@db:5432/gis
ulimits:
nproc: 65535
nofile:
soft: 26677
hard: 46677
develop:
watch:
- action: rebuild
path: martin
- action: rebuild
path: symbols

martin-static:
build:
Expand Down
Loading

0 comments on commit 1bfbc76

Please sign in to comment.