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

T-Interpolation #270

Draft
wants to merge 61 commits into
base: develop
Choose a base branch
from
Draft

T-Interpolation #270

wants to merge 61 commits into from

Conversation

maerki
Copy link
Contributor

@maerki maerki commented Dec 19, 2022

WIP

Adds capability to load raster or vector tiles for different timesteps

maerki and others added 30 commits September 26, 2022 15:13
# Conflicts:
#	shared/src/map/layers/tiled/vector/sublayers/symbol/Tiled2dMapVectorSymbolSubLayer.cpp
# Conflicts:
#	shared/src/map/layers/tiled/raster/Tiled2dMapRasterLayer.cpp
…tion

# Conflicts:
#	shared/src/map/layers/tiled/vector/sublayers/line/Tiled2dMapVectorLineSubLayer.cpp
#	shared/src/map/layers/tiled/vector/sublayers/polygon/Tiled2dMapVectorPolygonSubLayer.cpp
# Conflicts:
#	ios/maps/MCTextureLoader.swift
# Conflicts:
#	shared/public/Tiled2dMapSourceImpl.h
maerki and others added 27 commits November 18, 2022 10:56
# Conflicts:
#	ios/maps/Scheduling/MCScheduler.swift
#	shared/src/map/layers/tiled/raster/Tiled2dMapRasterLayer.cpp
# Conflicts:
#	shared/public/SimpleLayerInterface.h
#	shared/public/Tiled2dMapSourceImpl.h
#	shared/public/Tiled2dMapVectorLayer.h
#	shared/public/Tiled2dMapVectorLayerParserHelper.h
#	shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayer.cpp
…aps-core into feature/t-interpolation

# Conflicts:
#	shared/public/Tiled2dMapVectorLayer.h
#	shared/public/Tiled2dMapVectorLayerConfig.h
# Conflicts:
#	ios/graphics/Model/Quad2d.swift
# Conflicts:
#	android/src/main/java/io/openmobilemaps/mapscore/graphics/BitmapTextureHolder.kt
#	shared/src/map/layers/tiled/vector/sublayers/polygon/Tiled2dMapVectorPolygonSubLayer.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants