Feature raster tiles #141

quillasp · 2022-06-29T20:11:18Z

This is the first step of the raster tiles rendering feature #71. There's:

Raster style layer from the raster layer mapbox specification,
Raster layer that will hold the raster data
Two differents sources for vector tiles (Tessellate source) and raster source that will load different data following the layer type.

💻 Examples

🚨 Test instructions

✔️ PR Todo

Discussing how the different layer types should be fetched (one source client for the vector tiles and another one for the raster tiles? or fetching from the same source client with different address based on the layer type)
Raster data loading and storing
Raster rendering

This is the first step of the implementation of the raster tile rendering - Addition of a RasterLayer in the StoredLayer - Addition of a Source trait for loading TessellateSource and RasterSource

ybiletskyi · 2022-06-30T07:30:18Z

maplibre/src/io/tile_repository.rs

+    //     }
+    //     true
+    // }
+    pub fn is_layers_missing(


Probably rename to missed_layers. Clean up the commented code.

ybiletskyi · 2022-06-30T07:42:13Z

maplibre/src/stages/request_stage.rs

+{
+    fn load(request_stage: &RequestStage<SM, HC>, coords: &WorldTileCoords, request_id: u32) {
+        // Sould have a RasterSourceClient or should fetching happen depending
+        // on the tile type ?


You should pass URL to http client from where you want to load a data.

ybiletskyi · 2022-06-30T07:44:41Z

maplibre/src/stages/request_stage.rs

-                        })
-                    }))
-                    .unwrap();
+                // let client = SourceClient::Http(self.http_source_client.clone());


Clean up commented code.

ybiletskyi · 2022-06-30T07:58:11Z

maplibre/src/style/style.rs

+                    maxzoom: None,
+                    minzoom: None,
+                    metadata: None,
+                    paint: Some(LayerPaint::Raster(RasterLayer::default())),


paint should be None.

ybiletskyi · 2022-06-30T07:59:35Z

maplibre/src/style/layer.rs

