Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367713 )
Change subject: maps - switch to using the default 3857 projection ...................................................................... maps - switch to using the default 3857 projection Bug: T169011 Change-Id: Iea81899ea32d809f29251f5b689a73d75da00751 --- M modules/osm/templates/import_waterlines.erb M modules/profile/files/maps/osm-initial-import 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/367713/1 diff --git a/modules/osm/templates/import_waterlines.erb b/modules/osm/templates/import_waterlines.erb index 86f65b1..50b4b6d 100644 --- a/modules/osm/templates/import_waterlines.erb +++ b/modules/osm/templates/import_waterlines.erb @@ -24,7 +24,7 @@ curl -O <%= @proxy_opt %> http://data.openstreetmapdata.com/water-polygons-split-3857.zip unzip water-polygons-split-3857.zip rm water-polygons-split-3857.zip -shp2pgsql ${SHP2PGSQL_OPERATION} -s 3857:900913 -g way water-polygons-split-3857/water_polygons.shp water_polygons | sed "${TRANSFORMATION}" | psql <%= @database %> +shp2pgsql ${SHP2PGSQL_OPERATION} -s 3857 -g way water-polygons-split-3857/water_polygons.shp water_polygons | sed "${TRANSFORMATION}" | psql <%= @database %> rm -rf water-polygons-split-3857 echo "`date` - waterlines import completed" diff --git a/modules/profile/files/maps/osm-initial-import b/modules/profile/files/maps/osm-initial-import index 5487e42..a8f55ab 100644 --- a/modules/profile/files/maps/osm-initial-import +++ b/modules/profile/files/maps/osm-initial-import @@ -92,7 +92,7 @@ PGPASSWORD="$(< ${password_file})" flock -xn ${replicate_lock} \ sudo -E -u osmupdater osm2pgsql \ --create --slim --flat-nodes nodes.bin -C 40000 --number-processes 8 \ - --hstore --host ${database_host} -U osmimporter -d gis -E 900913 \ + --hstore --host ${database_host} -U osmimporter -d gis -E 3857 \ ${download_dir}/${filename} 2>&1 | tee ${log_file} if [ ${PIPESTATUS[0]} -ne 0 ]; then -- To view, visit https://gerrit.wikimedia.org/r/367713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea81899ea32d809f29251f5b689a73d75da00751 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
