-
Notifications
You must be signed in to change notification settings - Fork 806
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
Switch to Lua transforms and change database schema #2533
Commits on May 16, 2016
-
**This is a pull-request against the lua branch** This PR proposes a database-reload. It changes the documentation on the use of osm2pgsql, and adds a .lua file for preprocessing. This database import aims to be backwards compatible with older versions of the style. This resolves (at least part of) #1504. #Hstore Adding the hstore option to osm2pgsql allows the database to use all keys. This PR proposes using hstore for new keys, and using traditional columns for old keys. This allows us to stay compatible with old versions of the style. According to [@pnorman's benchmarks](http://www.paulnorman.ca/blog/2014/03/osm2pgsql-and-hstore/), using hstore without dropping columns would lead to a 9% size increase and a 0.38% speed decrease. Given the benefits of having all columns available, I would consider this acceptable. # Make polygon/linestring decision based on value This is based on the following unmerged PR to osm2pgsql: osm2pgsql-dev/osm2pgsql#346 It makes the polygon/linestring decision based on the tag value, in addition to the tag key. In particular, highway=services and junction=yes are now treated as polygon, while leisure=track, man_made=embankment, man_made=breakwater, man_made=groyne, natural=cliff, natural=tree_row, historic=citywalls, waterway=derelict_canal, waterway=ditch, waterway=drain, waterway=river, waterway=stream, waterway=wadi, waterway=weir, power=line, and power=minor_line are now treated as linestring. This resolves #1362, resolves #137, resolves #268, and resolves #892. # Rendering order The new .lua file creates a osmcarto_z_order value in the database, which stores the rendering order we use. This will allow us to simplify the road queries. # Recommend -G flag for multipolygons This resolves #59. # Import ele on buildings This resolves #101. # Delete more meta-tags from imports The .lua file drops some more meta-information from imports that is of no need for rendering. This is based on the following unmerged PR to osm2pgsql: * osm2pgsql-dev/osm2pgsql#532
Configuration menu - View commit details
-
Copy full SHA for d48106e - Browse repository at this point
Copy the full SHA d48106eView commit details
Commits on May 17, 2016
-
Configuration menu - View commit details
-
Copy full SHA for e0aa01d - Browse repository at this point
Copy the full SHA e0aa01dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1ec1cfc - Browse repository at this point
Copy the full SHA 1ec1cfcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 02edb0a - Browse repository at this point
Copy the full SHA 02edb0aView commit details -
Configuration menu - View commit details
-
Copy full SHA for e5660e6 - Browse repository at this point
Copy the full SHA e5660e6View commit details -
Configuration menu - View commit details
-
Copy full SHA for d524487 - Browse repository at this point
Copy the full SHA d524487View commit details -
Configuration menu - View commit details
-
Copy full SHA for d276c90 - Browse repository at this point
Copy the full SHA d276c90View commit details
Commits on May 22, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 1b82cb6 - Browse repository at this point
Copy the full SHA 1b82cb6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 343d1c9 - Browse repository at this point
Copy the full SHA 343d1c9View commit details
Commits on May 30, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 8d0489e - Browse repository at this point
Copy the full SHA 8d0489eView commit details -
Configuration menu - View commit details
-
Copy full SHA for d34bebc - Browse repository at this point
Copy the full SHA d34bebcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 21d9b80 - Browse repository at this point
Copy the full SHA 21d9b80View commit details -
Configuration menu - View commit details
-
Copy full SHA for 118c5cf - Browse repository at this point
Copy the full SHA 118c5cfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6798824 - Browse repository at this point
Copy the full SHA 6798824View commit details -
Convet layer to integer and user layer instead of z_order
* Convert layer to integer and use it in queries * Use layer instead of z_order in queries where possible
Configuration menu - View commit details
-
Copy full SHA for ae3f38e - Browse repository at this point
Copy the full SHA ae3f38eView commit details
Commits on Jun 2, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 04956b4 - Browse repository at this point
Copy the full SHA 04956b4View commit details -
Configuration menu - View commit details
-
Copy full SHA for d0b1f53 - Browse repository at this point
Copy the full SHA d0b1f53View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73496d8 - Browse repository at this point
Copy the full SHA 73496d8View commit details -
Configuration menu - View commit details
-
Copy full SHA for a43cb7a - Browse repository at this point
Copy the full SHA a43cb7aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 659840c - Browse repository at this point
Copy the full SHA 659840cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 10bff06 - Browse repository at this point
Copy the full SHA 10bff06View commit details
Commits on Jun 15, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 5175195 - Browse repository at this point
Copy the full SHA 5175195View commit details
Commits on Jun 16, 2016
-
Configuration menu - View commit details
-
Copy full SHA for be2eb57 - Browse repository at this point
Copy the full SHA be2eb57View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4499350 - Browse repository at this point
Copy the full SHA 4499350View commit details
Commits on Jun 18, 2016
-
Merge branch 'isarea' of https://github.com/pnorman/openstreetmap-carto…
… into lua_changes
Configuration menu - View commit details
-
Copy full SHA for 3621bd7 - Browse repository at this point
Copy the full SHA 3621bd7View commit details -
Configuration menu - View commit details
-
Copy full SHA for dc36874 - Browse repository at this point
Copy the full SHA dc36874View commit details -
Configuration menu - View commit details
-
Copy full SHA for f2030f2 - Browse repository at this point
Copy the full SHA f2030f2View commit details
Commits on Jun 26, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 2ec88f3 - Browse repository at this point
Copy the full SHA 2ec88f3View commit details
Commits on Jul 1, 2016
-
Merge remote-tracking branch 'math1985/lua_changes' into lua
Conflicts: openstreetmap-carto.style project.mml
Configuration menu - View commit details
-
Copy full SHA for b5e4dbd - Browse repository at this point
Copy the full SHA b5e4dbdView commit details
Commits on Jul 7, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 7216ac7 - Browse repository at this point
Copy the full SHA 7216ac7View commit details
Commits on Jul 8, 2016
-
Merge pull request #2217 from pnorman/lua_spacing
Use 4sp for Lua indents
Configuration menu - View commit details
-
Copy full SHA for d28339a - Browse repository at this point
Copy the full SHA d28339aView commit details
Commits on Jul 13, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 3ae8ca8 - Browse repository at this point
Copy the full SHA 3ae8ca8View commit details
Commits on Jul 19, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 73a2cb8 - Browse repository at this point
Copy the full SHA 73a2cb8View commit details
Commits on Aug 3, 2016
-
Tag 2.42.0 Conflicts: project.mml
Configuration menu - View commit details
-
Copy full SHA for 3dda54d - Browse repository at this point
Copy the full SHA 3dda54dView commit details
Commits on Aug 8, 2016
-
Sport is a non-physical key, so it should always be combined with another, physical key. That physical key should define whether the object is a polygon or line. Since an object with a polygon key and a line key will be treated as polygon, treating sport as line by default is the sane default. For example: * sport=running, highway=footway should be treated as line. The current PR accomplishes this, before it would be a polygon. * sport=soccer, leisure=pitch should be treated as polygon. Nothing changes here. This resolves ... #854 but only after it gets merged into master.
Configuration menu - View commit details
-
Copy full SHA for 3652b34 - Browse repository at this point
Copy the full SHA 3652b34View commit details -
Merge pull request #2274 from math1985/lua-sport
Drop sport from polygon_keys
Configuration menu - View commit details
-
Copy full SHA for cbf2653 - Browse repository at this point
Copy the full SHA cbf2653View commit details
Commits on Sep 6, 2016
-
Tag v2.43.0 Conflicts: project.mml project.yaml
Configuration menu - View commit details
-
Copy full SHA for 0fb174b - Browse repository at this point
Copy the full SHA 0fb174bView commit details
Commits on Sep 26, 2016
-
Configuration menu - View commit details
-
Copy full SHA for cf690e5 - Browse repository at this point
Copy the full SHA cf690e5View commit details
Commits on Oct 12, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 9eb43a5 - Browse repository at this point
Copy the full SHA 9eb43a5View commit details
Commits on Nov 14, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 8435825 - Browse repository at this point
Copy the full SHA 8435825View commit details -
Configuration menu - View commit details
-
Copy full SHA for aea093e - Browse repository at this point
Copy the full SHA aea093eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9e6e0d7 - Browse repository at this point
Copy the full SHA 9e6e0d7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2282dc6 - Browse repository at this point
Copy the full SHA 2282dc6View commit details -
Configuration menu - View commit details
-
Copy full SHA for afcafb2 - Browse repository at this point
Copy the full SHA afcafb2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d424b4 - Browse repository at this point
Copy the full SHA 2d424b4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 60544b9 - Browse repository at this point
Copy the full SHA 60544b9View commit details -
Merge pull request #2438 from pnorman/lua_location
Use correct location for Lua script
Configuration menu - View commit details
-
Copy full SHA for 1b6c1f0 - Browse repository at this point
Copy the full SHA 1b6c1f0View commit details
Commits on Nov 15, 2016
-
Configuration menu - View commit details
-
Copy full SHA for f56dc94 - Browse repository at this point
Copy the full SHA f56dc94View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6397f86 - Browse repository at this point
Copy the full SHA 6397f86View commit details -
Configuration menu - View commit details
-
Copy full SHA for db2d105 - Browse repository at this point
Copy the full SHA db2d105View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4c437f1 - Browse repository at this point
Copy the full SHA 4c437f1View commit details -
Configuration menu - View commit details
-
Copy full SHA for bcdf12f - Browse repository at this point
Copy the full SHA bcdf12fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2aec867 - Browse repository at this point
Copy the full SHA 2aec867View commit details -
Configuration menu - View commit details
-
Copy full SHA for ac5976a - Browse repository at this point
Copy the full SHA ac5976aView commit details
Commits on Nov 21, 2016
-
Configuration menu - View commit details
-
Copy full SHA for f6ba2a7 - Browse repository at this point
Copy the full SHA f6ba2a7View commit details -
Merge pull request #2455 from math1985/linestring-tags
Treat leisure=slipway, natural=ridge,arete as linestring by default
Configuration menu - View commit details
-
Copy full SHA for c55384e - Browse repository at this point
Copy the full SHA c55384eView commit details
Commits on Dec 2, 2016
-
Configuration menu - View commit details
-
Copy full SHA for fea4ff2 - Browse repository at this point
Copy the full SHA fea4ff2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ae8b27 - Browse repository at this point
Copy the full SHA 0ae8b27View commit details
Commits on Dec 4, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 42cf572 - Browse repository at this point
Copy the full SHA 42cf572View commit details -
Configuration menu - View commit details
-
Copy full SHA for d7a4d4f - Browse repository at this point
Copy the full SHA d7a4d4fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2502625 - Browse repository at this point
Copy the full SHA 2502625View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c7a001 - Browse repository at this point
Copy the full SHA 1c7a001View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4986fbf - Browse repository at this point
Copy the full SHA 4986fbfView commit details -
Configuration menu - View commit details
-
Copy full SHA for d8f8223 - Browse repository at this point
Copy the full SHA d8f8223View commit details
Commits on Dec 5, 2016
-
Merge pull request #2486 from pnorman/lua_loading_docs
Add documentation about needing hstore
Configuration menu - View commit details
-
Copy full SHA for de4c547 - Browse repository at this point
Copy the full SHA de4c547View commit details -
Configuration menu - View commit details
-
Copy full SHA for ab03d93 - Browse repository at this point
Copy the full SHA ab03d93View commit details
Commits on Dec 7, 2016
-
Configuration menu - View commit details
-
Copy full SHA for a7e7be8 - Browse repository at this point
Copy the full SHA a7e7be8View commit details
Commits on Dec 9, 2016
-
Merge pull request #2499 from pnorman/lua/building_part
Consider building:part a polygon tag
Configuration menu - View commit details
-
Copy full SHA for 214a673 - Browse repository at this point
Copy the full SHA 214a673View commit details
Commits on Dec 20, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 2714ced - Browse repository at this point
Copy the full SHA 2714cedView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5161010 - Browse repository at this point
Copy the full SHA 5161010View commit details
Commits on Dec 22, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 3f24b7d - Browse repository at this point
Copy the full SHA 3f24b7dView commit details
Commits on Dec 24, 2016
-
Rewrite relation handling code
This code takes a stricter view on what a multipolygon is, and adds test coverage for relation handling.
Configuration menu - View commit details
-
Copy full SHA for 6e6b6f8 - Browse repository at this point
Copy the full SHA 6e6b6f8View commit details
Commits on Dec 27, 2016
-
Merge pull request #2527 from pnorman/lua/multipolygons
Rewrite relation handling code
Configuration menu - View commit details
-
Copy full SHA for a1fda3d - Browse repository at this point
Copy the full SHA a1fda3dView commit details
Commits on Jan 2, 2017
-
Configuration menu - View commit details
-
Copy full SHA for e29b281 - Browse repository at this point
Copy the full SHA e29b281View commit details
Commits on Jan 19, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 7c0bd30 - Browse repository at this point
Copy the full SHA 7c0bd30View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f4d11f - Browse repository at this point
Copy the full SHA 0f4d11fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c524ce - Browse repository at this point
Copy the full SHA 8c524ceView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3c8fc0f - Browse repository at this point
Copy the full SHA 3c8fc0fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8aee71b - Browse repository at this point
Copy the full SHA 8aee71bView commit details -
Configuration menu - View commit details
-
Copy full SHA for e4a4645 - Browse repository at this point
Copy the full SHA e4a4645View commit details -
Configuration menu - View commit details
-
Copy full SHA for cf7e614 - Browse repository at this point
Copy the full SHA cf7e614View commit details -
Configuration menu - View commit details
-
Copy full SHA for 884134d - Browse repository at this point
Copy the full SHA 884134dView commit details -
Configuration menu - View commit details
-
Copy full SHA for be75078 - Browse repository at this point
Copy the full SHA be75078View commit details -
Configuration menu - View commit details
-
Copy full SHA for a9170aa - Browse repository at this point
Copy the full SHA a9170aaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 19a1894 - Browse repository at this point
Copy the full SHA 19a1894View commit details -
Configuration menu - View commit details
-
Copy full SHA for 55bc1cc - Browse repository at this point
Copy the full SHA 55bc1ccView commit details -
Configuration menu - View commit details
-
Copy full SHA for 75cf488 - Browse repository at this point
Copy the full SHA 75cf488View commit details -
Merge pull request #2552 from pnorman/lua/hstore_style
Add SQL style notes on hstore
Configuration menu - View commit details
-
Copy full SHA for 31ef4fe - Browse repository at this point
Copy the full SHA 31ef4feView commit details
Commits on Jan 24, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 03f3ad9 - Browse repository at this point
Copy the full SHA 03f3ad9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 96f9a3f - Browse repository at this point
Copy the full SHA 96f9a3fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1fa3b0e - Browse repository at this point
Copy the full SHA 1fa3b0eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 76d239b - Browse repository at this point
Copy the full SHA 76d239bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1f8413d - Browse repository at this point
Copy the full SHA 1f8413dView commit details
Commits on Jan 29, 2017
-
Configuration menu - View commit details
-
Copy full SHA for d274b62 - Browse repository at this point
Copy the full SHA d274b62View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1b87f4a - Browse repository at this point
Copy the full SHA 1b87f4aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 10e1cd1 - Browse repository at this point
Copy the full SHA 10e1cd1View commit details
Commits on Apr 16, 2017
-
1
Configuration menu - View commit details
-
Copy full SHA for cb23299 - Browse repository at this point
Copy the full SHA cb23299View commit details
Commits on Apr 17, 2017
-
Merge pull request #2610 from pnorman/lua/no_old_style_mps
Remove support for old-style multipolygons
Configuration menu - View commit details
-
Copy full SHA for 799aebf - Browse repository at this point
Copy the full SHA 799aebfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 77cc9c4 - Browse repository at this point
Copy the full SHA 77cc9c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for b6b155b - Browse repository at this point
Copy the full SHA b6b155bView commit details
Commits on Apr 18, 2017
-
Configuration menu - View commit details
-
Copy full SHA for a002f47 - Browse repository at this point
Copy the full SHA a002f47View commit details