@@ -39,17 +66,20 @@ pub enum LayerPaint {
    Line(LinePaint),
    #[serde(rename = "fill")]
    Fill(FillPaint),
+    #[serde(rename = "raster")]


Clean up this changes. We will not use LayerPaint for raster tiles.

The different sources handles the URL creation based on the layer type

ybiletskyi · 2022-07-01T07:52:26Z

maplibre/src/style/layer.rs

@@ -1,5 +1,6 @@
 //! Vector tile layer drawing utilities.



Looks like changes in this file is not used. Please clean up.

maxammann · 2022-07-04T13:54:02Z

maplibre-demo/src/main.rs

+        let tile_coords = coords.into_tile(TileAddressingScheme::TMS).unwrap();
+        let url = format!(
+            "https://maps.tuerantuer.org/europe_germany/{z}/{x}/{y}.pbf",
+            x = tile_coords.x,
+            y = tile_coords.y,
+            z = tile_coords.z
+        );


This transformation should happen within the source client.

maxammann · 2022-07-04T13:54:22Z

maplibre/src/io/source_client.rs

@@ -47,9 +47,9 @@ impl<HC> SourceClient<HC>
 where
    HC: HttpClient,
 {
-    pub async fn fetch(&self, coords: &WorldTileCoords) -> Result<Vec<u8>, Error> {
+    pub async fn fetch(&self, url: &str) -> Result<Vec<u8>, Error> {


The previous interface should be kept. What was the reason for the change?

maxammann · 2022-07-04T13:55:28Z

maplibre/src/stages/request_stage.rs

@@ -77,6 +79,85 @@ where
    }
 }

+pub trait Source<SM, HC>


Source should not be part of the stages module

maxammann · 2022-07-04T13:55:42Z

maplibre/src/stages/request_stage.rs

+    HC: HttpClient,
+{
+    fn load(
+        request_stage: &RequestStage<SM, HC>,


A source should not depend on the RequestStage and vice-versa

maxammann · 2022-07-04T13:59:53Z

maplibre/src/style/layer.rs

@@ -29,6 +30,32 @@ pub struct LinePaint {
    // TODO a lot
 }

+pub enum PaintType {
+    Argb(Alpha<EncodedSrgb<f32>>),
+    Raster(RasterLayer),


A raster layer is not related to the color. The a raster layer should be another case for the LayerPaint enum.

- Source is in io module and does not depend on the RequestStage anymore - There's a raster tile pipeline processing

- Source type now load data depending on the source (raster or vector tile) - Source client fetch data based on the source type

# Conflicts: # maplibre-demo/src/main.rs # maplibre/src/io/source_client.rs # maplibre/src/io/tile_repository.rs # maplibre/src/stages/mod.rs # maplibre/src/stages/request_stage.rs # maplibre/src/style/layer.rs # maplibre/src/style/style.rs

maxammann · 2022-07-17T14:21:13Z

@quillasp I merged in main and fixed all conflicts

- Using the `maplibre::render::resource::texture::Texture` instead of creating one directly from the device - Changing the `ShaderTextureVertex` coordinates The rendering is still not correct but there is something on the screen at least

The solution is nearing, the reaster tile renders upside down and the vertices coordinates still must be determined

…re-raster-tiles

…to feature-raster-tiles" This reverts commit a608ce5.

This reverts commit 4053767.

maxammann · 2022-11-07T09:48:52Z

@quillasp I would propose not to try to merge main into this PR, but manually check the relevant changes and then copy them to a new branch.
A lot has changed in the past months, so there will definitely be a lot of changes.

maxammann · 2022-11-14T22:03:18Z

Closing in favor of #205

Quillasp added 2 commits June 22, 2022 22:19

Addition of the raster layer style

cec7d89

Addition of raster layer and tessellate and raster source

de74d79

This is the first step of the implementation of the raster tile rendering - Addition of a RasterLayer in the StoredLayer - Addition of a Source trait for loading TessellateSource and RasterSource

ybiletskyi suggested changes Jun 30, 2022

View reviewed changes

Applying changes asked by the review

ba2ad73

The different sources handles the URL creation based on the layer type

maxammann mentioned this pull request Jun 30, 2022

DO NOT MERGE: Refactor RequestStage and PopulateTileStoreStage stages #136

Closed

4 tasks

ybiletskyi reviewed Jul 1, 2022

View reviewed changes

maxammann requested changes Jul 4, 2022

View reviewed changes

quillasp and others added 8 commits July 6, 2022 18:18

Merge branch 'maplibre:main' into feature-raster-tiles

4c1b9f5

Merge branch 'maplibre:main' into feature-raster-tiles

70be6b8

Merge branch 'maplibre:main' into feature-raster-tiles

8b78df2

Applying requested changes and addition of raster tile processing

5c93adb

- Source is in io module and does not depend on the RequestStage anymore - There's a raster tile pipeline processing

Source type loading and source client fetching rework

4934117

- Source type now load data depending on the source (raster or vector tile) - Source client fetch data based on the source type

Merge branch 'maplibre:main' into feature-raster-tiles

bc2f3da

Merge branch 'main' into feature-raster-tiles

861588b

# Conflicts: # maplibre-demo/src/main.rs # maplibre/src/io/source_client.rs # maplibre/src/io/tile_repository.rs # maplibre/src/stages/mod.rs # maplibre/src/stages/request_stage.rs # maplibre/src/style/layer.rs # maplibre/src/style/style.rs

Apply fixes after merge

a41393b

Quillasp and others added 9 commits July 23, 2022 23:27

Texture created but still not displayed

2fb9e32

Raster tile is rendering upside down

1797dd7

The solution is nearing, the reaster tile renders upside down and the vertices coordinates still must be determined

fix issues with raster tile rendering

ef21da0

Merge branch 'maplibre:main' into feature-raster-tiles

e59ecf7

Merge branch 'maplibre:main' into feature-raster-tiles

4053767

Merge remote-tracking branch 'origin/feature-raster-tiles' into featu…

a608ce5

…re-raster-tiles

Revert "Merge remote-tracking branch 'origin/feature-raster-tiles' in…

b8bf2e1

…to feature-raster-tiles" This reverts commit a608ce5.

Revert "Merge branch 'maplibre:main' into feature-raster-tiles"

2566b02

This reverts commit 4053767.

maxammann closed this Nov 14, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature raster tiles #141

Feature raster tiles #141

quillasp commented Jun 29, 2022 •

edited

Loading

ybiletskyi Jun 30, 2022

ybiletskyi Jun 30, 2022

ybiletskyi Jun 30, 2022

ybiletskyi Jun 30, 2022

ybiletskyi Jun 30, 2022

ybiletskyi Jul 1, 2022

maxammann Jul 4, 2022

maxammann Jul 4, 2022

maxammann Jul 4, 2022

maxammann Jul 4, 2022

maxammann Jul 4, 2022

maxammann commented Jul 17, 2022

maxammann commented Nov 7, 2022

maxammann commented Nov 14, 2022

Feature raster tiles #141

Feature raster tiles #141

Conversation

quillasp commented Jun 29, 2022 • edited Loading

💻 Examples

🚨 Test instructions

✔️ PR Todo

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maxammann commented Jul 17, 2022

maxammann commented Nov 7, 2022

maxammann commented Nov 14, 2022

quillasp commented Jun 29, 2022 •

edited

Loading