You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by "github-code-scanning[bot] (via GitHub)" <gi...@apache.org> on 2023/09/18 19:14:05 UTC
[GitHub] [incubator-baremaps] github-code-scanning[bot] commented on a diff in pull request #757: Create inital workflow for daylight
github-code-scanning[bot] commented on code in PR #757:
URL: https://github.com/apache/incubator-baremaps/pull/757#discussion_r1329173988
##########
basemap/daylight-workflow.js:
##########
@@ -0,0 +1,565 @@
+/**
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software distributed under the License
+ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ or implied. See the License for the specific language governing permissions and limitations under
+ the License.
+ **/
+
+import config from "./config.js";
+
+export default {
+ "steps": [
+ /*
+ {
+ "id": "openstreetmap-data",
+ "needs": [],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://download.geofabrik.de/europe/liechtenstein-latest.osm.pbf",
+ "path": "data/data.osm.pbf"
+ },
+ {
+ "type": "ImportOsmPbf",
+ "file": "data/data.osm.pbf",
+ "database": config.database,
+ "databaseSrid": 3857
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-download",
+ "needs": ["openstreetmap-data"],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/fb-ml-roads-v1.29.osc.bz2",
+ "path": "data/roads.osc.bz2"
+ },
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/admin-v1.29.osc.bz2",
+ "path": "data/admin.osc.bz2"
+ },
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/coastlines-v1.29.tgz",
+ "path": "data/coastlines.tgz"
+ },
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/preferred-localization-v1.29.tsv",
+ "path": "data/preferred-localization.tsv"
+ },
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/important-features-v1.29.json",
+ "path": "data/important-features.json"
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-decompress",
+ "needs": ["openstreetmap-download"],
+ "tasks": [
+ {
+ "type": "DecompressFile",
+ "compression": "bzip2",
+ "source": "data/roads.osc.bz2",
+ "target": "data/roads.osc"
+ },
+ {
+ "type": "DecompressFile",
+ "compression": "bzip2",
+ "source": "data/admin.osc.bz2",
+ "target": "data/admin.osc"
+ },
+ {
+ "type": "DecompressFile",
+ "compression": "targz",
+ "source": "data/coastlines.tgz",
+ "target": "data/coastlines"
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-import",
+ "needs": [],
+ "tasks": [
+ {
+ "type": "ImportOsmChange",
+ "file": "data/roads.osc",
+ "database": config.database,
+ "srid": 3857
+ },
+ {
+ "type": "ImportOsmChange",
+ "file": "data/admin.osc",
+ "database": config.database,
+ "srid": 3857
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-coastlines",
+ "needs": [],
+ "tasks": [
+ {
+ "type": "ImportShapefile",
+ "file": "data/coastlines/water_polygons.shp",
+ "database": config.database,
+ "sourceSRID": 4326,
+ "targetSRID": 3857
+ },
+ ]
+ }
+ {
+ "id": "openstreetmap-pbf",
+ "needs": [],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://download.geofabrik.de/europe/liechtenstein-latest.osm.pbf",
+ "path": "data/data.osm.pbf"
+ },
+ {
+ "type": "ImportOsmPbf",
+ "file": "data/data.osm.pbf",
+ "database": config.database,
+ "databaseSrid": 3857
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-road",
+ "needs": ["openstreetmap-data"],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/fb-ml-roads-v1.29.osc.bz2",
+ "path": "data/roads.osc.bz2"
+ },
+ {
+ "type": "DecompressFile",
+ "compression": "bzip2",
+ "source": "data/roads.osc.bz2",
+ "target": "data/roads.osc"
+ },
+ {
+ "type": "ImportOsmChange",
+ "file": "data/roads.osc",
+ "database": config.database,
+ "srid": 3857
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-admin",
+ "needs": ["openstreetmap-data"],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/admin-v1.29.osc.bz2",
+ "path": "data/admin.osc.bz2"
+ },
+ {
+ "type": "DecompressFile",
+ "compression": "bzip2",
+ "source": "data/admin.osc.bz2",
+ "target": "data/admin.osc"
+ },
+ {
+ "type": "ImportOsmChange",
+ "file": "data/admin.osc",
+ "database": config.database,
+ "srid": 3857
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-coastlines",
+ "needs": ["openstreetmap-data"],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/coastlines-v1.29.tgz",
+ "path": "data/coastlines.tgz"
+ },
+ {
+ "type": "DecompressFile",
+ "compression": "targz",
+ "source": "data/coastlines.tgz",
+ "target": "data/coastlines"
+ },
+ {
+ "type": "ImportShapefile",
+ "file": "data/coastlines/water_polygons.shp",
+ "database": config.database,
+ "sourceSRID": 4326,
+ "targetSRID": 3857
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/index.sql",
+ "database": config.database,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-preferred-localization",
+ "needs": ["openstreetmap-data"],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/preferred-localization-v1.29.tsv",
+ "path": "data/preferred-localization.tsv"
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-important-features",
+ "needs": ["openstreetmap-data"],
+ "tasks": [
+ {
+ "type": "DownloadUrl",
+ "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/important-features-v1.29.json",
+ "path": "data/important-features.json"
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-nodes",
+ "needs": ["openstreetmap-road","openstreetmap-admin"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "queries/osm_nodes.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-ways",
+ "needs": ["openstreetmap-road","openstreetmap-admin"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "queries/osm_ways.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-relations",
+ "needs": ["openstreetmap-road","openstreetmap-admin"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "queries/osm_relations.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-member",
+ "needs": ["openstreetmap-road","openstreetmap-admin"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/member/prepare.sql",
+ "database": config.database,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-point",
+ "needs": ["openstreetmap-nodes"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/point/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/point/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/point/index.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-linestring",
+ "needs": ["openstreetmap-member"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/linestring/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/linestring/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/linestring/index.sql",
+ "database": config.database,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-polygon",
+ "needs": ["openstreetmap-member"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/polygon/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/polygon/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/polygon/index.sql",
+ "database": config.database,
+ },
+ ]
+ },
+ */
+ {
+ "id": "openstreetmap-highway",
+ "needs": ["openstreetmap-linestring"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/highway/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/highway/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/highway/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/highway/index.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ ]
+ },
+ /*
+ {
+ "id": "openstreetmap-railway",
+ "needs": ["openstreetmap-linestring"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/railway/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/railway/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/railway/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/railway/index.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-route",
+ "needs": ["openstreetmap-linestring"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/route/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/route/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/route/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/route/index.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-natural",
+ "needs": ["openstreetmap-polygon"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/natural/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/natural/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/natural/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/natural/index.sql",
+ "database": config.database,
+ "parallel": true
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-landuse",
+ "needs": ["openstreetmap-polygon"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/landuse/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/landuse/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/landuse/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/landuse/index.sql",
+ "database": config.database,
+ "parallel": true
+ },
+ ]
+ },
+ {
+ "id": "openstreetmap-waterway",
+ "needs": ["openstreetmap-linestring"],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/waterway/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/waterway/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/waterway/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/waterway/index.sql",
+ "database": config.database,
+ "parallel": true
+ },
+ ]
+ },
+<<<<<<< HEAD:basemap/daylight-workflow.js
+=======
+ {
+ "id": "openstreetmap-water",
+ "needs": [],
+ "tasks": [
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/clean.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/prepare.sql",
+ "database": config.database,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/simplify.sql",
+ "database": config.database,
+ "parallel": true,
+ },
+ {
+ "type": "ExecuteSql",
+ "file": "layers/water/index.sql",
+ "database": config.database,
+ },
+ ]
+ },
+ */
+>>>>>>> 8d538e1f (Fix queries):basemap/daylight.js
Review Comment:
## Syntax error
Error: Unexpected token
[Show more details](https://github.com/apache/incubator-baremaps/security/code-scanning/805)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@baremaps.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org