Strip out MVT changes accidentally included

git-svn-id: http://svn.osgeo.org/postgis/trunk@16090 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/postgis/mvt.c b/postgis/mvt.c
index 4cd5dbb66e0b6dbac7997704dd95522e8ba6baca..46e663682d0d5b15de2d4e70d839005dc60047bb 100644 (file)
--- a/postgis/mvt.c
+++ b/postgis/mvt.c
@@ -845,68 +845,45 @@ void mvt_agg_transfn(struct mvt_agg_context *ctx)
        parse_values(ctx);
 }
 
-static bytea *mvt_ctx_to_bytea(struct mvt_agg_context *ctx)
+/**
+ * Finalize aggregation.
+ *
+ * Encode keys and values and put the aggregated Layer message into
+ * a Tile message and returns it packed as a bytea.
+ */
+uint8_t *mvt_agg_finalfn(struct mvt_agg_context *ctx)
 {
-       /* Fill out the file slot, if it's not already filled. */
-       /* We should only have a filled slow when all the work of building */
-       /* out the data is complete, so after a serialize/deserialize cycle */
-       /* or after a context combine */
-       if (!ctx->tile)
-       {
-               VectorTile__Tile__Layer **layers = ;
-               VectorTile__Tile tile = VECTOR_TILE__TILE__INIT;
-
-               POSTGIS_DEBUG(2, "mvt_agg_finalfn called");
-               POSTGIS_DEBUGF(2, "mvt_agg_finalfn n_features == %zd", ctx->layer->n_features);
-
-               /* Zero features => empty bytea output */
-               if (ctx->layer->n_features == 0)
-               {
-                       buf = palloc(VARHDRSZ);
-                       SET_VARSIZE(buf, VARHDRSZ);
-                       return buf;
-               }
+       VectorTile__Tile__Layer *layers[1];
+       VectorTile__Tile tile = VECTOR_TILE__TILE__INIT;
+       size_t len;
+       uint8_t *buf;
 
-               encode_keys(ctx);
-               encode_values(ctx);
+       POSTGIS_DEBUG(2, "mvt_agg_finalfn called");
+       POSTGIS_DEBUGF(2, "mvt_agg_finalfn n_features == %zd", ctx->layer->n_features);
 
-               int n_layers = 1;
-               ctx->tile = palloc(sizeof(VectorTile__Tile));
-               vector_tile__tile__init(ctx->tile);
-               ctx->tile->layers = palloc(sizeof(VectorTile__Tile__Layer*) * n_layers);
-               ctx->tile->layers[0] = ctx->layer;
-               ctx->tile->n_layers = n_layers;
+       /* Zero features => empty bytea output */
+       if (ctx->layer->n_features == 0)
+       {
+               buf = palloc(VARHDRSZ);
+               SET_VARSIZE(buf, VARHDRSZ);
+               return buf;
        }
 
-       /* Serialize the Tile */
-       size_t len = VARHDRSZ + vector_tile__tile__get_packed_size(ctx->tile);
-       bytea *ba = palloc(len);
-       vector_tile__tile__pack(ctx->tile, VARDATA(ba));
-       SET_VARSIZE(ba, len);
-       return ba;
-}
+       encode_keys(ctx);
+       encode_values(ctx);
 
+       layers[0] = ctx->layer;
 
-bytea *mvt_ctx_serialize(struct mvt_agg_context *ctx)
-{
-       return mvt_ctx_to_bytea(ctx);
-}
+       tile.n_layers = 1;
+       tile.layers = layers;
 
-mvt_agg_context * mvt_ctx_deserialize(const bytea *ba)
-{
+       len = vector_tile__tile__get_packed_size(&tile);
+       buf = palloc(sizeof(*buf) * (len + VARHDRSZ));
+       vector_tile__tile__pack(&tile, buf + VARHDRSZ);
 
-}
+       SET_VARSIZE(buf, VARHDRSZ + len);
 
-/**
- * Finalize aggregation.
- *
- * Encode keys and values and put the aggregated Layer message into
- * a Tile message and returns it packed as a bytea.
- */
-bytea *mvt_agg_finalfn(struct mvt_agg_context *ctx)
-{
-       return mvt_ctx_to_bytea(ctx);
+       return buf;
 }
 
-
 #endif

diff --git a/postgis/mvt.h b/postgis/mvt.h
index c14585c6cd547d023a9e72013d3e3c3c91c38392..9f51054b127490c218ca74b67dafd091901a2f74 100644 (file)
--- a/postgis/mvt.h
+++ b/postgis/mvt.h
@@ -54,7 +54,6 @@ struct mvt_agg_context {
        HeapTupleHeader row;
        VectorTile__Tile__Feature *feature;
        VectorTile__Tile__Layer *layer;
-       VectorTile__Tile *tile;
        size_t features_capacity;
        struct mvt_kv_key *keys_hash;
        struct mvt_kv_string_value *string_values_hash;