1022 Commits

Author SHA1 Message Date
root
fe4ea645e9 Make test.sh executable.. 2020-08-09 18:46:53 +02:00
08e4e8b0bb Another attempted fix for wind_turbines 2020-08-09 18:45:50 +02:00
b5b34e1d09 Fixed wind-turbine 2020-08-09 15:31:03 +02:00
323e0dc8f6 Bugfix 2020-08-09 15:04:03 +02:00
c030eaa7be Refinements 2020-08-09 13:41:37 +02:00
c092dd360c Cleaned up more code from landmark that wasn't used. Experimenting with power generator:source stuff 2020-08-08 22:08:02 +02:00
bd1325109a Cleaned up more code from landmark that wasn't used. Experimenting with power generator:source stuff 2020-08-08 21:24:00 +02:00
277829f9a0 Fix SQL error. (eventually..) 2020-08-08 14:55:04 +02:00
cbe2ef41c4 Fix SQL error. (someday we'll get it right...) 2020-08-08 14:06:41 +02:00
58ce31b809 Fix SQL error 2020-08-08 13:07:02 +02:00
0ee30f3840 Fix SQL error 2020-08-08 00:57:26 +02:00
f3b680e143 Refined 2020-08-07 18:24:19 +02:00
029d755ea1 Added landuse for bicycle and motorcycle parkings, split up some POIs and added some (to be aligned with the iconset!) 2020-08-07 15:38:32 +02:00
1915af7542 Fixing errors #2 2020-07-03 17:47:43 +02:00
6782ed5f63 Fixing errors #1 2020-07-03 17:16:01 +02:00
d638b3ef17 Initial attempt at moving forests with names into their own 'landmarks' layer. (this is heavely copied and pasted from POI) 2020-07-03 15:23:51 +02:00
58d997b3ea Lesson learned: it was not related to landuse-changes... 2020-07-03 01:32:15 +02:00
c3cb7ef43f Everything landuse related seemed to be broken, validating the cause of it:
Revert "Added POIs"

This reverts commit 0b18f340
2020-07-02 19:26:57 +02:00
bcb1c905c7 Revert "Testing addition of landuse.name"
This reverts commit 3994345d
2020-07-02 15:59:18 +02:00
0b18f340ae Added POIs 2020-07-02 15:58:59 +02:00
3994345d27 Testing addition of landuse.name 2020-07-02 15:32:22 +02:00
566f4c47d5 Merge remote-tracking branch 'github/master'
# Conflicts:
#	Makefile
2020-07-01 15:18:59 +02:00
7519c5889f removed quotation marks 2020-07-01 15:14:17 +02:00
0cee7fd6fc Make DC User and Password configurable 2020-07-01 14:45:12 +02:00
5208f1adbd Make DC User and Password configurable 2020-07-01 14:41:18 +02:00
Tomas Pohanka
c86f4a557a
Build aggregation on zoom level 13 (#936)
* Building aggregation at zoom 13
2020-06-18 14:01:06 +02:00
Frédéric Rodrigo
6ac544fc96
Make update_osm_peak_point use incremental update #814 (#896)
Thanks a lot @frodrigo.
2020-06-17 19:58:12 +02:00
Yuri Astrakhan
2b95d1cffa
Fix & optimize incorrect function declarations (#918)
* All functions that access database must be declared as `STABLE`, not `IMMUTABLE` -- because database can change at any moment, e.g. during an update
* there are a few functions that could be made `STRICT` -- passing `NULL` as a parameter will always result in a `NULL`, but for some reason that causes a significant decrease in perf.
* tagged one function as parallel safe

NOTE: somehow `ST_AsMVT()` method of tile generation is showing 70-90% slowdown with this patch. I am not sure of why this is happening. If the reason is the `IMMUTABLE` -> `STABLE` change, we may have to dig deeper into PG optimization
2020-06-17 12:15:26 -04:00
Yuri Astrakhan
ad8bd41567
Do not wait for integrity test (#934)
It's ok if integrity test fails -- makes the whole testing process faster by 10 minutes at a cost of some extra CPU cycles.
2020-06-14 11:02:44 -04:00
Tomas Pohanka
8f31655564
Change GitHub Actions to dedicated server (#929)
* Change GitHub Action to the dedicated server Ralph

* bugfix - let quickstart generate-tiles up to zoom 14
2020-06-12 11:04:33 +02:00
Yuri Astrakhan
f889853cb6
aerodrome_label: Remove unused function parameter (#919)
Minor optimization - in function `layer_aerodrome_label(bbox, zoom_level, pixel_width)` last parameter is not being used, so removing.
2020-06-11 14:24:55 -04:00
Yuri Astrakhan
447a8380e0
Fix incorrect Imposm config updates (#922)
* Current code incorrectly passes `IMPOSM_CONFIG_FILE` to the `generate-tiles` image, but should pass it to the tools.
* add a test to ensure imposm config exists
* add a test to ensure area is set during updates
2020-06-09 10:00:10 -04:00
Yuri Astrakhan
491bb10bd7
Expose MAX_PARALLEL_PSQL to users (#927)
Allow users to override how many import-sql files are loaded in parallel at the same time.

This change should be a noop
2020-06-09 09:53:02 -04:00
zstadler
5e65ac8c52
Add area-base filtering for park names in lower zoom levels (#911)
Resolve https://github.com/openmaptiles/openmaptiles/issues/776

Thanks @zstadler for this PR.
2020-06-09 10:53:18 +02:00
zstadler
ffd237d5c8
Fix clean-unnecessary-docker make target (#921)
Add missing `-q` flag
2020-06-08 12:40:04 -04:00
Yuri Astrakhan
0b1511d60d
NOOP water - Move updating sql into separate file (#920)
Use `update_water.sql` for all queries that update db
to be consistent with the other layers.
2020-06-08 12:32:09 -04:00
Yuri Astrakhan
60a3e1ea70
Fix Makefile duplicate runs (#923)
Make sure that core targets (i.e. part of the `all` target like build-sql and build yaml files) do not run multiple times if they already exist.

Makefile for some reason does not like it when a real target depends on a PHONY target, and re-runs it. I added an `if` statement to skip building targets if their result already exists.
2020-06-08 12:26:11 -04:00
Yuri Astrakhan
6457419e0d
NOOP: Format all layer's SQL code (#917)
I would like to reformat all of our SQL to have a concise coding style.
This makes it far easier to understand the code for a casual contributor,
and lets us spot errors more easily.

Most importantly, it makes it much easier to grep (search) the code because it is more likely to be in the same syntax

Some key changes:
* SQL keywords are always UPPERCASE, e.g. `SELECT WHEN AS END ...`
* types, variables, aliases, and field names (identifiers) are always lower case
* `LANGUAGE 'plpgsql'` is now `LANGUAGE plpgsql` (no quotes)
* a few minor spacing/semicolon cleanups

P.S. Per @TomPohys request, `TABLE` is spelled using upper case despite being a type for consistency with PG Docs. Same for `LANGUAGE SQL` vs `LANGUAGE plpgsql`.
2020-06-08 12:19:55 -04:00
Yuri Astrakhan
805d95df09
Fix import-borders if runs multiple times (#916)
Running './quickstart monaco' twice in a row will cause an error the second time.
2020-06-05 12:48:48 -04:00
Yuri Astrakhan
1a9f6132c3
New generate-dc-config target, rm QUICKSTART_MIN/MAX_ZOOM (#915)
* Set `MAX_ZOOM` to 7 by default.
* Remove `QUICKSTART_MIN/MAX_ZOOM` - unneeded complexity with two env vars. We can just use `MIN_ZOOM` and `MAX_ZOOM`. See also #261
* Generate dc-config yaml file with a new `make generate-dc-config` step. It will compute BBOX based on the downloaded data file. This step is not needed for planet generation.
* Generate Imposm replication file only when `DIFF_MODE` is `true`. Not needed otherwise. If the data source does not support it, it will throw an error.
2020-06-04 15:45:04 -04:00
Yuri Astrakhan
1486b7e0cb
Rework download area support (#908)
Closes #904
* Make all data-related targets like `download*`, `import-osm`, `import-borders`, and `generate-tiles` into `area`-aware -- making it possible for multiple data files to coexist inside the `./data` dir.
* Add `make download area=... [url=...]` command to automatically download any kind of area by checking Geofabrik, BBBike, and OSM.fr, optionally from a custom URL. Supports `area=planet` too.
* Do not re-download area with `make download-*` if it already exists.
* Automatically rename `<area>-latest.osm.pbf` into `<area>.osm.pbf`
* If `area=...` parameter is not given to `make`, see if there is exactly one `*.osm.pbf` file, and if so, use `*` as the `area`.
* Configure many variables in the .env file, overriding the defaults in tools
* If `<area>.osm.pbf` exists, but `<area>.dc-config.pbf` is missing, generate it using `download-osm make-dc` command.

Also:
* closes #614
* closes #647
* partially addresses #261
2020-06-03 15:37:45 -04:00
Yuri Astrakhan
fca53ef0ee
Minor makefile/quickstart cleanup (#907)
* Make a few spacing adjustments for ease-of-reading and consistency
* fix bbbike naming and other source urls
* remove unneeded `override`
* added `list-bbbike` target
2020-06-01 12:54:30 -04:00
Yuri Astrakhan
546f26e68a
MVT: use gzip and generate for v3.0 (#906)
This only changes the generated `getmvt(...)` function used by mvt users.

Beginning with tools 5.1, postgis docker images uses postgis v3.0, and includes gzip extension
2020-06-01 12:46:34 -04:00
Yuri Astrakhan
1a31b9212e
Minor fix import-borders file param (#905)
just like import-osm, import-borders can accept PBF_FILE param
2020-06-01 12:33:26 -04:00
Yuri Astrakhan
907fc58ee2
Use tools v5.2 (#903)
* Use [tools v5.2](https://github.com/openmaptiles/openmaptiles-tools/releases/tag/v5.2.0)
* Use `mbtiles-tools meta-generate` instead of the removed `generate-metadata` script.
* Remove `show-metadata` make target - it was just added and is not needed.

## Relevant changes
* Upgrade [osml10n PG extension](https://github.com/giggls/mapnik-german-l10n) to the faster v2.5.9 (significant performance improvements merged upstream by @nyurik)
2020-06-01 12:15:36 -04:00
79d5f801d2 Use 8081 because 8080 is overused 2020-05-31 20:09:32 +02:00
27984a8722 Attempt #1 at adding more details about landuse (like parking, religious buildings, sport-centre) 2020-05-31 20:04:13 +02:00
Adam
c6fff879ac
remove automatic osmfr choice (#902)
Resolves #895
2020-05-27 16:34:53 +02:00
Jan-Philipp Benecke
99c6be722d
Add "shop=car_parts" (#874)
Thanks
2020-05-27 16:08:53 +02:00
Yuri Astrakhan
28af9c0d9a
Add BORDERS_CLEANUP param to .env (#886)
This should be a noop, but will help users that it is available.
2020-05-26 15:37:13 -04:00