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

feat/icons #195

Open
wants to merge 35 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9c726f4
style: Store old map style and add icons
ff6347 Aug 3, 2023
a4f0b7e
Merge branch 'main' into feat/icons
ff6347 Aug 4, 2023
10ecd45
chore: Add latest state of icons
ff6347 Aug 7, 2023
9e93a15
chore: Ignore .vscode/settings
ff6347 Aug 7, 2023
429535d
chore: changes to lockfile after merge
ff6347 Aug 7, 2023
36bbfdf
Merge branch 'fix/local-missing-map-markers' into feat/icons
ff6347 Aug 8, 2023
44e1474
feat: Add filtered railway data for map
ff6347 Aug 11, 2023
886418e
feat: Script for filtering railways data
ff6347 Aug 11, 2023
e29eb06
docs: OSM Requests to get berlin railway data
ff6347 Aug 11, 2023
72b1ed9
chore: Update tooling for geo json generation
ff6347 Aug 11, 2023
29fc831
chore: Workspace recommendations for http req
ff6347 Aug 11, 2023
06fdb9c
chore: Stage justfile before housekeeping
ff6347 Aug 14, 2023
bd6f790
chore: Stage data before housekeeping
ff6347 Aug 14, 2023
ab86a60
chore: Stage data before housekeeping
ff6347 Aug 14, 2023
a94d735
chore: Stage data before housekeeping
ff6347 Aug 14, 2023
4d91975
chore: housekeeping
ff6347 Aug 14, 2023
ee404b2
chore: Stage osm.http before housekeeping
ff6347 Aug 14, 2023
c62b19b
chore: housekeeping
ff6347 Aug 14, 2023
81fe41c
feat: Data pipeline based on GTFS data
ff6347 Aug 14, 2023
52570c7
docs: Explain created files
ff6347 Aug 14, 2023
a89ffae
fix: Justfile to not overwrite stops.geo.json
ff6347 Aug 14, 2023
56a6cf8
docs: Remove duplicate information on files
ff6347 Aug 14, 2023
644c7be
Merge branch 'staging' into feat/icons
ff6347 Aug 14, 2023
5d69b66
chore: Housekeeping
ff6347 Aug 14, 2023
86db70f
chore: Housekeeping
ff6347 Aug 14, 2023
b1d1824
chore: Housekeeping
ff6347 Aug 14, 2023
21709ef
chore: Housekeeping
ff6347 Aug 14, 2023
74849cc
chore: Housekeeping
ff6347 Aug 14, 2023
6263a29
docs: README for maki icons
ff6347 Aug 14, 2023
5929d38
Merge branch 'staging' into feat/icons
ff6347 Aug 15, 2023
b11a3f6
style(eslint): Use next config
ff6347 Aug 15, 2023
878db77
style(eslint): Fix some linting errors
ff6347 Aug 15, 2023
a9d504c
fix(types): Add unknon[] to make tsc happy
ff6347 Aug 15, 2023
cc619d6
Merge branch 'staging' of github.com:technologiestiftung/wegweiser-fr…
ff6347 Aug 15, 2023
035119e
Merge branch 'staging' into feat/icons
ff6347 Aug 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
tsconfigRootDir: "./",
}, // to enable features such as async/await
ignorePatterns: ["node_modules/*", ".next/*", ".out/*", "!.prettierrc.js"], // We don't want to lint generated files nor node_modules, but we want to lint .prettierrc.js (ignored by default by eslint)
extends: ["eslint:recommended"],
extends: ["eslint:recommended","next"],
overrides: [
// This configuration will apply only to TypeScript files
{
Expand Down
20 changes: 19 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,23 @@ yarn-error.log*
*.tsbuildinfo

# cache data
data

data/*.json

data/GTFS/agency.txt
data/GTFS/calendar_dates.txt
data/GTFS/calendar.txt
data/GTFS/frequencies.txt
data/GTFS/levels.txt
data/GTFS/pathways.txt
data/GTFS/README.md
data/GTFS/routes.txt
data/GTFS/shapes.txt
data/GTFS/stop_times.txt
data/GTFS/transfers.txt
data/GTFS/trips.txt

!data/stops.location_type_1.geo.json

.vscode/spellright.dict
.vscode/settings.json
41,299 changes: 41,299 additions & 0 deletions data/GTFS/stops.txt

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions data/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# DATA

The files following files are created by the npm script `downloadCacheData`

```plain
labels.json
records.json
texts.json
```

---

To create the public transport data set used in this project you need the [csvkit][csvkit] software, the [GTFS][gtfs] data set for the public transport system you want to use. The full GTFS data is **NOT** provided in this repository. You will only find the `stops.txt` under the `data/GTFS` directory. You can obtain the whole dataset from the [Berlin Open Data portal][opendata]. The only edit we did was renaming the header `stops_lon` to `lon` and `stops_lat` to `lat`. To clean this data and only get the stops within Berlins borders we used the area of Berlin as GeoJSON. This is also provided in `data/bezirksgrenzen.geojson` or you can obtain it from [daten.odis-berlin.de][odis].


```bash
brew install csvkit
npm ci
csvjson data/GTFS/stops.txt > data/stops.json
npx tsx scripts/json-to-geojson-stops.ts
```

This will produce several files:

```plain
stops.json
stops.geo.json
stops.location_type_0.geo.json
stops.location_type_1.geo.json

```


The file `stops.location_type_1.geo.json` contains all stops we need for our data layer in maptiler.

---

[gtfs]: https://developers.google.com/transit/gtfs/
[opendata]: https://daten.berlin.de/datensaetze/vbb-fahrplandaten-gtfs
[csvkit]: https://csvkit.readthedocs.io/en/latest/index.html
[odis]: https://daten.odis-berlin.de/de/dataset/bezirksgrenzen/
19 changes: 19 additions & 0 deletions data/bezirksgrenzen.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/stops.location_type_1.geo.json

Large diffs are not rendered by default.

Binary file removed docs/sample.db
Binary file not shown.
12 changes: 12 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# needs some things
# csv toolkit https://csvkit.readthedocs.io/en/latest/index.html
# install via
# `brew install csvkit`
default:
just --list --verbose

json-to-geojson:
npx tsx scripts/json-to-geojson-stops.ts

csv-to-json:
csvjson data/GTFS/stops.txt > data/stops.json
5 changes: 5 additions & 0 deletions map-design/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# MAKI Icon Set

Can be found here https://labs.mapbox.com/maki-icons/

Under Creative Commons Zero v1.0 Universal License
Binary file added map-design/all_maki_icons.zip
Binary file not shown.
Loading