[Tile-serving] [openstreetmap/osm2pgsql] Set projection in flex output in column config (#1277)
Jochen Topf
notifications at github.com
Thu Oct 1 08:19:30 UTC 2020
The projection set on the command line with -l|--latlong, -m|--merc, or
-E|--proj is now ignored in the flex output. Instead you can set it
individually on all geometry columns using the `projection` option which
either takes an EPSG code or a few commonly understood string values
such as "merc", "latlong", or "WGS84".
This also makes the flex output ignore the --reproject-area option.
The area is now calculated in web mercator by default and you can
change this by setting the `projection` option on the area column.
(This currently only allows setting 4326 and 3857, other projections
will not work. We have to fix this later. This is due to the way
the area is calculated from the WKB geometry.)
The osm2pgsql.srid variable is not set any more in the Lua config.
So there are some breaking changes here for the flex output, which
we can still do as it is marked experimental.
With this change the command line options -l, -m, -E, and
--reproject-area, that can be regarded as belonging to the style are not
used any more in the flex output. This completes the move away from
command line option to config file for the flex output.
You can view, comment on, or merge this pull request online at:
https://github.com/openstreetmap/osm2pgsql/pull/1277
-- Commit Summary --
* Set projection in flex output in column config
-- File Changes --
M docs/flex.md (17)
M flex-config/compatible.lua (7)
M flex-config/geometries.lua (23)
M src/flex-table-column.cpp (47)
M src/flex-table-column.hpp (20)
M src/flex-table.cpp (15)
M src/flex-table.hpp (24)
M src/osmium-builder.hpp (2)
M src/output-flex.cpp (58)
M src/output-flex.hpp (12)
M tests/CMakeLists.txt (3)
M tests/data/test_output_flex_area.lua (4)
A tests/data/test_output_flex_area_3857.lua (5)
A tests/data/test_output_flex_area_4326.lua (5)
A tests/data/test_output_flex_area_mix.lua (5)
M tests/data/test_output_flex_bbox.lua (4)
M tests/data/test_output_flex_invalid_geom.lua (4)
M tests/data/test_output_flex_line.lua (4)
M tests/data/test_output_flex_stage2.lua (4)
M tests/test-output-flex-area.cpp (12)
M tests/test-output-flex-bbox.cpp (3)
M tests/test-output-flex-invalid-geom.cpp (12)
M tests/test-output-flex-line.cpp (3)
M tests/test-output-flex-nogeom.cpp (3)
M tests/test-output-flex-stage2.cpp (27)
-- Patch Links --
https://github.com/openstreetmap/osm2pgsql/pull/1277.patch
https://github.com/openstreetmap/osm2pgsql/pull/1277.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/1277
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/tile-serving/attachments/20201001/c6424a9b/attachment.htm>
More information about the Tile-serving
mailing list