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.

Sign up for GitHub

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

Jump to bottom

Rebase, rename and MAP-files #589

Merged
merged 33 commits into from
Sep 4, 2024
Merged

Rebase, rename and MAP-files #589

merged 33 commits into from
Sep 4, 2024

Conversation

emacgillavry
Copy link
Contributor

  • Rebased with main branch
  • Renamed docker-compose.yml to compose.yml, see recommendation
  • Removed version from compose.yml, see recommendation
  • Removed references to basiskaart.inc
  • Improved KBK10 and KBK50 MAP files

emacgillavry and others added 30 commits July 22, 2024 16:15
@emacgillavry
Set db pw on 1st build op database.
d6f49b3
@emacgillavry
Merge branch 'main' of github.com:Amsterdam/mapserver
79e40be
@emacgillavry
Set up MapServer image to serve topografie files for tiling.
e6fb0e5
@emacgillavry
Change to new brt_10 tables. Add ferries.
5e78864
@emacgillavry
Add filter for ferries.
591caa8
@emacgillavry
Differentiate electrification of trains.
b3a9b47
@emacgillavry
Add infrastructure to include bridges.
be96272
@emacgillavry
Align zoomlevels to work with both RD and WM.
e4f6dce
@emacgillavry
First pass to get data from refDB.
f5e74c2
@emacgillavry
Align maxscaledenom with tile schemes.
9dbbe75
@emacgillavry
Mount volumes. Remove version. Change filename.
cf18a2e
@emacgillavry
Merge branch 'main' of github.com:Amsterdam/mapserver
df4f385
@emacgillavry
Set up MapServer image to serve topografie files for tiling.
9bb743c
@emacgillavry
Change to new brt_10 tables. Add ferries.
a4a3dde
@emacgillavry
Add filter for ferries.
cd42d20
@emacgillavry
Differentiate electrification of trains.
e23b2aa
@emacgillavry
Add infrastructure to include bridges.
fd5b295
@emacgillavry
Align zoomlevels to work with both RD and WM.
8081f4b
@emacgillavry
First pass to get data from refDB.
cb3025a
@emacgillavry
Align maxscaledenom with tile schemes.
eb810d3
@emacgillavry
Mount volumes. Remove version. Change filename.
10b8ca8
@emacgillavry
Add modifications from main into this branch.
822fb91
@emacgillavry
Typos as incoming change was not resolved.
f7a2338
@emacgillavry
Re-introduce metro lines.
1da29e9
@emacgillavry
Configuration of permanent storage of database using volume was broken.
691bfab
@emacgillavry
Rewrite queries and update db connections.
f43f9ee
@emacgillavry
Only include visible layers. Align scaledenominators to tile scheme.
8ba76fe
@emacgillavry
Further specify scaledenominators. Add bridge numbers at deeper zoom …
df69960 
…levels.
@emacgillavry
Don't use KBK10 Plus labels for bridge names/numbers at zl13.
597573b
@emacgillavry
BGT labels.
3e3b83e
barrydaniels-nl
barrydaniels-nl approved these changes Sep 4, 2024
View reviewed changes
Copy link

@barrydaniels-nl barrydaniels-nl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@barrydaniels-nl barrydaniels-nl merged commit cc27177 into main Sep 4, 2024
4 checks passed
@barrydaniels-nl barrydaniels-nl deleted the emg_topo branch September 4, 2024 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barrydaniels-nl barrydaniels-nl barrydaniels-nl approved these changes

@Yrob Yrob Awaiting requested review from Yrob

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@emacgillavry @barrydaniels-nl