[Tile-serving] [openstreetmap/osm2pgsql] Add rapidjson lib to contrib and use it for flex output (#1475)

Jochen Topf notifications at github.com
Sat May 1 09:36:53 UTC 2021


This adds the rapidson JSON library to contrib and uses it for supporting JSON/JSONB database columns in the flex output. We will also need the JSON support soon for the new database-backed-middle.

Note that this introduces a breaking change to the flex backend. Before this you had to use Lua to encode data for JSON/JSONB columns in Lua and use the already encoded string to the `add_row()` function. Now this is done for you behind the scenes.
You can view, comment on, or merge this pull request online at:

  https://github.com/openstreetmap/osm2pgsql/pull/1475

-- Commit Summary --

  * Add rapidjson library in contrib
  * Add internal json/jsonb support to flex output

-- File Changes --

    M CMakeLists.txt (7)
    A contrib/rapidjson/README.contrib (2)
    A contrib/rapidjson/include/rapidjson/allocators.h (271)
    A contrib/rapidjson/include/rapidjson/document.h (2575)
    A contrib/rapidjson/include/rapidjson/encodedstream.h (299)
    A contrib/rapidjson/include/rapidjson/encodings.h (716)
    A contrib/rapidjson/include/rapidjson/error/en.h (74)
    A contrib/rapidjson/include/rapidjson/error/error.h (155)
    A contrib/rapidjson/include/rapidjson/filereadstream.h (99)
    A contrib/rapidjson/include/rapidjson/filewritestream.h (104)
    A contrib/rapidjson/include/rapidjson/fwd.h (151)
    A contrib/rapidjson/include/rapidjson/internal/biginteger.h (290)
    A contrib/rapidjson/include/rapidjson/internal/diyfp.h (258)
    A contrib/rapidjson/include/rapidjson/internal/dtoa.h (245)
    A contrib/rapidjson/include/rapidjson/internal/ieee754.h (78)
    A contrib/rapidjson/include/rapidjson/internal/itoa.h (304)
    A contrib/rapidjson/include/rapidjson/internal/meta.h (181)
    A contrib/rapidjson/include/rapidjson/internal/pow10.h (55)
    A contrib/rapidjson/include/rapidjson/internal/regex.h (701)
    A contrib/rapidjson/include/rapidjson/internal/stack.h (230)
    A contrib/rapidjson/include/rapidjson/internal/strfunc.h (55)
    A contrib/rapidjson/include/rapidjson/internal/strtod.h (269)
    A contrib/rapidjson/include/rapidjson/internal/swap.h (46)
    A contrib/rapidjson/include/rapidjson/istreamwrapper.h (115)
    A contrib/rapidjson/include/rapidjson/memorybuffer.h (70)
    A contrib/rapidjson/include/rapidjson/memorystream.h (71)
    A contrib/rapidjson/include/rapidjson/msinttypes/inttypes.h (316)
    A contrib/rapidjson/include/rapidjson/msinttypes/stdint.h (300)
    A contrib/rapidjson/include/rapidjson/ostreamwrapper.h (81)
    A contrib/rapidjson/include/rapidjson/pointer.h (1358)
    A contrib/rapidjson/include/rapidjson/prettywriter.h (255)
    A contrib/rapidjson/include/rapidjson/rapidjson.h (615)
    A contrib/rapidjson/include/rapidjson/reader.h (1879)
    A contrib/rapidjson/include/rapidjson/schema.h (2006)
    A contrib/rapidjson/include/rapidjson/stream.h (179)
    A contrib/rapidjson/include/rapidjson/stringbuffer.h (117)
    A contrib/rapidjson/include/rapidjson/writer.h (610)
    A contrib/rapidjson/license.txt (57)
    A contrib/rapidjson/readme.md (210)
    M flex-config/places.lua (16)
    M src/flex-table-column.cpp (8)
    M src/flex-table-column.hpp (2)
    M src/output-flex.cpp (126)
    M tests/data/test_output_flex_types.lua (30)
    M tests/test-output-flex-types.cpp (95)

-- Patch Links --

https://github.com/openstreetmap/osm2pgsql/pull/1475.patch
https://github.com/openstreetmap/osm2pgsql/pull/1475.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/osm2pgsql/pull/1475
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/tile-serving/attachments/20210501/1fc40e81/attachment-0001.htm>


More information about the Tile-serving mailing list